Rohit Waghchaure
352df95976
Patch to make location
2018-05-14 19:08:56 +05:30
Zlash65
06fd51bf69
patch fix for instructor
2018-05-14 17:16:27 +05:30
Zlash65
d25a264e5b
create and update department records patch
2018-05-14 16:07:28 +05:30
Zlash65
513f13df27
patch fix
2018-05-14 16:05:16 +05:30
Zlash65
c88ce364ce
treeview implemented for supplier group
2018-05-14 11:45:38 +05:30
Zlash65
540d7aa635
patch to reload_doc and rename field
2018-05-14 11:45:38 +05:30
Nabin Hait
abd0325acd
Fixed merge conflict
2018-05-05 12:19:14 +05:30
Suraj Shetty
00cced12a0
Success Action ( #13666 )
...
* success action config for sales invoice
* remove "Notification Control" doctype and its usage
* add default success action after_install or while migration (patch)
* rename for_doctype to ref_doctype
* case change
* minor fix
* Remove unnecessary code
* Replace message with translatable message
* Fix 'cannot import error'
2018-05-03 19:06:32 +05:30
Saurabh
ed393d1025
[fix] consider user permissions in leave application calendar view ( #13902 )
...
* [fix] consider user permissions in leave application calendar view
* add hr settings to control leave calendar view
* add patch
2018-05-03 18:52:25 +05:30
Nabin Hait
ed376cacc8
Set Qty in transactions based on serial no via Stock Settings ( #13897 )
2018-05-03 16:24:52 +05:30
rohitwaghchaure
125c0caf12
Added brand in item price doctype, item prices report ( #13900 )
2018-05-03 16:23:57 +05:30
Nabin Hait
3652a62b55
minor fixes
2018-04-30 19:32:29 +05:30
Nabin Hait
d39386bd55
Renamed some salary related fields
2018-04-30 16:21:37 +05:30
rohitwaghchaure
efff6e53de
Consolidated financial statement ( #13678 )
...
* added fields to support treeview
* tree file added, nestedset implemented
* patch added to reload doc and configure lft rgt
* Added consolidated financial statement report
2018-04-26 12:16:18 +05:30
Nabin Hait
8076d6ddc8
Renamed Health Insurance to Employee Health Insurance
2018-04-26 12:16:17 +05:30
Nabin Hait
265426a5a6
Minor fixes
2018-04-26 12:14:02 +05:30
Nabin Hait
81706fdb46
Update rename_field_max_days_allowed.py
2018-04-26 12:14:02 +05:30
Nabin Hait
551844881b
Removed employee table from Salary Structure and added employee name in all forms
2018-04-26 12:14:01 +05:30
Shreya Shah
b15ef8450f
[Enterprise] Patch and child table changes ( #13656 )
...
* [patch] rename field
* Employee Property History child table
* remove child tables
2018-04-26 12:13:06 +05:30
Rushabh Mehta
369afce43c
[patch] ignore validations while creating custom fields for gst via patch
2018-04-26 10:10:03 +05:30
Saurabh
1d5bbe1081
Merge branch 'master' into develop
2018-04-25 12:46:50 +05:30
Rohit Waghchaure
bf416cfbf8
[Fix] POS Patch
2018-04-25 12:32:22 +05:30
Saurabh
63590496c1
[fix] resolved merge conflicts
2018-04-25 11:32:54 +05:30
rohitwaghchaure
57914f140e
[HotFix] Taxes not adding in POS sales invoice ( #13776 )
2018-04-24 19:19:47 +05:30
Nabin Hait
5643c3ead2
Minor fix in reloading email template
2018-04-24 17:51:13 +05:30
Shreya Shah
4dc453d131
Loan Management for the Members (Non Profit Module) ( #13149 )
...
* Renamed - Employee Loan Application to Loan Application, Employee Loan to Loan and field Employee Loan Account to Loan Account
* Patch added
* Dynamic link fields 'applicant' and 'applicant_type'
* Member link visible only if domain non profit is active
* Modified loan_dashboard
* Make Repayment Entry button
* Common file loan_common.js for loan and loan_application
* repayment schedule rows selection in dialog
* validation if repayment amount > total paid amount
* repayment only if disbursement is done, make repayment by selecting the installment which falls in the current month
* fetch nowdate if disbursement date not found
* Rebased with develop
* updated non-profit module page
* updated patch for renamed fields
* dialog to select repayment entries
* hidden field to store reschedule paid status
* update paid check in loan on journal entry updation
* calculate total paid
* updated docs
* codacy fix
2018-04-24 12:19:36 +05:30
Manas Solanki
276a92539d
Update move_leave_approvers_from_employee.py
2018-04-23 14:55:19 +05:30
Shreya Shah
828f5ab29e
Patch fixes ( #13754 )
...
* reload doc
* remove unused code
2018-04-23 13:21:35 +05:30
tundebabzy
dbdf462e56
fix conflict
2018-04-22 23:49:26 +01:00
Shreya Shah
44e719d64c
[Enhancement] Leave Application and Expense Claim ( #13645 )
...
* child table employee expense approver
* set query in department
* mandatory approver check in hr settings
* triggers on leave and expense approver
* fetch all parent approvers from department hierarchy
* fixes
* patch to move employee approvers from employee to department
* removed hard coding of roles
* modify approvers list query
* commonified functions
* patch
* renamed standard reply occurrences
* removed leave approvers table from Employee master
* email templates for leave application notification
* set default email templates for leave in hr settings
* notify by email template
* approval status in expense claim
* render template in patch
* removed unused code
* Single child table department approver
* read instead of render template
2018-04-19 20:58:52 -08:00
tundebabzy
280c7a410a
code review: make use of db_insert and change Auto Repeat
to auto_repeat
2018-04-17 11:32:17 +01:00
tundebabzy
20721942ad
code review: use delete from
to delete records
2018-04-17 11:31:23 +01:00
tundebabzy
5988da9a31
code review: revert changes
2018-04-17 11:30:35 +01:00
tundebabzy
caae0f4dcc
Merge branch 'develop' into new-subscription
2018-04-17 09:34:04 +01:00
Shreya Shah
6bf4e5b73b
Department Tree ( #13567 )
...
* Department Tree
* print hide fields
* create 'All Departments' as parent on setup
* patch to set lft rgt
* fix translatable string
2018-04-13 15:09:26 +05:30
Nabin Hait
642d39098a
Fixed merge conflict
2018-04-13 14:38:57 +05:30
rohitwaghchaure
1129ac711e
[Fix] Patch ( #13610 )
2018-04-12 14:48:23 +05:30
Prateeksha Singh
59147c0368
Merge pull request #13538 from pratu16x7/hub-fixes
...
[fix] company listing context
2018-04-05 14:53:11 +05:30
Prateeksha Singh
420c79041e
[fix] company listing context
2018-04-05 14:44:16 +05:30
Suraj Shetty
97d84eb509
remove apply user permission ( #13505 )
2018-04-05 12:10:46 +05:30
Rohit Waghchaure
395d61b998
[Fix] Travis
2018-04-02 15:11:47 +05:30
Nabin Hait
c825e914d1
Added indexes for lft, rgt on nestedset doctypes ( #13420 )
2018-04-02 10:43:46 +05:30
Nabin Hait
4d9e104284
Merge branch 'master' into develop
2018-03-28 15:51:18 +05:30
Nabin Hait
7041a45294
Update fix_reserved_qty_for_sub_contract.py
2018-03-28 15:50:14 +05:30
Nabin Hait
6c35822a35
Merge branch 'master' into develop
2018-03-28 10:40:14 +05:30
Nabin Hait
2e203e53c6
Update fix_reserved_qty_for_sub_contract.py
2018-03-28 10:38:55 +05:30
Nabin Hait
9db28ef90d
Minor fix in patch
2018-03-27 16:00:57 +05:30
Nabin Hait
b9c82b9790
Fixed merge conflict
2018-03-27 14:25:27 +05:30
Nabin Hait
651b612909
Fixed logic for reserved qty for subcontract and production and written a patch ( #13396 )
...
* Fixed logic for reserved qty for subcontract and production and written a patch
* repost reserved qty for filtered bins
2018-03-27 11:24:20 +05:30
Nabin Hait
061d912749
Fixed merge conflict
2018-03-23 16:20:27 +05:30