Gaurav Naik
32b3aa257c
[Fix] Indentation for accounting_period overlap
2018-05-14 18:02:24 +05:30
Jamsheer
b848c51592
Compensatory Leave Request - leave allocation create and update - fix
2018-05-14 17:56:22 +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
03ad0f2f4a
set query for department based on company
2018-05-14 16:07:28 +05:30
Zlash65
9a8f5bd6c7
set department name with company abbr
2018-05-14 16:07:27 +05:30
Zlash65
39668609ce
improv department tree
2018-05-14 16:07:27 +05:30
Zlash65
366ca92ba7
move default_currency on top
2018-05-14 16:07:27 +05:30
Zlash65
513f13df27
patch fix
2018-05-14 16:05:16 +05:30
rohitwaghchaure
c7ccd3ca2e
Merge pull request #13985 from saurabh6790/leave_period_fix
...
add get leave period method
2018-05-14 15:47:15 +05:30
Faris Ansari
404f39d373
[fix] apply price list
...
in_apply_price_list flag remains true if server exception occurs
2018-05-14 15:46:45 +05:30
Zlash65
39097c7fbe
codacy fix
2018-05-14 15:34:45 +05:30
Shreya Shah
bbee9b6cc4
[Enhancement] Monthly Attendance Report ( #13970 )
...
* Update Attendance on Approval of Leave
* Separate out leaves on the basis of its type
* Remove commented code
* Make attendance records if not found
* Fix Codacy
* Replace bad code in attendance.py
2018-05-14 14:30:58 +05:30
Manas Solanki
661332dab5
[fix] honour the shopping cart setting when showing the stock and non-stock item ( #13988 )
2018-05-14 14:30:30 +05:30
Zarrar
8646ed45bc
button triggers not working in tasks table ( #13973 )
2018-05-14 14:29:01 +05:30
Faris Ansari
69b0535e10
[fix] Incorrect currency conversion in Itemised Tax Breakup ( #14006 )
2018-05-14 14:19:31 +05:30
Suraj Shetty
f93cc57e8a
Ignore user permission for 'variant Of' in Item ( #14013 )
...
- Since mostly variant of is null it gets filtered out if
user permission is applied.
And since variant is a link to item itself there is no need to check
user permission for it as user permission gets applied on Item anyways.
2018-05-14 14:07:20 +05:30
Shreya Shah
ba6cb8ae4b
[Healthcare] Fix UI ( #14011 )
...
* Fix UI
* Fix Calendar View
2018-05-14 14:06:31 +05:30
Faris Ansari
a7387b45ec
[fix] Get items from BOM error in python 3 ( #14012 )
2018-05-14 14:05:52 +05:30
rohitwaghchaure
7f63c1ad7c
Merge pull request #14014 from rohitwaghchaure/hotfix_production_order_name_issue
...
[Fix] 'ProductionOrder' object has no attribute 'set_work_order_operations'
2018-05-14 14:04:09 +05:30
Jamsheer
236be22648
Payroll entry - get employee fix
2018-05-14 13:32:50 +05:30
Rohit Waghchaure
ebe1ebead2
[Fix] 'ProductionOrder' object has no attribute 'set_work_order_operations'
2018-05-14 13:21:45 +05:30
Jamsheer
d0b0c87f40
get additional salary component in salary slip
2018-05-14 12:16:46 +05:30
Jamsheer
08b60a1a62
New Doctype - Additional Salary Component
2018-05-14 12:16:46 +05:30
Jamsheer
a5028c8e54
Salary Structure - filter updated, Salary Component - fields re-arranged
2018-05-14 12:16:45 +05:30
Jamsheer
b5c5c471b4
Formula on Salary Component Master
2018-05-14 12:16:45 +05:30
Jamsheer
4bd7cdb018
Salary Structure Assignment - filters applied
2018-05-14 12:13:47 +05:30
Manas Solanki
a27d29b349
enable deferred revenue in the item master
2018-05-14 12:07:14 +05:30
Zlash65
f665189ab3
tree based changes
2018-05-14 11:45:38 +05:30
Zlash65
93d6b555d7
added fixtures for supplier-group, changed analytics report accordingly
2018-05-14 11:45:38 +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
Zlash65
2e0809801d
controller and other changes
2018-05-14 11:45:38 +05:30
Zlash65
890707854d
config/utility level changes
2018-05-14 11:45:38 +05:30
Zlash65
0a50554417
doctype level changes
2018-05-14 11:45:38 +05:30
Zlash65
4437a5ed18
json level changes
2018-05-14 11:45:38 +05:30
Zlash65
3387a35fed
rename supplier-type to supplier-group
2018-05-14 11:42:30 +05:30
rohitwaghchaure
a8c49f26d3
Merge pull request #14002 from rohitwaghchaure/search_item_spelling_issue
...
Fixed spelling
2018-05-14 00:44:29 +05:30
Rohit Waghchaure
eee830eafe
Fixed spelling
2018-05-13 16:17:18 +05:30
Saurabh
c1acbdfb69
[fix] overlapping dates
2018-05-12 17:45:39 +05:30
Saurabh
a35dad7610
add get leave period method
2018-05-12 17:45:39 +05:30
Faris Ansari
f2b3307136
Remove escaped customer string ( #13986 )
...
- no need to escape strings that are passed to the values parameter of the sql method
- this query was failing for inputs like "D'Arby" which have quotes
2018-05-11 21:07:27 +05:30
Jamsheer
46b23f8e6e
Salary Structure Refactor, Formula on Salary Component Master ( #13967 )
...
* Salary structure refactor
* Salary Structure Assignment - filters applied
* Formula on Salary Component Master
* Salary Structure - filter updated, Salary Component - fields re-arranged
* Payroll Entry - get_employee_list fix
* Salary Structure Assignment - Validate Duplicate Assignment
* Salary Structure Assignment - filters for salary structure
2018-05-11 21:05:24 +05:30
Pawan Mehta
c53e35368d
Shift Management - Documentation and Tests ( #13997 )
...
* [fix] #13996
* codacy fix
2018-05-11 21:03:50 +05:30
Gaurav Naik
9502476c67
Accounting Period overlap validation
2018-05-11 07:53:12 +05:30
Gaurav Naik
6c92cff226
Accounting Period autoname
2018-05-11 07:52:50 +05:30
Ranjith
ded636097e
Tax Declaration, Proof Submission tests
2018-05-10 15:42:04 +05:30
Ranjith
5a8e6427f4
Tax Declaration, Proof Submission, validation
2018-05-10 15:06:49 +05:30
Ranjith
85d2d571c5
update hr menu, field subcategory in child table
2018-05-10 15:04:32 +05:30
Ranjith
e1c556b7e0
Doctype Employee Tax Exemption Sub Category
2018-05-10 15:02:57 +05:30
