Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,010 Commits 3 Branches 0 Tags 1 GiB
59798b4e88
Commit Graph

23010 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jamsheer
0ca76323af Clinical Procedure Template - get_item_details - fix (#14449) 2018-06-11 17:25:49 +05:30
Prateeksha Singh
252d0bf255
Merge pull request #14455 from frappe/kennethsequeira-patch-3 
Fix minor div issue in Accounts index page
 2018-06-11 16:33:51 +05:30
Prateeksha Singh
a831868d02
Merge pull request #14460 from chdecultot/hotfix_customer 
Customer timeline data hotfix
 2018-06-11 16:31:17 +05:30
rohitwaghchaure
7cd59a2089
Merge pull request #14453 from rohitwaghchaure/item_alternative_fixes_for_backflush 
[Fix] Alternative item, transferred qty issue for backflush method
 2018-06-11 15:44:37 +05:30
Shreya
9680dc476f Remove commented code 2018-06-11 15:40:09 +05:30
Charles-Henri Decultot
943dc09f29 Customer timeline data hotfix 2018-06-11 09:42:05 +00:00
deepak-mnt
bb6753f206 Merge branch 'develop' of https://github.com/frappe/erpnext into sales_partner_type 2018-06-11 15:01:43 +05:30
deepak-mnt
4ec283d775 patch for sales partner type field 2018-06-11 14:53:25 +05:30
Manas Solanki
3bfe7b9148
Merge pull request #14454 from frappe/manassolanki-patch-11 
Update cost_center.py
 2018-06-11 14:25:50 +05:30
Manas Solanki
7e8cbf288c
Update cost_center.py 2018-06-11 14:25:27 +05:30
Kenneth Sequeira
061492a9af
Fix minor div issue in Accounts 2018-06-11 14:24:19 +05:30
Rohit Waghchaure
86026d31cf [Fix] Alternative item, transferred qty issue for backflush method 2018-06-11 14:11:00 +05:30
rohitwaghchaure
b2fc349026
Merge pull request #14450 from rohitwaghchaure/removed_company_data_from_test_item_records 
Removed company data from test item records
 2018-06-11 13:35:14 +05:30
Rohit Waghchaure
cdec44ee81 Removed company data from test item records 2018-06-11 13:32:34 +05:30
Prateeksha Singh
ea7533fa75 [tax-breakup] store itemized tax by item_name when can 2018-06-11 13:31:33 +05:30
Shridhar Patil
6a00a17c14 toggle required fields on select of repayment option in loan application 2018-06-11 12:48:31 +05:30
rohitwaghchaure
7048925016 [Enhance] Standalone debit/credit note (#14269) 
* [Enhance] Standalone debit/credit note

* Test cases

* Test cases and documentation

* Removed credit, debit note links from accounts module
 2018-06-11 12:02:14 +05:30
Manas Solanki
3639b85663
Merge pull request #14363 from frappe/manassolanki-patch-10 
PR to check the current state of Travis
 2018-06-11 11:40:40 +05:30
Ranjith Kurungadam
e46639f47c Employee Transfer allow same company, update internal work history (#14430) 2018-06-11 11:24:44 +05:30
Zarrar
88a90ff3b5 minor fix in account and account utils (#14432) 2018-06-11 11:21:17 +05:30
Shreya
83d5dc119b Fix Employee tax declaration test case 2018-06-11 10:31:40 +05:30
Shreya
664f30a018 Fix asset maintenance json 2018-06-11 10:31:40 +05:30
Shreya
77662eb5f4 Fix shopify test case 2018-06-11 10:31:40 +05:30
Shreya
294238abfd Fix shopify test case 2018-06-11 10:31:39 +05:30
Shreya
3b201cc2fd Remove python 3 stage from travis 2018-06-11 10:31:39 +05:30
Shreya
956277b121 Fix tests 2018-06-11 10:31:39 +05:30
Zarrar
65994210f6 fix patch to add email template in hr settings (#14427) 2018-06-08 16:57:06 +05:30
Zarrar
44175904c6 Tree fix (#14425) 
* use frm.set_value instead of this.set_value

* generic methods moved to accounts/utils

* clean up code, and make use of methods added in utils
 2018-06-08 16:35:21 +05:30
Suraj Shetty
f553b53fbf Add patch to set update_field and update_value (#14421) 
* Add patch to set update_field and update_value

- set update_field and update_value if empty
since expense claim workflow is dependent on it.

* Set update_field for workflow state of leave application

* Update patch entry

* Fix bug

* Update set_update_field_and_value_in_workflow_state.py
 2018-06-08 16:28:36 +05:30
Alchez
ca8138fd13 [Agriculture] Sort crop tasks chronologically and optimize disease task creation (#14367) 
* Improve max crop period check and sort agriculture tasks chronologically

* Reformat crop cycle logic and add field to optimize task creation
 2018-06-08 14:55:07 +05:30
Doridel Cahanap
ebb530385a Add Employee Status Temporary Leave (#14423) 2018-06-08 14:54:31 +05:30
rohitwaghchaure
8fc64a9717 [Fix] Travis data (#14422) 2018-06-08 14:43:50 +05:30
Zarrar
7ab70ca2d7 [ Fixes ] v11 Tree based doctype testing (#14419) 
* location tree fixes
validate if child present while deleting, filter lists down only group enabled node

* department tree fixes
Adding child fix if added from rootnode with company filter applied. Rename consistency added. Validation added in on_trash

* Company tree fix
Check if child exist while deleting a node validation added.

* Supplier Group tree fixes
on_trash validation added if child node present

* Cost Center tree fixes
Adding child to root node throws error because parent_cost_center picks up root name
 2018-06-08 14:33:15 +05:30