Kenneth Sequeira
5becde7a45
embedded social login keys set up videos ( #13659 )
2018-04-24 12:11:29 +05:30
hiousi
38de994788
do not copy template description to variant if not in allow fields ( #13726 )
2018-04-24 12:10:45 +05:30
Saurabh
9738d52d5f
Merge branch 'master' into develop
2018-04-24 12:09:40 +05:30
Saurabh
ede0af97cd
Merge branch 'hotfix'
2018-04-24 12:09:38 +05:30
Saurabh
ad4ede0e23
bumped to version 10.1.25
2018-04-24 12:39:38 +06:00
Saurabh
cfcf9b3832
Merge pull request #13772 from saurabh6790/supp_240418
...
typo fix
2018-04-24 12:08:38 +05:30
Shreya Shah
6db3d84cc0
remove unused code ( #13765 )
2018-04-24 12:07:40 +05:30
Saurabh
d2065ce3bf
typo fix
2018-04-24 12:07:37 +05:30
Rohit Waghchaure
31edddace6
[Fix] Tax not changes when user change the POS profile in the sales invoice
2018-04-24 11:43:31 +05:30
Saurabh
2e7a45dbb4
resolved merge conflicts
2018-04-24 11:16:13 +05:30
Saurabh
8f29159fb7
Merge branch 'hotfix'
2018-04-24 11:12:07 +05:30
Saurabh
d9f1b539dc
bumped to version 10.1.24
2018-04-24 11:42:07 +06:00
Deepak kumar
022ac50160
Reverse Journal Entry ( #13637 )
...
* [Fix] #13605
* fixes codacy
* minor changes
* Added naming series for reverse journal entry
* added reference_type and reference_name
2018-04-24 10:52:28 +05:30
Manas Solanki
276a92539d
Update move_leave_approvers_from_employee.py
2018-04-23 14:55:19 +05:30
Prateeksha Singh
60bd383a25
Merge pull request #13763 from pratu16x7/hotfix
...
[fix] cal view start end date field discrepancies
2018-04-23 13:34:49 +05:30
Prateeksha Singh
c0ec3c3f7b
[fix] cal view start end date field discrepancies
2018-04-23 13:32:59 +05:30
Zarrar
68a7ee22f2
order_by for gantt error fix ( #13752 )
2018-04-23 13:22:03 +05:30
Shreya Shah
828f5ab29e
Patch fixes ( #13754 )
...
* reload doc
* remove unused code
2018-04-23 13:21:35 +05:30
Manas Solanki
60aa1170d5
Merge pull request #13762 from manassolanki/fix-patient-appointment
...
fixed the gantt view of patient appointment
2018-04-23 12:39:28 +05:30
Manas Solanki
9630aa3d7f
fixed the gantt view of patient appointment
2018-04-23 12:37:11 +05:30
Kenneth Sequeira
d4991cc49f
Assets Docs Update ( #13749 )
...
* asset depreciation auto booking image added
* commit 3
2018-04-23 11:35:24 +05:30
Manas Solanki
aa6576c0ea
Merge pull request #13755 from Zlash65/typo
...
[Minor] Typo fix in Leaderboard
2018-04-23 11:09:18 +05:30
tundebabzy
dbdf462e56
fix conflict
2018-04-22 23:49:26 +01:00
tundebabzy
f65ee888c0
spelling: canceled --> cancelled
2018-04-22 23:43:08 +01:00
Zlash65
fa5ecb066e
typo fix in leaderboard
2018-04-22 12:11:01 +05:30
Nabin Hait
c36524ec54
Update chart_of_accounts.py
2018-04-20 11:00:20 +05:30
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
Saurabh
cba3570cf6
Merge pull request #13734 from rohitwaghchaure/pos_special_character_item_issue
...
[Fix] Item with special character not adding in the POS cart
2018-04-19 15:58:35 +05:30
Saurabh
5b7503c074
Merge pull request #13691 from saurabh6790/supp_180417_1
...
[hotfix] multiple fixes
2018-04-19 15:57:35 +05:30
Rohit Waghchaure
8441dd9184
[Fix] Item with special character not adding in the POS cart
2018-04-19 12:55:06 +05:30
Julian Robbins
78869f1e77
Update manual-feedback-request.md ( #13709 )
...
Changed wording to reflect current wording of Feedback Request rather than 'Ask a Feedback'
2018-04-18 03:12:30 -08:00
Rushabh Mehta
ff8f1bc88e
Revert "removed bad code and made compatible with pip 10 ( #13685 )" ( #13713 )
...
This reverts commit 91b0dce4d8
2018-04-18 02:57:44 -08:00
Ameya Shenoy
91b0dce4d8
removed bad code and made compatible with pip 10 ( #13685 )
2018-04-18 02:57:04 -08:00
Zarrar
59f7b8c4a1
issue routing to report ( #13710 )
2018-04-18 02:56:02 -08:00
Saurabh
2476a8aab9
a[fix] check content before making in condition
2018-04-17 20:45:06 +05:30
Saurabh
46ffbb74ff
fix cheque print measurements
2018-04-17 20:44:37 +05:30
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
Saurabh
492aff2a8b
[fix] check if academic_year exists ( #13665 )
2018-04-17 14:21:40 +05:30
tundebabzy
caae0f4dcc
Merge branch 'develop' into new-subscription
2018-04-17 09:34:04 +01:00
matmyers
742da8cfce
removed duplicate keys ( #13675 )
2018-04-17 12:20:57 +05:30
Saurabh
46743d00d6
Merge branch 'master' into develop
2018-04-17 12:00:21 +05:30
Saurabh
c3fbc04aab
Merge branch 'hotfix'
2018-04-17 12:00:19 +05:30
Saurabh
5b866db6bc
bumped to version 10.1.23
2018-04-17 12:30:19 +06:00
Saurabh
9fbb8192e1
[fix] do not escape % while using clause ( #13677 )
2018-04-17 11:56:46 +05:30
Faris Ansari
d7a3b78fdf
[py3] Cast dict_keys to list ( #13663 )
2018-04-16 14:39:37 +05:30
Saurabh
ea1408f2e0
[fix] enqueue salary slip print email after completing accounting entries ( #13633 )
2018-04-15 21:38:49 -08:00
Saurabh
f2a941b1a4
[fix] check if supplier value exists ( #13616 )
2018-04-15 21:37:14 -08:00
Sanjay Kumar
bc83daf0fa
#13478 : Default Accounts in Item from Item Group ( #13635 )
...
* remove external app reference and update get_warehouse_list
* resolve #13478 : Default Accounts in Item from Item Group
2018-04-15 21:36:37 -08:00
