CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-12 14:58:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,006 Commits 413 Branches 1,717 Tags
9890cce6808820a3d149bc3ac93543091fecbdb3
Commit Graph

44006 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Anand Baburajan
8d61404a5b Merge branch 'version-14-hotfix' into more_asset_bug_fixes_v14 2023-02-15 11:55:52 +05:30
rohitwaghchaure
bc8cf10e39 Merge pull request #34070 from frappe/mergify/bp/version-14-hotfix/pr-34065 
fix: change parameter name for letter head (backport #34065)
 2023-02-15 10:08:30 +05:30
rohitwaghchaure
eb300f52d9 Merge pull request #34069 from frappe/mergify/bp/version-14-hotfix/pr-34061 
feat: allow to make in transit transfer entry from material request (backport #34061)
 2023-02-15 09:57:30 +05:30
barredterra
bb174f931d test: download RFQ PDF 
(cherry picked from commit d5b7f2e49e)
 2023-02-15 04:01:57 +00:00
barredterra
1e2611fb1e refactor: download RFQ PDF 
(cherry picked from commit 8e40c04494)
 2023-02-15 04:01:56 +00:00
barredterra
4f37ba9cfe fix: change parameter name for letter head 
To match changes from https://github.com/frappe/frappe/pull/19627

(cherry picked from commit f7fd30fecf)
 2023-02-15 04:01:56 +00:00
rohitwaghchaure
f65e471a75 fix: linters issue 2023-02-15 09:28:56 +05:30
Rohit Waghchaure
a7b682e26b feat: allow to make in transit transfer entry from material request 
(cherry picked from commit 5b6128848f)
 2023-02-15 03:39:12 +00:00
Anand Baburajan
a3f96652d4 Merge pull request #34062 from frappe/mergify/bp/version-14-hotfix/pr-34059 
chore: add anand to asset's codeowner (backport #34059)
 2023-02-14 20:16:52 +05:30
anandbaburajan
dbd4466817 chore: add anand to asset's codeowner 
(cherry picked from commit d003370f61)
 2023-02-14 14:21:38 +00:00
Anand Baburajan
25951debb5 Merge branch 'version-14-hotfix' into more_asset_bug_fixes_v14 2023-02-14 18:14:14 +05:30
anandbaburajan
1535c3d856 fix: asset_depreciation_and_balances report doesn't reflect manual depr entries 2023-02-14 17:54:51 +05:30
Sagar Sharma
2bc12d478b Merge pull request #34055 from frappe/mergify/bp/version-14-hotfix/pr-34018 
fix: update `reserved_qty` when `Sales Order` marked as `Hold` (backport #34018)
 2023-02-14 17:41:01 +05:30
Sagar Sharma
7dff06a0f6 Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-34018 2023-02-14 17:40:48 +05:30
Deepesh Garg
1f6474d5ab Merge pull request #34047 from frappe/mergify/bp/version-14-hotfix/pr-33996 
feat: translate fixtures during runtime, not installation (backport #33996)
 2023-02-14 16:57:29 +05:30
s-aga-r
15898cc2ec fix: update reserved_qty when Sales Order marked as Hold 
(cherry picked from commit d76759e066)
 2023-02-14 11:22:52 +00:00
rohitwaghchaure
e214a336be Merge pull request #34049 from frappe/mergify/bp/version-14-hotfix/pr-34046 
fix: BOM import failed as use same label field for Raw Materials Item table and Scrap Item table (backport #34046)
 2023-02-14 11:55:29 +05:30
Florian HENRY
47d17f4136 fix: BOM import failed as importer use same label field for Raw MaterialsItem table and Scrap Item table 
(cherry picked from commit 86be259341)
 2023-02-14 05:00:25 +00:00
Raffael Meyer
d117de7813 feat: translate fixtures during runtime, not installation (#33996) 
feat: install untranslated fixtures from files

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit 770369e5c1)
 2023-02-14 04:00:23 +00:00
mergify[bot]
6fe7600844 fix: should never get cutomer price on purchase document (#34002) 
fix: should never get cutomer price on purchase document (#34002)

* fix: never get cutomer price on purchase document

chores: syntax

chore: typo in stock_entry get_uom_details (#33998)

fix: typo in stock_entry get_uom_details

chores: syntax

* feat: add test for get_item_detail price list oriented

* feat: add test for get_item_detail price price oriented

* feat: add test for get_item_detail price price oriented

* chore: clean test code

(cherry picked from commit 231fe4156f)

Co-authored-by: HENRY Florian <florian.henry@open-concept.pro>
 2023-02-14 08:59:25 +05:30
mergify[bot]
c7c61239a3 fix: Amount validation in Payment Request against Purchase Order (#34042) 
fix: Amount validation in Payment Request against Purchase Order (#34042)

(cherry picked from commit ce748cec3a)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-14 08:59:03 +05:30
anandbaburajan
a220dc0c9c chore: break look if je processed 2023-02-13 17:28:46 +05:30
anandbaburajan
47cc8ab6c6 fix: opening_accumulated_depreciation and precision in charts 2023-02-13 17:22:54 +05:30
mergify[bot]
087333abcb fix: Concurrency issues in Sales and Purchase returns (#34019) 
fix: Concurrency issues in Sales and Purchase returns (#34019)

(cherry picked from commit a67284e96d)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-13 16:30:03 +05:30
ruthra kumar
80c83f14e9 Merge pull request #34034 from frappe/mergify/bp/version-14-hotfix/pr-34021 
fix: rare instances of IntegrityError while cancelling journals against cr note (backport #34021)
 2023-02-13 14:59:12 +05:30
ruthra kumar
c71d03555f fix: IntegrityError while cancelling journals against cr note 
(cherry picked from commit b9a7ff7c3d)
 2023-02-13 08:45:18 +00:00
mergify[bot]
1540aea21d refactor: filter only immediate upcoming payment term for each SO (#33923) 
refactor: filter only immediate upcoming payment term for each SO (#33923)

* fix: ignore closed or 'on hold' orders

* refactor: filter immediate upcoming term

---------

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

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2023-02-13 13:29:41 +05:30