nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-07 15:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,355 Commits 492 Branches 1,768 Tags
mergify/bp/version-13-hotfix/pr-27380
Commit Graph

98 Commits

Author SHA1 Message Date
Brian Pond
45645c1064 fix: Remove missing DocField in fetch_from 
(cherry picked from commit 83f3e317e1)
 2023-02-27 06:24:23 +00:00
Rohit Waghchaure
edfaf99388 fix: Purposes not set 
(cherry picked from commit f9a7b31b5b)
 2022-08-25 05:19:36 +00:00
mergify[bot]
21066a48b6 fix: ignore item-less maintenance visit for sr no (#30684) (#30685) 
(cherry picked from commit 60fb71bd2a)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-04-12 11:16:59 +05:30
Ankush Menat
c07713b860 style: bulk format code with black 
v13 port because otherwise backports will result in conflicts always
 2022-03-29 17:29:34 +05:30
mergify[bot]
d9f783f38e fix: update status on visit cancel (#29389) (#29394) 
* fix: update status on cancelling visit

* test: updated test for cancelling visits

(cherry picked from commit 11c9a5a79f)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2022-01-21 15:22:56 +05:30
marination
3023757a60 fix: Conflicts 2022-01-19 13:06:52 +05:30
Noah Jacob
add36363ab fix: Serial No. filters for unscheduled visits 
(cherry picked from commit dec7513773)
 2022-01-19 07:19:51 +00:00
Noah Jacob
93325c72f0 refactor: moved purpose table mandatory check to server 
(cherry picked from commit b98c61f2a7)

# Conflicts:
#	erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js
 2022-01-19 07:19:50 +00:00
Noah Jacob
0bb0a9d032 fix(test): fixed test case not creating serials 
(cherry picked from commit 90d32006f4)
 2022-01-19 07:19:49 +00:00
Noah Jacob
f541b5c780 test: added test for serial no. filters 
(cherry picked from commit 9109660a69)
 2022-01-19 07:19:49 +00:00
Noah Jacob
8775154fa0 refactor: update_serial_no function and code cleanup 
(cherry picked from commit 4f52b86d7e)

# Conflicts:
#	erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js
 2022-01-19 07:19:47 +00:00
mergify[bot]
fcb08d54ea fix: mapping to maintenance visit gets erased (#28917) (#28925) 
* fix: mappings to maintenance visit gets erased

* test: mapping of schedule to visit

(cherry picked from commit 4cb5b627a1)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2021-12-16 23:33:56 +05:30
mergify[bot]
99851e7f3a refactor: map serial from schedule if only one (#28747) 
(cherry picked from commit eb522a3746)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2021-12-09 20:26:21 +05:30
aaronmenezes
3aead835c5 fix: Maintenence Visit -Purpose (item ) tables is not visible on submitted or saved entries (#28792) 
(cherry picked from commit 90b98440e2)
 2021-12-08 16:50:58 +05:30
Ankush Menat
fbfaf75b66 chore: remove __future__ py2 compatibility imports 2021-11-25 17:42:24 +05:30
mergify[bot]
35448886bc Merge pull request #27999 from frappe/mergify/bp/version-13-hotfix/pr-27990 
fix: changes in schedules gets overwritten on save (backport #27990)
 2021-10-19 14:33:57 +05:30
Ankush Menat
62bbf0fe45 fix: ignore random periodicity in validations 
(cherry picked from commit 3d3655ed73)
 2021-10-05 11:28:34 +00:00
Marica
6ce2111b6d fix: Maintenance Schedule child table status for legacy data (#27554) 
* fix: Maintenance Schedule child table status for legacy data

* fix: Include legacy draft schedules in patch

* fix: Pre-commit formatting

(cherry picked from commit cc143bca0d)
 2021-09-30 08:39:55 +00:00
Frappe PR Bot
4bd1bceee2 fix: table data deleted on submitted maintenance schedule (bp #27513) 
(cherry picked from commit 5e0b21582a)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2021-09-15 17:45:48 +05:30
Frappe PR Bot
0950e246c3 refactor: .doc missing and empty row on new doc (#27408) (#27414) 
* refactor: .doc missing and empty row on new doc

* fix: let -> const

(cherry picked from commit acdb10377f)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2021-09-09 19:13:06 +05:30
Chillar Anand
4b2be2999f chore: Cleanup imports (#27320) 
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Remove imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Fix sider issues

* chore: linting

* chore: linting / sorting import

from ecommerce refactor merge

* ci: dont allow unused imports

* chore: sort / clean ecommerce imports

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-03 18:57:43 +05:30
Frappe PR Bot
25305cbeb3 fix: fetch from more than one sales order in Maintenance Visit (#26924) (#27187) 
* [fix] #26336

* fix(ux): make customer field reqd for fetching SO

Co-authored-by: Pawan Mehta <mehtapawan007@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>

(cherry picked from commit db69d1dc00)
 2021-08-26 23:03:20 +05:30
Frappe PR Bot
8dae084f23 chore: remove deprecated and empty QUnit tests (#27179) (#27181) 
* chore: remove deprecated and empty QUnit tests

* ci: fix UI test config

Testing library was added on Frappe, in order to reuse command testing
library has to be installed during setup process.

(cherry picked from commit ae55eab599)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-08-26 21:08:08 +05:30
Ankush Menat
9bb69e711a chore: whitespace cleanup from codebase 2021-08-19 14:33:03 +05:30
Noah Jacob
6fb218e033 refactor: suggested changes 2021-05-28 16:15:50 +05:30
noahjacob
0b02f1335f refactor: removed redundant links in test case 2021-05-28 11:04:34 +05:30
noahjacob
d071586589 refactor: removed maintenance schedule detail link 2021-05-28 10:54:35 +05:30
noahjacob
7fa045c1c9 refactor: using parent form links of maintenance schedule 2021-05-28 10:54:35 +05:30
noahjacob
3bca90dbe6 refactor: updated mapping for maintenance schedule links in maintenance visit 2021-05-28 10:54:22 +05:30
noahjacob
fbc8694291 refactor: added maintenance schedule links to parent form 2021-05-27 17:37:57 +05:30
noahjacob
bd783e8072 refactor: renamed item_ref to item_reference 2021-05-27 17:34:16 +05:30
noahjacob
9e4c28852e refactor: added maintenance visit to maintenance schedule dashboard 2021-05-27 17:25:50 +05:30
noahjacob
dc51388666 style: fixed indentations and formatting 2021-05-26 18:28:24 +05:30
noahjacob
f0e6a16910 test: updated test for generated schedule dates 2021-05-20 19:29:12 +05:30
noahjacob
0169cd845a fix: sider 2021-05-20 15:40:07 +05:30
noahjacob
08598238d7 refactor: suggested changes 2021-05-20 13:23:10 +05:30
noahjacob
c0352010d3 test: creating schedule and visit 2021-04-30 14:09:30 +05:30
noahjacob
7ad66caf7f refactor: migrated calculation and validation logic in js to py 2021-04-30 11:43:38 +05:30
noahjacob
fa9629c1e1 fix: Updated forms and fixed an error. 2021-04-21 11:29:40 +05:30
noahjacob
57f487a16b fix: Updated serial_no filters in maintenance visit. 2021-04-20 13:51:34 +05:30
noahjacob
5d7d338d2a feat: Schedule status is now updated on submitting a visit. 2021-04-19 18:39:34 +05:30
noahjacob
9a0a561ec6 feat: Created Dialog Box on trying to create a maintenance visit. 2021-04-19 16:42:50 +05:30
noahjacob
5ebc6abfad feat: Sales Person field is now editable after submitting. 2021-04-16 16:59:10 +05:30
noahjacob
e6fd3b86bd fix: fixed sider issues and translation syntax. 2021-04-16 15:48:36 +05:30
noahjacob
2c802720c3 feat: Automated setting end_date based on periodicity, no of visits and improved ux. 2021-04-15 20:31:18 +05:30
noahjacob
1ac471e04f feat: generate schedule is also triggered on save. 2021-04-15 16:48:01 +05:30
Walstan Baptista
d6360755b9 chore: frappe.whitelist for doc methods (#25068) 
* chore: frappe.whitelist for doc methods

* fix: incorrect spelling

* fix: sider issue

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-03-31 12:30:32 +05:30
marination
e14fdf4a3c chore: RFQ cleanup and Title case for 'Get Items From' 
- Cleanup up RFQ Get Items From Dialogs
- Title cased 'Get items from' to 'Get Items From'
 2020-10-30 17:06:00 +05:30
Abhishek Balam
4e6733293f fix(DocTypes): Reset "owner" values in DocTypes to Administrator (#23350) 
* fix: reset owner values in doctype to Administrator

* fix: updated modified value

* fix: also fixed modified by

* fix: change modified_by to Administrator
 2020-09-18 18:27:24 +05:30
Shivam Mishra
d70e711aea fix: events not deleted on cancelling maintenance schedule (#22954) 
* feat: add participant to event_participant child table

* feat: add tests

* chore: update function name

Co-authored-by: Marica <maricadsouza221197@gmail.com>

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-08-31 13:14:32 +05:30