nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 00:25:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,526 Commits 400 Branches 1,698 Tags
e975a10a751cb1eb190ea7e06cc1eccca80554d2
Commit Graph

45526 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rohitwaghchaure
e975a10a75 chore: fix linter issue (#37349) 2023-10-03 22:08:37 +05:30
rohitwaghchaure
c3aeb2dec5 fix: do not consider submitted Work Orders in the Production Plan Res… (#37343) 
fix: do not consider submitted Work Orders in the Production Plan Reserve qty
 2023-10-03 20:34:10 +05:30
ruthra kumar
fe32787e6e Merge pull request #37346 from frappe/mergify/bp/version-14-hotfix/pr-37304 
fix: only float row values for total in AP summary (backport #37304)
 2023-10-03 20:19:54 +05:30
ruthra kumar
f3b872a8e2 refactor: use isinstance over type 
(cherry picked from commit 67440c38ae)
 2023-10-03 14:16:27 +00:00
Gursheen Anand
020aedb8b0 fix: add only float row values for total 
(cherry picked from commit 1dab195560)
 2023-10-03 14:16:27 +00:00
rohitwaghchaure
82e8606b3c fix: currency symbol in the Supplier Quotation Comparison report (#37337) 
fix: currency in the Supplier Quotation Comparison report
 2023-10-03 18:53:43 +05:30
mergify[bot]
6daea6ccb2 feat: asset salvage_value_percentage (backport #37302) (#37334) 
* feat: asset salvage_value_percentage (#37302)

* feat: asset salvage_value_percentage

* chore: add missing parameter in get_item_details

* chore: change asset depr table colors

(cherry picked from commit fed94845ce)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.js
#	erpnext/assets/doctype/asset_activity/asset_activity.json
#	erpnext/assets/doctype/asset_finance_book/asset_finance_book.json

* chore: resolving conflicts

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-10-03 13:35:10 +05:30
mergify[bot]
04f0dfb691 fix: ignore user permissions for Source Warehouse (backport #37313) (#37314) 
* fix: ignore user permissions for `Source Warehouse` (#37313)

(cherry picked from commit e7f4b7b190)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#	erpnext/stock/doctype/purchase_receipt/purchase_receipt.json

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-10-01 21:31:17 +05:30
mergify[bot]
95e0bf5e0e fix: Not unique table/alias: 'tabTask' (backport #37285) (#37298) 
fix: Not unique table/alias: 'tabTask' (#37285)

(cherry picked from commit 361e555118)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-09-29 15:07:10 +05:30
rohitwaghchaure
7f1483ad70 fix: Description field for the 'Ignore Available Stock' (#37293) 2023-09-29 14:35:45 +05:30
HENRY Florian
21c1c7194b refactor: In Quotation Item, discount_and_margin section should have same collapsible_depends_on as other similar DocType (Sales Order Item,Sales Invoice Item,...) (#37272) 2023-09-29 08:29:18 +05:30
Deepesh Garg
81c4279a30 Merge pull request #37282 from frappe/mergify/bp/version-14-hotfix/pr-37268 
fix: AP AR filters from Party link (backport #37268)
 2023-09-28 19:34:56 +05:30
ruthra kumar
01b54134ae test: multi select party filter in AR report 
(cherry picked from commit 2c7d6aec89)
 2023-09-28 06:26:05 +00:00
Gursheen Anand
28756bf7b6 fix: party format in test 
(cherry picked from commit 59e8abfd57)
 2023-09-28 06:26:05 +00:00
Gursheen Anand
4962b67358 fix: process soa filter for multiselect 
(cherry picked from commit 4b28154f5e)
 2023-09-28 06:26:05 +00:00
Gursheen Anand
403ff697e9 fix: summary report filters 
(cherry picked from commit f7cb68a45f)
 2023-09-28 06:26:04 +00:00
Gursheen Anand
6d7aa2ae94 fix: query for multiselect filter 
(cherry picked from commit e7239e02d4)
 2023-09-28 06:26:04 +00:00
Gursheen Anand
2b30727fdc fix: set route filter values for AR 
(cherry picked from commit 9d15124a6a)
 2023-09-28 06:26:04 +00:00
Gursheen Anand
49f0f1ca09 fix: set route filter values for AP 
(cherry picked from commit 888ed36eed)
 2023-09-28 06:26:04 +00:00
rohitwaghchaure
8fe4a4d3aa fix: incorrect qty for material request in Production Plan (#37270) 2023-09-27 20:02:05 +05:30
mergify[bot]
6a8146ba8a fix: trial balance report freezes when adding filters (backport #37264) (#37265) 
fix: trial balance report freezes when adding filters (#37264)

fix: Only add onclick if correct data is returned

workaround for https://github.com/frappe/datatable/issues/177

(cherry picked from commit 2dc95e5d59)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-09-27 12:36:58 +05:30
Deepesh Garg
b18678df4d Merge pull request #37262 from frappe/mergify/bp/version-14-hotfix/pr-37029 
fix: PCV posting issues (backport #37029)
 2023-09-27 12:07:54 +05:30
Deepesh Garg
8d813e3256 chore: resolve conflicts 2023-09-27 11:19:39 +05:30
Deepesh Garg
c6966f4e2d Merge pull request #37263 from frappe/mergify/bp/version-14-hotfix/pr-37234 
fix: Use default Cost Center of the Company for additional discount (backport #37234)
 2023-09-27 11:18:29 +05:30
vr-greycube
e483b4a78a fix: Use default Cost Center of the Company for additional discount (#37234) 
fix: Set cost center as default company cost center

When Discount Accounting in enabled in Selling Settings, use Company default Cost Center while making GL entries for additional_discount_account

(cherry picked from commit 4ada5a488e)
 2023-09-27 05:09:46 +00:00
Deepesh Garg
92eabe3cf5 fix: PCV posting issues (#37029) 
* fix: PCV posting issues

* fix: process closing entries separately in a background job

* test: Update tests

* chore: fix broken ci

(cherry picked from commit 8c5fcb8257)

# Conflicts:
#	erpnext/accounts/doctype/payment_request/payment_request.json
 2023-09-27 04:53:41 +00:00
mergify[bot]
1dc58b3660 fix: AP & AR summary filters to match AR (backport #37248) (#37261) 
* fix: set AR filters after rename

(cherry picked from commit 832d7e7d7b)

* fix: change filters for AR summary

(cherry picked from commit 7d96044d8e)

* fix: set new AP summary filters

(cherry picked from commit 76a5d94f37)

---------

Co-authored-by: Gursheen Anand <gursheen@frappe.io>
 2023-09-27 10:22:27 +05:30
rohitwaghchaure
0a0d5b3e66 fix: reserved qty for production plan (#37251) 2023-09-26 17:55:33 +05:30
rohitwaghchaure
78ab2013e5 fix: serial number decimal issue (#37242) 2023-09-26 16:46:19 +05:30
s-aga-r
70e2093941 fix: validate duplicate serial no on submit in DN (#37243) 2023-09-26 16:34:19 +05:30
mergify[bot]
279f21d1e5 fix: incorrect Parent Task getting set for 2nd to nth child Task (backport #37230) (#37240) 
fix: incorrect `Parent Task` getting set for 2nd to nth child Task (#37230)

(cherry picked from commit 73fc974950)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-09-26 13:32:05 +05:30
Deepesh Garg
ba45299e0d Merge pull request #37228 from FHenry/14_warning_depreciation_regional_france 
refactor(region): Splitting of France Regional logic from ERPNext
 2023-09-25 14:55:53 +05:30
Florian HENRY
c9ba777e3c refactor(region): Splitting of France Regional logic from ERPNext 2023-09-25 10:24:32 +02:00
Florian HENRY
ab8a4f7f7b Merge branch 'version-14-hotfix' of https://github.com/frappe/erpnext into 14_warning_depreciation_regional_france 2023-09-25 10:19:55 +02:00
mergify[bot]
25f800d3f5 fix(Material Request): consider project for item details (backport #37215) (#37221) 
fix(Material Request): consider project for item details (#37215)

fix(Material Request): project in item details

(cherry picked from commit 7c4ebe2733)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-09-24 22:24:56 +05:30
Deepesh Garg
2b8118c5e6 Merge pull request #37218 from frappe/mergify/bp/version-14-hotfix/pr-37211 
feat: Toggle net values in Trial Balance report (#37211)
 2023-09-24 20:19:06 +05:30
Deepesh Garg
4250a7c4d1 Merge pull request #37217 from frappe/mergify/bp/version-14-hotfix/pr-37213 
fix: filter gl entries in process soa (#37213)
 2023-09-24 20:18:51 +05:30
Deepesh Garg
81d52b16d9 Merge pull request #37220 from frappe/mergify/bp/version-14-hotfix/pr-37167 
fix: set customer currency in pos_invoice if exists (#37167)
 2023-09-24 20:18:09 +05:30
milanpethani
e0da8d261f fix: set customer currency in pos_invoice if exists 
if currency exists in the profile and customer currency doesn't exists still it will update currency to None, so update customer currency only if exists

(cherry picked from commit 041d52e828)
 2023-09-24 12:24:02 +00:00
Deepesh Garg
57c82c1800 feat: Toggle net values in Trial Balance report 
(cherry picked from commit 06a45897de)
 2023-09-24 12:15:57 +00:00
Gursheen Anand
b4bc44db4a fix: apply gl report filters 
(cherry picked from commit 5346c67b02)
 2023-09-24 12:15:44 +00:00
ruthra kumar
d3c9a6d975 Merge pull request #37206 from frappe/mergify/bp/version-14-hotfix/pr-37202 
refactor: ignore PLE's on PCV cancellation (backport #37202)
 2023-09-22 13:57:53 +05:30
ruthra kumar
9d5fce9091 refactor: ignore PLE's on PCV cancellation 
(cherry picked from commit 301092dad1)
 2023-09-22 08:00:36 +00:00
ruthra kumar
139a7ce911 Merge pull request #37196 from frappe/mergify/bp/version-14-hotfix/pr-37069 
fix: Recalculate `advance_paid` in SO/PO after unlinking from advance entry (backport #37069)
 2023-09-22 10:18:00 +05:30
marination
591c720e51 test: Impact on SO of advance PE submit and unlinking/replacement by SI 
(cherry picked from commit 8a4954d713)
 2023-09-22 03:06:31 +00:00
marination
1181dcf521 fix: Update advance_paid in SO/PO after unlinking from advance entry 
(cherry picked from commit 426350eee6)
 2023-09-22 03:06:31 +00:00
mergify[bot]
02fc67c83c feat: Stock Ledger Variance report (backport #37165) (#37183) 
feat: `Stock Ledger Variance` report (#37165)

* feat: `Stock Ledger Variance` report

* refactor: `get_data()`

(cherry picked from commit acda72d616)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-09-21 07:49:02 +00:00
Deepesh Garg
43f3779f10 Merge pull request #37156 from frappe/mergify/bp/version-14-hotfix/pr-37122 
fix: german translation of Sales and Purchase Invoice (backport #37122)
 2023-09-20 22:15:43 +05:30
mergify[bot]
f2bcfb5f97 fix: labels for Stock Ledger Invariant Check report (backport #37150) (#37176) 
fix: labels for `Stock Ledger Invariant Check` report (#37150)

refactor: `Stock Ledger Invariant Check` report
(cherry picked from commit f0859ecc60)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-09-20 19:21:54 +05:30
Raffael Meyer
03e52d3859 chore: resolve conflicts 2023-09-20 14:38:42 +02:00