schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,994 Commits 322 Branches 1,581 Tags
22b16a6b0e98ea92cc8c5822d633f1b18e8013cd
Commit Graph

184 Commits

Author SHA1 Message Date
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]
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]
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
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
71ecf081c3 fix: typerror on multi select dialog 
(cherry picked from commit 7da9ffa3bd)
 2024-01-03 15:24:49 +00:00
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
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
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
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
Rohit Waghchaure
6959283893 fix: inventory dimension filter not overriding with existing filter for stock ledger report 
(cherry picked from commit 0e388ba872)
 2023-02-20 07:35:16 +00:00
Devin Slauenwhite
ac2ebfbf59 perf: show update items dialog 
(cherry picked from commit a835c1a418)
 2023-01-27 04:18:32 +00:00
mergify[bot]
9bc2675493 refactor: make payments app a soft dependency (backport #33245) (#33677) 
refactor: make payments app a soft dependency (#33245)

refactor: make payment app a soft dependency
(cherry picked from commit 0b86b1baca)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-01-18 21:11:37 +05:30
Rohit Waghchaure
2d2eef6b29 fix: inventory dimension filter's label not showing in the reort 2022-09-07 18:02:41 +05:30
rohitwaghchaure
5a3999e236 Merge pull request #31424 from rohitwaghchaure/feat-inventory-dimension 
feat: Inventory Dimension
 2022-07-20 19:47:14 +05:30
Rohit Waghchaure
dbec5cff00 feat: Inventory Dimension 2022-07-20 16:02:13 +05:30
Rucha Mahabal
d8aa1c59f1 Merge branch 'develop' into hr-separation 2022-07-12 19:27:19 +05:30
Rucha Mahabal
ef7299470b Merge branch 'develop' into hr-separation 2022-07-01 11:30:25 +05:30
Sagar Sharma
6589c5f5e9 Merge branch 'develop' into subcontracting 2022-06-29 17:29:24 +05:30
gn306029
2a619fd789 fix: Modify opts parameter misspell (#31476) 
Modify opts parameter misspell 

closes #31474
 2022-06-29 14:45:21 +05:30
s-aga-r
6d89b2fa28 refactor: backport old subcontracting code 2022-06-20 23:10:02 +05:30
Rucha Mahabal
fbc1330ab0 chore: Remove HR/Payroll related setups and fixtures 
- Fixtures moved to HRMS app

- 'HR' field in Terms and Conditions removed, added via HRMS setup
 2022-06-17 16:34:13 +05:30
Deepak
867f2c6282 fix: TypeError in add_indicator_for_multicompany (#31042) 
Minor fix in add_indicator_for_multicompany

In case of multi-company transactions add (+) buttons in connection dashboard pf customer aren't being loaded due to TypeError (TypeError: e.dashboard.stats_area.removeClass is not a function) created by "frm.dashboard.stats_area.removeClass('hidden');" during the stats section creation.
 2022-05-17 11:52:52 +05:30
Rohit Waghchaure
69be22ba7c fix: select multiple values for accounting dimenssion 2022-05-14 17:19:34 +05:30
Sagar Sharma
d074c93ac7 refactor!: change "is_subcontracted" field type from "Select" to "Check" 2022-04-01 13:22:44 +05:30
mergify[bot]
c1a0f649cb fix: convert asynchronous field update to synchronous (#28930) 
(cherry picked from commit 5adf85f5b7)

Co-authored-by: Dan Navarro on Ubuntu Work <danjeremynavarro@gmail.com>
 2021-12-17 19:06:19 +05:30
Saqib
2411477e6d fix: time to response shows failed (#28895) 2021-12-15 11:45:34 +05:30
Saqib
7d0a3e4e8b Merge pull request #28550 from nextchamp-saqib/fix-sla 
refactor(SLA): Application of SLA and its fields
 2021-12-13 10:29:56 +05:30
Ankush Menat
d37541d3fb fix: ensure that reposting is finished before freezing stock/account 2021-12-10 12:31:49 +05:30
Saqib Ansari
476e81a631 fix: time to respond & resolve indicators 2021-12-06 18:55:30 +05:30
Rucha Mahabal
5ba1bc1572 fix: Employee link formatter showing incorrect value for Employee Name (#28504) 2021-11-23 09:30:30 +05:30
Rohit Waghchaure
69ffddf747 feat: option to set the width for the multi-select dialog box 2021-10-07 17:33:58 +05:30
Saqib
e03d9aa889 fix: unecessary keyword args were passed in mapper functions (#27563) 2021-09-17 13:03:27 +05:30
Saqib
7292f5476d feat: (get_items_from) filter material request item in purchase order (#27449) 2021-09-13 12:13:43 +05:30
Ankush Menat
b147b85e6a chore: whitespace / eof fixes 2021-09-01 16:57:21 +05:30
Frappe PR Bot
255b99ebdc feat: Employee reminders (#25735) (#27115) 
* feat: Add reminders section to HR Settings

* refactor: Extract generic function for getting Employees

* feat: Employee Work Anniversary Reminder

* feat: Daily Holiday Reminder

* fix: Unnecessary params and replace [] with .get()

* test: Daily Holiday Reminders

* test: is_holiday basic tests

* refactor: Move employee reminders code to separate module

* feat: Add advance reminder to HR settings

* feat: Advance Holiday Reminders

* refactor: get_holidays_for_employee

* feat: Email holiday reminders in advance + tests

* fix: Remove unused import

* refactor: HR Setting Reminder Section

* refactor: Remove Daily Holiday Reminders feat

* feat: Reminder miss warning

* fix: Failing test and function name change

* chore: Add patch for field rename

* chore: Rename frequency label

* fix: Failing patch test

* fix: sider and removed description of fields

* fix: email alignment

Co-authored-by: pateljannat <pateljannat2308@gmail.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
(cherry picked from commit 24b2a31581)

Co-authored-by: Mohammad Hussain Nagaria <34810212+NagariaHussain@users.noreply.github.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
 2021-08-24 20:19:22 +05:30
Ankush Menat
6de7b8ea93 fix: discard empty rows from update items (#27021) 2021-08-24 12:18:40 +05:30
Afshan
dc7280eef0 fix: filtering of items in Sales and Purchase Orders (#26936) 
* fix: filtering of items in Sales and Purchase Orders

* fix: slider

* fix: slider
 2021-08-18 17:44:40 +05:30
Himanshu
ec25d5938b feat(SLA): Apply SLA to any document (#22449) 2021-06-14 19:05:52 +05:30
Rucha Mahabal
59961f70ee refactor: timesheet 2021-05-22 10:21:04 +05:30
Alan
c6dc9eaf2e feat!: add pick batch button (#25413) 
* feat!: add pick batch button

BREAKING CHANGE: replaces setup_serial_no with setup_serial_or_batch_no.

* refactor: use setup_serial_or_batch_no instead of setup_serial_no

* refactor: use setup_serial_or_batch_no instead of setup_serial_no

* refactor: use setup_serial_or_batch_no instead of setup_serial_no

* style: add sider review changes

* refactor: make consice, extract function

* refactor: camel to snake casing
 2021-05-07 20:30:04 +05:30
Alan
157b388209 fix: change subcontracted item display (#25425) 2021-04-21 21:00:22 +05:30
Marica
24e45163d5 fix: Sider 2021-04-14 18:53:15 +05:30
Andy Zhu
bffe933c22 Fix: attempts to add overrides function 
Overrides parent_fieldname in outer form to all child rows's fieldname
 2021-04-12 22:49:26 +12:00
Andy Zhu
6117ac5aff fix: copy_parent_value_in_all_row function error 2021-03-17 13:53:02 +13:00
Sagar Vora
78777d6ed4 fix: fetch Material Requests of type Customer Provided in Stock Entry using Get Items From (#24756) 
Co-authored-by: walstanb <walstanb@gmail.com>
 2021-03-09 20:35:08 +05:30