nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-16 18:24:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,324 Commits 640 Branches 1,812 Tags
453700d0abb59ca67234617d35301daa0640a2ab
Commit Graph

2610 Commits

Author SHA1 Message Date
ruthra kumar
8fe346aef8 fix: possible typeerror on transaction.js 
(cherry picked from commit 9f27ac142b)
 2024-01-10 06:24:46 +00:00
ruthra kumar
71ecf081c3 fix: typerror on multi select dialog 
(cherry picked from commit 7da9ffa3bd)
 2024-01-03 15:24:49 +00:00
Rucha Mahabal
e4d6df39ff fix(Hierarchy Chart): check if company is set before loading children (#38985) 
* fix(Org Chart): check if company is set before loading children

* refactor: avoid assigning undefined values, use empty strings, null instead

* fix: returning to org chart view from employee master does not render chart

- the check for company field is truthy from the employee doctype, so it does not render company field again. Explicitly check for company field on the same page

* fix(Org Chart Mobile): check if company is set before loading children
 2023-12-28 12:54:31 +05:30
mergify[bot]
c74e6aaebb feat: Merge taxes from mapped docs (#38346) 
* feat: Merge taxes from mapped docs (#38346)

* feat: Merge taxes from mapped docs

* chore: ci failures

(cherry picked from commit 9b1c22250f)

* chore: ci failures

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-12-28 10:03:26 +05:30
Gursheen Kaur Anand
37a18299d0 Revert "fix: unset discount amount based on coupon code (backport #38250)" 2023-12-19 15:35:35 +05:30
Smit Vora
24ae45ce84 fix: fetch item_tax_template values if fields with fetch_from exisit 2023-12-17 14:03:37 +05:30
mergify[bot]
73d525e84d fix: timezone aware SLA banner (backport #38745) (#38746) 
fix: timezone aware SLA banner (#38745)

(cherry picked from commit eaf86a6461)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-12-14 15:59:19 +05:30
mergify[bot]
0d49dd3648 Revert "fix(ux): don't update qty blindly" (backport #38728) (#38729) 
Revert "fix(ux): don't update qty blindly" (#38728)

(cherry picked from commit 6851c5042f)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-12-13 23:16:26 +05:30
mergify[bot]
29cd474f44 fix(ux): don't update qty blindly (backport #38608) (#38638) 
fix(ux): don't update qty blindly

(cherry picked from commit 0156339f34)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-08 17:59:46 +05:30
Shariq Ansari
b28deaae2c fix: format only if searched text contain link value text 
(cherry picked from commit 08ed3cd313)
 2023-12-07 15:17:48 +00:00
mergify[bot]
9f23b7e46f fix: use predefined onload property load_after_mapping (backport #38209) (#38518) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
fix: use predefined onload property `load_after_mapping` (#38209)
 2023-12-04 09:52:16 +05:30
Gursheen Anand
7fa97fa7b5 fix: unset discount amount based on coupon code 
(cherry picked from commit 6518582ed3)

# Conflicts:
#	erpnext/public/js/utils/sales_common.js
 2023-11-29 10:25:18 +00:00
Patrick Eissler
c71b31e3b8 fix: make create button translatable (#38165) 
* fix: make all create buttons translatable

* style: use double quotes

---------

Co-authored-by: PatrickDenis-stack <77415730+PatrickDenis-stack@users.noreply.github.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
(cherry picked from commit 8e4b591ea2)
 2023-11-29 04:53:26 +00:00
ruthra kumar
82fa58d4e3 chore: update new unreconcile doctype name in JS and PY files 
(cherry picked from commit 74f9e34182)
 2023-11-23 05:09:23 +00:00
Vishakh Desai
883eaee014 fix: Supplier Quotation fields (#37963) 
(cherry picked from commit c2bda2c705)

# Conflicts:
#	erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
 2023-11-20 04:42:39 +00:00
Dany Robert
296433a1dd fix: wrong round off and rounded total 
(cherry picked from commit 3a487bd33a)
 2023-11-19 13:49:05 +00:00
mergify[bot]
b605b08ec1 refactor: remove extraneous disabled filters (backport #37732) (#37748) 
* refactor: remove extraneous disabled filters

(cherry picked from commit f276fbba4f)

# Conflicts:
#	erpnext/accounts/report/profitability_analysis/profitability_analysis.js
#	erpnext/public/js/controllers/accounts.js

* chore: `conflicts`

---------

Co-authored-by: Bernd Oliver Sünderhauf <46800703+bosue@users.noreply.github.com>
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-10-30 10:10:16 +05:30
ruthra kumar
be90be37c7 refactor: button on PE to filter associated Journals 
(cherry picked from commit 150728deaa)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.js
 2023-10-24 04:09:06 +00:00
ruthra kumar
e8d082560a refactor: move unreconcile btn inside a drop down 
(cherry picked from commit f2b0ac6868)
 2023-10-18 10:58:19 +00:00
ruthra kumar
8fc705ea6a chore: resolve conflicts 2023-10-09 15:17:47 +05:30
ruthra kumar
4bd83b5058 refactor: cancel gain/loss JE on multi currency transactions 
(cherry picked from commit 1d93d66c30)
 2023-10-09 06:15:09 +00:00
ruthra kumar
669d692844 refactor: display allocated amount in account currency with symbol 
(cherry picked from commit 6fd1c1bca2)
 2023-10-09 06:15:09 +00:00
ruthra kumar
84e4a2509c chore: rename and add trigger in journal entry 
(cherry picked from commit 0ccb6d8242)
 2023-10-09 06:15:06 +00:00
ruthra kumar
7651ecbc2b chore: fetch logic for payment entry 
(cherry picked from commit 1981f3837a)
 2023-10-09 06:15:06 +00:00
ruthra kumar
e464f5e419 chore: move functions to a separate file in utils 
(cherry picked from commit 25fe752185)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.js
#	erpnext/public/js/erpnext.bundle.js
 2023-10-09 06:15:06 +00:00
ruthra kumar
1e93d0bcc4 chore: move dialog building function to utils.js file 
(cherry picked from commit 5981c7e0ad)
 2023-10-09 06:15:05 +00:00
rohitwaghchaure
63f45739e0 fix: incorrect status of the returned purchase receipt (#37300) 2023-10-06 11:58:15 +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
HENRY Florian
a563fed6dc fix(ux): move get_route_options_for_new_doc to refresh (#37092) 
fix: move `get_route_options_for_new_doc` to `refresh`
 2023-09-16 15:17:26 +05:30
Nihantra C. Patel
132957f59e fix: Set the default filter in All Trends Report 2023-08-31 13:38:42 +05:30
Nihantra C. Patel
420536ca52 fix: Set the default filter in All Trends Report 2023-08-31 13:37:30 +05:30
Deepesh Garg
a623469778 Merge pull request #36645 from frappe/mergify/bp/version-14-hotfix/pr-36495 
fix: Document Name link validation in Bank Reconciliation Tool (#36495)
 2023-08-18 09:27:10 +05:30
Deepesh Garg
ee5a1d91ff chore: resolve conflicts 2023-08-17 20:45:53 +05:30
Deepesh Garg
3e23e1fb91 fix(UX): Ignore prepared report 
(cherry picked from commit 124c0dbd88)
 2023-08-16 16:03:01 +00:00
Devin Slauenwhite
ca34b63470 feat: Reallow customizing company abbreviation on setup. (#36646) 
Co-authored-by: Bernd Oliver Sünderhauf <pancho@mailbox.org>
 2023-08-14 21:44:03 +05:30
Kevin Shenk
83cbc1bef6 fix: Document Name link validation in Bank Reconciliation Tool (#36495) 
fix: format_row broke Document Name link validation

#35540 broke Voucher Matching, leading to an invalid link exception on submission. This is because the format_row() function overwrites the row data instead of just providing a formatter on the DataTable column, and therefore passes through the formatted (linked) column data instead of the Document Name only.

This patch moves the appropriate frappe.form.formatters.Link function to a dedicated format hook on the DataTable columns definition, both fixing the error and retaining the functionality of #35540.

(cherry picked from commit 7ab55b1bb2)

# Conflicts:
#	erpnext/public/js/bank_reconciliation_tool/dialog_manager.js
 2023-08-14 13:34:31 +00:00
Rohit Waghchaure
57b19a523e fix: incorrect qty set in the serial no picker 2023-07-29 19:42:23 +05:30
Anand Baburajan
cff6e72838 fix: apply discount on item after applying price list (#36316) 2023-07-25 21:55:26 +05:30
Deepesh Garg
8ca3d6b7f3 fix: Default fiscal year in accounting, buying and sellingcharts 
(cherry picked from commit 3759a41b83)
 2023-07-19 07:58:59 +00:00
mergify[bot]
b877fa60db fix: Remove current fiscal year from Global Defaults (#35960) 
* fix: Remove current fiscal year from Global Defaults (#35960)

* fix: Remove current fiscal year from Global Defaults

* fix: Remove button to set default

* fix: Add utils to get fiscal year

* fix: Incorrect import

* feat: Add hook for naming series parser

(cherry picked from commit 6270607c6d)

# Conflicts:
#	erpnext/accounts/doctype/fiscal_year/fiscal_year.py
#	erpnext/patches.txt
#	erpnext/public/js/utils.js

* chore: resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-07-17 11:52:37 +05:30
Ankush Menat
adb6918834 perf: send SLA doctypes in boot 
This request is fired on every load, data rarely if ever changes though.

(cherry picked from commit bd9ef74ef7)
 2023-07-16 07:01:32 +00:00
mergify[bot]
b86571d9d4 fix: improve "Update Items" modal (#36105) 
fix: improve "Update Items" modal (#36105)

* fix: make "Update Items" modal larger

* fix: remove conversion factor from overview

Conversion factor doesn't make much sense without two different UOMs
next to it, hence moving it to row detail view

(cherry picked from commit d5fe1432f8)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-07-14 13:03:26 +05:30
mergify[bot]
63e26e39d4 feat: add project filter in reports importing financial statements js file (#36097) 
feat: add project filter in reports importing financial statements js file (#36097)

feat: add project filter in financial statements js file
(cherry picked from commit 596a14e34f)

Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
 2023-07-12 19:16:10 +05:30
mergify[bot]
a485e4e802 fix: Expense Account filter in Sales Invoice (#35944) 
fix: Expense Account filter in Sales Invoice (#35944)

(cherry picked from commit d54f52474a)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-07-01 18:13:46 +05:30
s-aga-r
b261242792 fix(ux): set route options for new Batch 2023-06-16 16:28:49 +05:30
Anand Baburajan
79483cc90e fix: don't set default payment amount in case of invoice return (#35645) 2023-06-12 18:34:13 +05:30
Nabin Hait
d82d1597ac feat: ability to create quotation against a prospect 
(cherry picked from commit 47ce6de57d)
 2023-06-06 16:25:11 +00:00
Rohit Waghchaure
7b75f454d3 fix: rate not fetching properly for inter transfer purchase order 
(cherry picked from commit 2931c657f4)
 2023-05-30 03:45:03 +00:00
vishnu
2631224e49 fix: Creating landed cost voucher from connections 
(cherry picked from commit f2ceb00379)
 2023-05-18 00:43:36 +00:00
Dany Robert
c0f9ff4995 fix: broken save on empty row existance 
(cherry picked from commit d9b231aa16)
 2023-05-09 13:02:54 +00:00