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

23435 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ranjith
f220e89d9f Job Opening - get planned opening, validate vacancies by Staffing Plan 2018-05-07 13:58:54 +05:30
Ranjith
e4cda0380a Staffing Plan - validations, get employee count on designation change, calc estimated cost 2018-05-07 13:54:49 +05:30
Nabin Hait
fdc67a577f Merge branch 'multi-company-transations' of https://github.com/shreyashah115/erpnext into shreyashah115-multi-company-transations 2018-05-07 13:12:16 +05:30
Ranjith Kurungadam
95c5c055f8 Optional leave (#13931) 
* Optional Holiday - move holiday list from leave type to leave period

* Optional Leave - validate on Leave Application

* test Optional Leaves
 2018-05-07 12:43:08 +05:30
Nabin Hait
420c140c48 Merge branch 'ESS-LLP-employee_promotion_transfer' into enterprise_sprint 2018-05-07 12:23:22 +05:30
Nabin Hait
d5220c0ff4 minor fix 2018-05-07 12:22:57 +05:30
Nabin Hait
01f5df72cc Merge branch 'employee_promotion_transfer' of https://github.com/ESS-LLP/erpnext-healthcare into ESS-LLP-employee_promotion_transfer 2018-05-07 11:55:52 +05:30
Rah Yuliantoro
b3882cacd9 update coa and company default (#13937) 
* Update standard_chart_of_accounts.py

adding account for employee advances

* Update standard_chart_of_accounts_with_account_number.py

adding account for employee advances

* Update company.py

adding accounts for default fields in company doctypes

* Update company.py

Missing some default accounts for fields in company doctype
 2018-05-07 11:39:35 +05:30
Nabin Hait
ba70ff0904
Exchange rate revaluation (#13932) 
* Added account data on child table

* Added Journal Entry button and functionality

* Add docs

* Refactoring and cleanup of Exchange Rate Revaluation
 2018-05-05 18:22:56 +05:30
Ranjith
86b81e99e5 codacy fixes 2018-05-05 16:49:51 +05:30
Nabin Hait
338e1b6e91 Merge branch 'master' into develop 2018-05-05 14:33:35 +05:30
Nabin Hait
02a40e9d7b Merge branch 'hotfix' 2018-05-05 14:33:33 +05:30
Nabin Hait
ea199f9cd9 bumped to version 10.1.30 2018-05-05 15:03:33 +06:00
Ranjith
9505ea93cf codacy fixes 2018-05-05 14:32:42 +05:30
Nabin Hait
161f35a687
Update sales_invoice.py 2018-05-05 14:32:31 +05:30
Ranjith
715780b78b Employee Promotion, Transfer - documentation 2018-05-05 13:51:34 +05:30
Ranjith
a68a108234 Employee Promotion, Transfer - test submit before date, create new employee 2018-05-05 13:43:15 +05:30
Ranjith
56b58017d1 Employee Promotion, Transfer - validate, submit, cancel workflow 2018-05-05 13:41:48 +05:30
Ranjith
fddfffd3e6 Employee Promotion, Transfer - modal to add details to child table 2018-05-05 13:27:26 +05:30
Ranjith
ea60225760 Employee Promotion, Transfer - update child table, added fields 2018-05-05 13:25:46 +05:30
Nabin Hait
4bbe5fbefc Fixes related to auto repeat 2018-05-05 12:32:59 +05:30
Nabin Hait
abd0325acd Fixed merge conflict 2018-05-05 12:19:14 +05:30
Nabin Hait
fcb984b294 Merge branch 'hotfix' 2018-05-05 12:13:29 +05:30
Nabin Hait
723fe8fb1b bumped to version 10.1.29 2018-05-05 12:43:29 +06:00
mnaim-cloude8
c3b4464df8 Remove unnecessary field. 2018-05-04 22:06:35 +08:00
Ameya Shenoy
47c0c8ba49 removed bad code and made compatible with pip 10 (#13805) 2018-05-04 19:20:20 +05:30
Rohit Waghchaure
3e0a937cb8 [Fix] Tax not changes when user change the POS profile in the sales invoice 2018-05-04 19:20:20 +05:30
Shreya Shah
88aa3ec275 [Report] HSN-wise-summary of outward supplies (#13803) 
* hsn wise summary report

* renamed

* added total amount column

* moved total amount column
 2018-05-04 18:33:14 +05:30
Jamsheer
bd63f0056a Patient medical record updation and deletion fixes (#13891) 2018-05-04 18:13:28 +05:30
Pawan Mehta
5e7b2eb338 Add Calendar View to Attendance doctype (#13919) 
* [fix] #13917

* codacy fixes

* remove company

* add status

* fix date issue

* code optimizations

* change sql
 2018-05-04 18:12:35 +05:30
creador30
dae8f1b353 Search for item_code (#13912) 
Item query can be called from custom script to search for an additional field. In this case the item_name, item_group and item_description are still searchable, but not item_code. As the item code is a must have field in search results, I have added this to the non-changable search fields in this query.
 2018-05-04 18:12:03 +05:30
Shreya Shah
55daa9cd24 fix taxable amount for same items (#13927) 2018-05-04 18:01:23 +05:30
Shreya Shah
764b9bfeba cint for Item field has_variants (#13916) 
* convert none type value to int

* Fix typo
 2018-05-04 17:58:36 +05:30
Suraj Shetty
dcc90e3312 Add fix to support changes in user permission (#13923) 
https://github.com/frappe/frappe/pull/5494
 2018-05-04 17:52:57 +05:30
Shreya Shah
eec0209e3c Fetch mandatory reqd from server side (#13924) 2018-05-04 17:51:10 +05:30
Nabin Hait
62b985d405 [fix] Update show_in_website in template 2018-05-04 12:21:15 +05:30
KanchanChauhan
f4feedace4 Allow changing of Address after Submit (#13747) 2018-05-03 19:08:54 +05:30
Suraj Shetty
57fbebb630 Update user permission doc (#13695) 2018-05-03 19:07:07 +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
Shreya Shah
ecb9315ea1 Inter Company Journal Entry (#13683) 
* rebase with enterprise_sprint

* Add Inter company account checkbox in Account master

* Add Inter Company Journal Entry Voucher Type in Journal Entry

* Make Inter Company Journal Entry button

* Dialog to select company for Inter Company Journal Entry

* Map relevant fields in the Inter Company Journal Entry and reference links

* Rebase

* Add Documentation
 2018-05-03 19:04:36 +05:30
Zarrar
6f3594b2e4 [Enhance] GL Entry - ability to multiselect party (#13769) 
* change dynamic link to multiselect field and improv

* print based fix

* refactor changes according to multiselect changes
 2018-05-03 19:00:43 +05:30
rohitwaghchaure
1aa3a11546 On auto-creation of new Fiscal Year, send Email notification to the account users (#13789) 2018-05-03 18:59:26 +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
Shreya Shah
c4323cb6ba remove set query (#13908) 2018-05-03 16:19:56 +05:30
Shreya Shah
c10820e93e fix error (#13907) 2018-05-03 16:09:34 +05:30
mnaim-cloude8
e21ad0e641 Add printing details section for Job Offer. To fetch correct letter head for company selected at Job Offer. 2018-05-03 15:43:25 +08:00
Saurabh
7461806b1c
Merge pull request #13892 from codingCoffee/travis 
dark magic to revive travis
 2018-05-02 23:23:07 +05:30
Ameya Shenoy
bb7c5ac0f8
dark magic to revive travis 
It seems that some process inside travis is using port no 9000. Hence
adding this line in the travis.yml to change common_site_config.json and
use port no 9001 for socket_io
 2018-05-02 17:32:39 +05:30