Commit Graph

22935 Commits

Author SHA1 Message Date
Rushabh Mehta
1198d94904 [rename] Email Alert -> Notification 2018-06-14 13:18:21 +05:30
Shreya Shah
c3d1353ab5
Merge pull request #14518 from shreyashah115/patch-fix
Check if table exists else return
2018-06-14 13:08:49 +05:30
Shreya
df385ac3c0 Check if table exists else return 2018-06-14 13:07:52 +05:30
Zarrar
14a9c0706b
Merge pull request #14461 from mntechnique/sales_partner_type
Partner Type as Link field added in Sales Partner
2018-06-14 12:48:24 +05:30
Zarrar
6ffdf94003 [Fixes] Defaults and User-Permission based fixes in treeview (#14501)
* utility function added for treeview
function to distinguish defaults from user permission and return appropriate data

* make use of utility function for treeview
2018-06-14 12:24:16 +05:30
Shreya Shah
06ef4270f2
Merge pull request #14447 from zerodhatech/loan_application
[Enhancement] toggle required fields on select of repayment option in loan application
2018-06-14 12:05:46 +05:30
Jamsheer
c7743932ab [Fix] HR Fixes (#14511)
* Payroll Entry - fix in db query

* Salary Structure Assignment - Company read_only = 1

* Fixes in hr util and benefit claim

* Employee Benefit Application - Late application - fix
2018-06-14 11:55:17 +05:30
Zarrar
17089eeac3 [Minor] Fetching and appending items in Stock Reconciliation fix (#14509)
* minor fix in get_list of items in stock reconciliation

* reload doc fails because of backdated modified date

* item and item defaults should load prior to shopify refactor

* attribute value should't be none or empty, could be zero though

* Update item.py
2018-06-14 11:54:18 +05:30
Rushabh Mehta
0d19744b17 [fix] for notification 2018-06-14 09:23:32 +05:30
IOWEB TECHNOLOGIES
62805e2101 Fix unicode literal issue that prevents payment entries to be created (#14515) 2018-06-14 09:14:07 +05:30
rohitwaghchaure
fb997d6539 [Fix] Woocommerce test cases (#14513) 2018-06-14 09:13:39 +05:30
Prateeksha Singh
0738483343 [docs] remove docs folder 💥, update docs app to foundation (#14516) 2018-06-14 09:11:05 +05:30
Manas Solanki
687c6bb002
Merge pull request #14510 from rohitwaghchaure/test_cases_for_material_consumption
[Fix] Travis for the test case test_material_consumption
2018-06-13 18:41:12 +05:30
Rohit Waghchaure
80d4477d1e [Fix] Travis for test_material_consumption 2018-06-13 18:37:03 +05:30
Shreya Shah
a2056a39bd Fix patch (#14503)
* Modify patch to move leave approvers from Employee master to Department master

* Rename child table names

- Rename leave approver to leave approvers
- Rename expense approver to expense approvers

* Import cstr

* Fix a condition
2018-06-13 17:11:17 +05:30
Manas Solanki
aa17294979
Update utils.py 2018-06-13 16:47:41 +05:30
Jamsheer
30f37b2eb1 Payroll Entry - Separate JE for flexi salary component (#14502)
* Payroll Entry - Accrual entry - exclude only tax impact - and separate JE for Flexi in Bank Entry

* Journal Entry - validate cheque info on submit

* Payroll Entry - Make Bamk Entry - Separate JE for benefit component
2018-06-13 15:29:38 +05:30
Jamsheer
cc25eb00b5 Employee benefit application depends on lwp (#14494)
* Employee benefit - pro-rata amount - depends on lwp and working days

* HR Util - get holidays for employee

* Employee Benefit Application - calculate remainig on max benefit

* Employee benefit - late application - depends on lwp

* missing semicolon
2018-06-13 15:14:24 +05:30
rohitwaghchaure
93e8bbac84 [Fix] Travis for employee_tax_exemption_declaration (#14500) 2018-06-13 15:12:32 +05:30
Shreya Shah
4fe2a91b9f Remove docstatus=1 to show pending leaves as well (#14498) 2018-06-13 15:11:43 +05:30
Manas Solanki
9385cd5203
Merge pull request #14496 from rohitwaghchaure/stock_entry_test_cases
[Fix] Travis for stock entry
2018-06-13 14:06:20 +05:30
Rohit Waghchaure
0eef3f665d [Fix] Travis for stock entry 2018-06-13 13:06:25 +05:30
Manas Solanki
2304dc435a
Merge pull request #14493 from manassolanki/travis-3
fix the timesheet test cases
2018-06-13 12:30:54 +05:30
Manas Solanki
b12f0d90af fix the timesheet 2018-06-13 12:30:02 +05:30
Jamsheer
f6d7b5d0c8 Salary slip - additional salary - deductions (#14476) 2018-06-13 11:36:43 +05:30
Tom Price
32c984cd3c Fix fields being hidden by default. (#14490)
Modify the title property to be sensible for general usage, unique and translatable.

Add allow_in_quick_entry properties appropriately.
2018-06-13 11:14:44 +05:30
Manas Solanki
176e7c5ce2 fix the test case for the payroll (#14480)
* fix the test case for the payroll

* fix the shopify and stock entry

* more structured test cases for payroll
2018-06-13 11:13:01 +05:30
Prateeksha Singh
d1fffb6ba1
Merge pull request #14484 from pratu16x7/help-portal
[help-portal] don't show issues to guest
2018-06-12 17:40:36 +05:30
Prateeksha Singh
8d58429b69 [help-portal] don't show issues to guest 2018-06-12 17:39:12 +05:30
Nabin Hait
76c51b3068 minor ux fix 2018-06-12 16:29:10 +05:30
deepak-mnt
b95f60c6f3 minor changes 2018-06-12 16:04:49 +05:30
rohitwaghchaure
6c4fa1e917
Merge pull request #14478 from rohitwaghchaure/test_cases_fix_for_purchase_receipt
[Fix] Purchase receipt test cases
2018-06-12 13:55:02 +05:30
Rohit Waghchaure
b6381c66d8 [Fix] Purchase receipt test cases 2018-06-12 13:54:40 +05:30
rohitwaghchaure
a6b346f827
Merge pull request #14475 from rohitwaghchaure/asset_test_cases_fixes
[Fix] Test cases for asset
2018-06-12 12:21:11 +05:30
Rohit Waghchaure
f270567c45 [Fix] Test cases for asset 2018-06-12 12:20:52 +05:30
Ranjith Kurungadam
138e6abaff Salary Slip - update tax calculation, deduct tax for unsubmitted exemption proof (#14428) 2018-06-12 12:19:36 +05:30
Suraj Shetty
e06ecd2494 Check if user permission for employee exists (#14474)
- Also check if user has permission to
add user permission to avoid insufficient
permission error while updating user profile
2018-06-12 12:06:41 +05:30
Jamsheer
8d66f1e45d Employee benefit - Late employee benefit application (#14465)
* HR Utils - get salary slip total benefit given for a payroll period

* Late employee benefit application

* Additional Salary - code refactor - get_amount

* new line in salary detail json

* Employee benefit late application - validation refactor

* Codacy fix
2018-06-12 11:30:59 +05:30
rohitwaghchaure
2354c1eba3
Merge pull request #14467 from rohitwaghchaure/update_location_in_serial_no
Code cleanup and fixes for the asset
2018-06-12 11:19:01 +05:30
Manas Solanki
65b55a53a6
Update test_leave_application.py 2018-06-12 11:18:01 +05:30
rohitwaghchaure
26943184e6
Merge pull request #14471 from rohitwaghchaure/fix_patch_update_total_qty_field
[Fix] patch
2018-06-12 01:16:52 +05:30
Rohit Waghchaure
ec2a2ac47e [Fix] patch 2018-06-12 01:16:28 +05:30
Manas Solanki
b81e384753
Merge pull request #14466 from frappe/manassolanki-patch-12
Only run the ERPNext tests
2018-06-11 19:30:01 +05:30
Manas Solanki
d7f6d45e28
Merge pull request #14468 from manassolanki/fix-travis-1
fix the salary slip test cases
2018-06-11 19:29:28 +05:30
Manas Solanki
f226b50d6d fix the salary slip test cases 2018-06-11 19:27:46 +05:30
Rohit Waghchaure
647d595158 Code cleanup and fixes for the asset 2018-06-11 19:15:08 +05:30
Shridhar Patil
c3f5849ac0 typo fixed 2018-06-11 18:26:45 +05:30
Manas Solanki
fde28a284e
Update .travis.yml 2018-06-11 18:07:49 +05:30
Manas Solanki
e832aa4fe2
Merge pull request #14436 from shreyashah115/fix-trav
Travis again
2018-06-11 17:45:11 +05:30
Shreya Shah
157815ff0c Patch for total quantity (#14458)
* Add path to patches.txt

* Modify patch
2018-06-11 17:32:17 +05:30