Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,097 Commits 3 Branches 0 Tags
Commit Graph

47097 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
6d43f90dc2 Merge branch 'develop' of https://github.com/frappe/erpnext into lead_details_qb 2023-10-09 19:23:16 +05:30
Rucha Mahabal
788df14ae8
Merge pull request #37376 from barredterra/hrms-translations 2023-10-09 13:18:55 +05:30
ruthra kumar
411be583a3
Merge pull request #37395 from ruthra-kumar/exception_on_exporting_errored_rows_in_bank_statement_import 
fix: exception on exporting errored rows
 2023-10-08 18:20:30 +05:30
ruthra kumar
d3c6000904 fix: exception on exporting errored rows 2023-10-08 13:16:28 +05:30
ruthra kumar
40e7c43ce3 refactor: import financial_statement in erpnext bundle 2023-10-07 21:03:31 +05:30
ruthra kumar
7d11fe1633
Merge pull request #37289 from GursheenK/ar-ageing-summary 
fix: ageing summary in SOA AR
 2023-10-07 15:09:21 +05:30
mergify[bot]
10c666bf69
fix: incorrect status of the returned purchase receipt (backport #37300) (#37380) 
fix: incorrect status of the returned purchase receipt (#37300)

(cherry picked from commit 63f45739e05d728e8844320ff0c7dbafa8660acf)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-06 14:43:13 +05:30
barredterra
4b8dc8a35c refactor: migrate translations from HRMS 2023-10-05 16:58:26 +02:00
barredterra
4b4efbc7a6 refactor: migrate translations to HRMS 2023-10-05 16:55:29 +02:00
mergify[bot]
d2aa4d5d6b
fix: validation message for valuation rate (backport #37301) (#37351) 
fix: validation message for valuation rate (#37301)

(cherry picked from commit 643bb0511ce6b858d84613d08b551b7f15c6364a)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-05 18:13:23 +05:30
ruthra kumar
27bb0b1130
Merge pull request #37370 from ruthra-kumar/fetch_company_address_for_lead_based_quotation 
fix: fetch company details for Lead based quotation
 2023-10-05 13:50:03 +05:30
ruthra kumar
f388864fd5 fix: fetch company details for Lead based quotation 2023-10-05 13:13:11 +05:30
ruthra kumar
c006c14aaa
Merge pull request #37359 from ruthra-kumar/change_request_response_strucutre_on_exchangerate 
refactor: add `access_key` field to facilitate use of exchangerate.host provider
 2023-10-05 09:18:56 +05:30
ruthra kumar
9396fb77f4
Merge pull request #37294 from ruthra-kumar/restrict_payment_as_ref_in_je_from_ui 
refactor: block Payment Entry as ref in Journals from UI
 2023-10-05 08:53:35 +05:30
ruthra kumar
c8e3dc6c4c chore: refactor test case for exchangerate.host provider 2023-10-05 08:43:08 +05:30
ruthra kumar
81591a34c2 refactor: introduce access_key field 2023-10-05 08:43:08 +05:30
ruthra kumar
aad77b133b
Merge pull request #37362 from anandbaburajan/asset_cap_wip_1 
test: fixing test_capitalization_with_wip_composite_asset
 2023-10-05 08:37:31 +05:30
anandbaburajan
9468513d7c test: fixing test_capitalization_with_wip_composite_asset 2023-10-04 22:11:15 +05:30
Jignesh (GreyCube Technologies)
9f33cc5cf3
fix(Employee): enable no_copy for relieving_date (#37344) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2023-10-04 13:10:27 +05:30
mergify[bot]
f4f40cc776
feat: composite WIP asset (copy #37352) (#37353) 
* feat: wip composite asset

(cherry picked from commit 4907e7acd4ff549f34f6c9d0144af83db0ad9cc1)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#	erpnext/assets/doctype/asset/asset.json
#	erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json

* chore: resolving conflicts

---------

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
 2023-10-04 10:29:18 +05:30
mergify[bot]
9be554a147
chore: fix linter issue (backport #37349) (#37350) 
chore: fix linter issue (#37349)

(cherry picked from commit e975a10a751cb1eb190ea7e06cc1eccca80554d2)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-03 22:11:10 +05:30
mergify[bot]
7729c1a413
fix: do not consider submitted Work Orders in the Production Plan Res… (backport #37343) (#37347) 
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
(cherry picked from commit c3aeb2dec58190d16a18e2609fd57054bda54e43)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-03 22:05:01 +05:30
mergify[bot]
8d99f9a12a
fix: currency symbol in the Supplier Quotation Comparison report (backport #37337) (#37342) 
fix: currency symbol in the Supplier Quotation Comparison report (#37337)

fix: currency in the Supplier Quotation Comparison report
(cherry picked from commit 82e8606b3c4403d79556c896a98f942762cd8fa7)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-03 20:32:34 +05:30
ruthra kumar
ab378196bd
Merge pull request #37304 from GursheenK/party-totals-payable-report 
fix: only float row values for total in AP summary
 2023-10-03 19:45:03 +05:30
ruthra kumar
67440c38ae refactor: use isinstance over type 2023-10-03 17:38:43 +05:30
Anand Baburajan
fed94845ce
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
 2023-10-03 12:21:17 +05:30
Anand Baburajan
087f378a4f
refactor: rename loan type to loan product in lending (#37325) 
refactor: rename loan type to loan product
 2023-10-03 00:15:30 +05:30
David Arnold
fa8483fe8c
fix(portal): used rounded total in transaction rows, if enabled 2023-10-02 17:46:39 +02:00
Deepesh Garg
fb51cae88b chore: fix shopping cart tests 2023-10-02 16:16:31 +05:30
Deepesh Garg
3c1f93215a
Merge pull request #37297 from frappe/mergify/bp/develop/pr-37293 
fix: Description field for the 'Ignore Available Stock' (backport #37293)
 2023-10-02 10:56:33 +05:30
Deepesh Garg
964cd75f6e
Merge pull request #37235 from niyazrazak/patch-13 
fix: set route options to cost center
 2023-10-02 10:54:02 +05:30
Deepesh Garg
559466e1ef
Merge pull request #37229 from FHenry/dev_remove_regional_france 
refactor!: Remove Regionalisation of France as now there is an App ERPNext France to manage it
 2023-10-02 10:51:25 +05:30
s-aga-r
e7f4b7b190
fix: ignore user permissions for Source Warehouse (#37313) 2023-10-01 21:25:01 +05:30
David Arnold
d3f94a03fc
fix(stock): add delivery user and manager role 2023-10-01 15:13:54 +02:00
Deepesh Garg
25718f5cc7 chore: rewrite query using query builder 2023-10-01 13:27:44 +05:30
Gursheen Anand
1dab195560 fix: add only float row values for total 2023-09-29 18:20:02 +05:30
s-aga-r
361e555118
fix: Not unique table/alias: 'tabTask' (#37285) 2023-09-29 15:05:02 +05:30
rohitwaghchaure
36364c235e fix: Description field for the 'Ignore Available Stock' (#37293) 
(cherry picked from commit 7f1483ad707feac6413994400217413e5c167c7b)
 2023-09-29 09:06:47 +00:00
Gursheen Anand
644e25e587 test: process soa for gl and ar 2023-09-29 14:35:43 +05:30
Gursheen Anand
67f878ff8c refactor: separate function for statement dict 2023-09-29 14:34:43 +05:30
ruthra kumar
d391e81505 refactor: block Payment Entry as ref in JE from UI 2023-09-29 13:40:59 +05:30
Gursheen Anand
d9eb44e62d fix: ageing summary in AR 2023-09-29 11:12:19 +05:30
ruthra kumar
f160e49483
Merge pull request #37268 from GursheenK/ar-summary-party-filter 
fix: AP AR filters from Party link
 2023-09-28 11:54:34 +05:30
ruthra kumar
2c7d6aec89 test: multi select party filter in AR report 2023-09-28 11:17:38 +05:30
mergify[bot]
f375c8cc7f
fix: incorrect qty for material request in Production Plan (backport #37270) (#37275) 
fix: incorrect qty for material request in Production Plan (#37270)

(cherry picked from commit 8fe4a4d3aa7857e5e241bcb7145065753ab8b4cb)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-09-27 23:35:53 +05:30
Marica
d6e4f80187
fix: Set serial_and_batch_bundle in right field for Asset Repair Stock Entry (#37273) 
fix: Set `serial_and_batch_bundle` in same field for Asset Repair SE
- `serial_and_batch_bundle` was earlier set in `serial_no` field
 2023-09-27 23:34:57 +05:30
s-aga-r
296b233659 chore: patch to delete Payment Gateways 2023-09-27 15:27:29 +05:30
Gursheen Anand
59e8abfd57 fix: party format in test 2023-09-27 13:57:49 +05:30
Gursheen Anand
4b28154f5e fix: process soa filter for multiselect 2023-09-27 13:04:13 +05:30
Gursheen Anand
f7cb68a45f fix: summary report filters 2023-09-27 13:03:37 +05:30