nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-14 09:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,133 Commits 654 Branches 1,810 Tags
1e1319351dfad56e586ebf8be58e5db7a35de82b
Commit Graph

2402 Commits

Author SHA1 Message Date
Nabin Hait
0df80ad923 fix: Missing args while fetching items from delivery note 
(cherry picked from commit bbe323fbb4)
 2024-04-23 04:55:02 +00:00
Deepesh Garg
cc925ae938 fix: Resolve merge conflicts 2024-04-12 12:10:55 +05:30
Corentin Flr
59cea9f4dd fix: Don't call get_fiscal_year if setup is not done yet 
(cherry picked from commit c203fafb1b)

# Conflicts:
#	erpnext/public/js/utils.js
 2024-04-10 15:17:44 +00:00
ruthra kumar
22b16a6b0e refactor: merge taxes from delivery note to Sales Invoice 
(cherry picked from commit 550cbbd91c)
 2024-04-08 09:09:34 +00:00
mergify[bot]
21b57d9aef fix: qc created for raw materials during manufacture entry (backport #40408) (#40412) 
fix: qc created for raw materials during manufacture entry (#40408)

(cherry picked from commit f8a1a7f515)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-12 18:29:21 +05:30
mergify[bot]
80df6094e3 fix: barcode field on line item not working (backport #40381) (#40383) 
fix: barcode field on line item not working (#40381)

(cherry picked from commit 0da19a40a7)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-12 13:49:08 +05:30
Ankush Menat
4c629d31c6 style: format js files 2024-03-11 11:03:58 +05:30
mergify[bot]
b937c4be4f fix: rate change on changing of the qty (backport #40241) (#40242) 
fix: rate change on changing of the qty (#40241)

(cherry picked from commit e7d707797a)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-02 16:49:40 +05:30
ruthra kumar
4bc6c55198 refactor: update payments section on item removal 
(cherry picked from commit 406793a6ff)
 2024-02-25 03:57:39 +00:00
mergify[bot]
579b27d010 fix: Cannot read properties of undefined (backport #40081) (#40082) 
* fix: Cannot read properties of undefined

(cherry picked from commit 44ed52c5cf)

* chore: fix linter issue

---------

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2024-02-24 17:22:37 +05:30
Nitali Mittal
d913ec52db feat: New financial views - Growth and margin views for P&L and balance sheet 
feat: New financial views - Growth and margin views for P&L and balance sheet
 2024-02-19 16:36:23 +05:30
mergify[bot]
e49f8d5f55 fix: don't overwrite existing terms in transaction (#39519) 
* fix: don't overwrite existing terms in transaction

(cherry picked from commit 77b044f1a6)

* refactor: keep the diff small

---------

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
 2024-02-03 14:05:47 +05:30
Deepesh Garg
f01308b972 Revert "feat: New financial views - Growth and margin views for P&L and balance sheet (#39588)" 
Revert "feat: New financial views - Growth and margin views for P&L and balan…"

This reverts commit 3808ddbf86.
 2024-02-03 09:11:12 +05:30
mergify[bot]
3808ddbf86 feat: New financial views - Growth and margin views for P&L and balance sheet (backport #39588) (#39601) 
feat: New financial views - Growth and margin views for P&L and balance sheet

(cherry picked from commit 92649de5c6)

# Conflicts:
#	erpnext/accounts/report/balance_sheet/balance_sheet.js
#	erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js

Co-authored-by: nitmit <nitali@citrusleaf.in>
 2024-02-03 09:10:28 +05:30
rohitwaghchaure
b193d3cc86 Merge pull request #39689 from rohitwaghchaure/fixed-flag-for-barcode-scanner 
chore: flag for barcode scanner
 2024-02-02 13:27:43 +05:30
Rohit Waghchaure
f8ca5c5c8b chore: flag for barcode scanner 2024-02-02 13:23:54 +05:30
ruthra kumar
51bc225fe5 refactor: dynamic dimension filters in pop up 
(cherry picked from commit f8bbb0619c)
 2024-01-23 11:59:31 +00:00
ruthra kumar
4ea72f4b69 fix: possible typerror in utils.js 
and remove unwanted debugging statements

(cherry picked from commit 60b26ad8b2)
 2024-01-15 15:16:44 +00:00
ruthra kumar
520cdb6f32 fix: project filters on Delivery Note and Sales Order 
(cherry picked from commit 9ba6ff67d5)
 2024-01-11 12:34:44 +00:00
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