Himanshu Warekar
5ebdf76669
Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix
2019-06-27 01:29:25 +05:30
Himanshu Warekar
24b9d1e5a6
fix: patch fixes
2019-06-27 01:29:00 +05:30
Himanshu
9323c3ae29
Merge branch 'develop' into sla_fix
2019-06-26 12:54:08 +05:30
Deepesh Garg
ea0574679f
fix: Removed submitted status from Quotation ( #18055 )
...
* fix: Change in list view and status updater
* fix: Change status in doctype
* fix: Patch for submitted status
2019-06-26 11:05:51 +05:30
Himanshu Warekar
99d46844d5
fix: minor patch fix
2019-06-25 16:25:51 +05:30
Himanshu Warekar
54ece39aef
fix: review changes
2019-06-24 15:18:56 +05:30
Himanshu Warekar
bbe84ac0ef
feat: change apply_to to entity
2019-06-20 10:53:34 +05:30
Himanshu Warekar
41bf0c6855
feat: filter sla based on customer in issue
2019-06-20 10:00:11 +05:30
Himanshu Warekar
36d6e570c4
patch: try catch to handle TableMissingError
2019-06-19 14:43:21 +05:30
Mangesh-Khairnar
439313e524
Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management
2019-06-19 13:10:53 +05:30
Mangesh-Khairnar
12a2b21465
fix: track status for pending leaves
2019-06-19 13:00:52 +05:30
Himanshu Warekar
f4f7e781c5
debug: travis
2019-06-19 12:01:59 +05:30
Himanshu Warekar
e48ca44bf5
patch: fix typo
2019-06-18 20:02:00 +05:30
Himanshu Warekar
7881e838c6
patch: refactor patch for travis test
2019-06-18 19:35:50 +05:30
Himanshu Warekar
befd393dcb
fix: patch
2019-06-18 12:51:12 +05:30
Himanshu Warekar
0ad3887d51
patch: fixes
2019-06-17 23:52:53 +05:30
Himanshu Warekar
bdf9737d73
patch: reload service level priority
2019-06-17 18:00:57 +05:30
Himanshu Warekar
67f9b63793
patch: get priority before reload_doc
2019-06-17 11:49:02 +05:30
Himanshu Warekar
199b43dbbb
fix: patch fixes for sla
2019-06-17 09:35:34 +05:30
Himanshu Warekar
b9ddcc4bfa
Merge develop into sla_fix
2019-06-15 13:09:57 +05:30
Mangesh-Khairnar
1db0fc91a5
fix: check generated ledger entries to avoid overlap
2019-06-14 15:48:31 +05:30
Mangesh-Khairnar
87adaed933
fix: generate ledger entries for all leave transactions
2019-06-14 15:13:53 +05:30
deepeshgarg007
44ac3580d9
fix: Fix breaking patch on develop branch
2019-06-11 18:35:01 +05:30
sahil28297
3720126ee9
fix(patch): escape illegal characters to avoid SQL syntax error ( #17890 )
2019-06-10 17:39:42 +05:30
Himanshu Warekar
874326dc7b
patch: set apply_to as customer
2019-06-10 12:33:30 +05:30
Himanshu Warekar
a18ba9c718
Merge develop into sla_fix
2019-06-10 12:32:45 +05:30
Himanshu Warekar
0674d16fee
feat: sla based on customer/group/territory
2019-06-07 15:28:42 +05:30
Mangesh-Khairnar
b16d395a8f
Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management
2019-06-07 11:33:06 +05:30
Rohit Waghchaure
3cf24366a9
feat: provision to set multiple manufacturer in the item master
2019-06-06 19:53:32 +05:30
Himanshu Warekar
b318b83bb7
patch: fixes
2019-06-06 12:03:37 +05:30
Himanshu Warekar
7acdcac124
patch: fixes
2019-06-06 11:56:38 +05:30
Himanshu Warekar
cbbe2814a6
patch: add priority in service level and agreement
2019-06-06 11:49:15 +05:30
Himanshu Warekar
b9c24a01da
patch: reload_doc before inserting values
2019-06-06 11:15:33 +05:30
Himanshu Warekar
e175dd8249
patch: set priorities for issue
2019-06-06 10:58:42 +05:30
Mangesh-Khairnar
95e5d812fe
fix: UX changes
2019-05-30 22:22:15 +05:30
Mangesh-Khairnar
aafb5cb6f6
fix: ignore expired non-carry forwarded allocation on calculating leaves taken
2019-05-30 13:13:14 +05:30
Mangesh-Khairnar
ded33a7e2e
fix: ledger entries creation
2019-05-29 19:12:19 +05:30
Mangesh-Khairnar
8f47bffa0e
fix: create an instance
2019-05-29 15:54:14 +05:30
Mangesh-Khairnar
ae4228aed4
fix: fetch queries
2019-05-28 13:24:15 +05:30
Mangesh-Khairnar
9d6151d200
patch: add reload doc for leave ledger entry
2019-05-28 11:45:51 +05:30
Mangesh-Khairnar
705b7dc9c2
Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management
2019-05-27 11:21:06 +05:30
Mangesh-Khairnar
24248f687b
patch: create entries for only missing transactions
2019-05-27 10:58:42 +05:30
Mangesh-Khairnar
f3926d0fcb
patch: leave ledger entries
2019-05-26 20:17:16 +05:30
Himanshu Warekar
f38486b22c
Merge develop into sla_fix
2019-05-20 23:25:26 +05:30
Faris Ansari
a1f31e8444
feat(regional): Bank remittance report ( #17524 )
...
feat(regional): Bank remittance report
2019-05-20 15:00:48 +05:30
Mangesh-Khairnar
57c861efc3
feat: add patch to create custom fields for india specific client
2019-05-20 13:08:18 +05:30
Himanshu Warekar
628ea47c6d
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
2019-05-17 00:48:23 +05:30
Saurabh
9da57d79b5
fix: reload docs before creating custom fields ( #17586 )
2019-05-15 11:39:41 +05:30
Shivam Mishra
374999b048
feat: Password protected salary slips ( #17380 )
...
* feat: Added check for encrypting salary slips and password policy field
* feat: make password policy mandatory if encrypt option is selected
* feat: added password logic to email_salary_slip
* fix: import error
* chore: Minor enhancement to validations in salary slip
* fix: travis patch
* feat: Modified email body for password protected salary slips
2019-05-08 17:30:08 +05:30
Himanshu Warekar
c5999154e6
fix: test cases and use orm
2019-05-06 23:43:16 +05:30
