Commit Graph

23306 Commits

Author SHA1 Message Date
Jamsheer
4f8deb92cc [Fix] - Leave Perid - Grant Allocations (#14668)
* Leave Perid - Grant Allocations - Fix

* Codacy - string statement has no effect
2018-06-25 14:49:54 +05:30
Prateeksha Singh
f845e749f2
Update stale-bot config 2018-06-25 11:06:32 +05:30
Shreya Shah
d8031d1a53 Clear child table before appending (#14648) 2018-06-25 10:34:55 +05:30
rohitwaghchaure
34c187706d [Enhance] Added Budget exception approver role in company (#14645)
* [Enhance] Added Budget exception approver role in company

* Added test cases for budget
2018-06-25 10:31:08 +05:30
Ranjith Kurungadam
b4ad3c3f77 Salary Structure Assignment - remove to_date (#14642)
* Salary Structure Assignment - remove to_date

* fix Salary Assignment - remove to_date

* Salary Slip - fix codacy remove sting based query, add end_date to condition
2018-06-25 10:29:54 +05:30
Jamsheer
8044d09d50 [Enhance] Refactor (#14647)
* Payroll Entry - Make Bank Entry button routes to Journal Entry list view

* Salary Component - additional component and flexi not comes in same component

* Salary Structure - refactor validation messages
2018-06-25 10:29:06 +05:30
rohitwaghchaure
3a595d07d0 [Fix] POS Closing Voucher, on save collected amount becomes zero issue and added test cases (#14649)
* [Fix] POS Closing Voucher, on save collected amount becomes zero

* Added test cases for the POS Closing Voucher
2018-06-25 10:10:29 +05:30
Jamsheer
648728f330 Fix - depends on lwp - employee benefit (#14644) 2018-06-22 17:28:29 +05:30
Jamsheer
b64161a389 Employee benefit - Last payroll period benefit (#14634)
* Employee benefit - Last payroll period benefit

* Method name refactor
2018-06-22 17:27:54 +05:30
Sushant Nadkar
00f0f0f5fc Added adational filters to Tax Rule doctype (#14639) 2018-06-22 15:57:19 +05:30
Shreya Shah
5b64e98c5b Fetch company on employee selection (#14633) 2018-06-22 15:41:57 +05:30
rohitwaghchaure
d3fb0fbb20 Added test cases for asset accounting, asset value adjustment (#14572)
* Added test cases for asset accounting, asset value adjustment

* Accounting entry for the asset created manually

* Added asset movement test cases and validation

* Added validation to make asset from purchase receupt, invoice only
2018-06-22 15:40:59 +05:30
Ranjith Kurungadam
ce26610d39 Fix tax calculation (#14635)
* Salary Detail - field is_additional_component

* TDS fix - exclude additional component from monthly salary, but add to annual income to calculate tax

* fix indentation
2018-06-22 15:39:49 +05:30
Ameya Shenoy
4e96f55eff
Merge branch 'master' into develop 2018-06-22 05:10:29 +00:00
Ameya Shenoy
1098755d26
Merge branch 'hotfix' 2018-06-22 05:10:27 +00:00
Ameya Shenoy
774f676a25 bumped to version 10.1.40 2018-06-22 05:10:27 +00:00
Prateeksha Singh
c92bbcb9fa
Merge pull request #14629 from pratu16x7/css-fixes
[portal] fix item-preview column #13077
2018-06-21 22:47:41 +05:30
Prateeksha Singh
9a138f07f7 [portal] fix item-preview column #13077 2018-06-21 22:42:03 +05:30
Ameya Shenoy
1629393618
Merge pull request #14628 from Zlash65/fix-pe
Expense Claim - Payment Entry related fix
2018-06-21 18:49:50 +05:30
Nabin Hait
3ebc15cc8f test fixes 2018-06-21 17:55:32 +05:30
Nabin Hait
e5b3a56cea Test case fixes 2018-06-21 15:21:17 +05:30
Zlash65
4cf46edabc expense_claim related fix in payment entry
outstanding amount calculation fix, manual entry of expense trigger calculation of allocation added
2018-06-21 15:18:13 +05:30
rohitwaghchaure
ae276bcaa1 Don't allow to sale asset item from POS (#14623) 2018-06-21 13:18:01 +05:30
Shreya Shah
c8a40f3ef0 [Tests] Employee Onboarding & Separation (#14606)
* Set query on department

* Add test for Employee Onboarding

* Add fetch for Employee Separation fields

* Add test for Employee Separation

* Fix Staffing Plan test case
2018-06-21 13:06:47 +05:30
Sachin Mane
19a5a5dcf4 improve performance of stock_value retrieval using tabBin instead of … (#14584)
* improve performance of stock_value retrieval using tabBin instead of stock ledger

* rename fn

* rename fn

* Update warehouse.py
2018-06-21 13:01:48 +05:30
rohitwaghchaure
79e5b07e62 [Fix] Subscription method (#14604)
* [Fix] Subscription method path

* [Fix] Condition
2018-06-21 12:58:14 +05:30
rohitwaghchaure
4d80c05125 [Fix] Deferred account must be liability account (#14612) 2018-06-21 11:55:49 +05:30
Shreya Shah
22bb61b58c
Merge pull request #14608 from shreyashah115/fix-onboard
[Enhance] Employee Onboarding & Separation
2018-06-21 11:51:39 +05:30
Jamsheer
f76dbbae68 Compensatory Leave Request (#14611)
* Compensatory Leave Request - Validate Holidays and Attendance

* Compensatory Leave Request - Cancel

* Half Day in Compensatory Leave Request

* Leave allocation on Compensatory Leave Request - Fix

* Unused import
2018-06-21 11:38:38 +05:30
Nabin Hait
227489193b Test case fixes 2018-06-21 11:36:13 +05:30
umaepoch
0484547150 BOM Stock Calculation Report (#14561)
* BOM Stock Calculated

* BOM Stock Calculated

* BOM Stock Calculated

* BOM Stock Calculated

* BOM Stock Calculated

* Update bom_stock_calculated.json
2018-06-21 11:27:54 +05:30
Zarrar
e25dcd2737 [Minor] Report related fixes (#14620)
* fix in query incase list is empty

* periodicity not found error
when called from consolidated financial statements and custom cash flow is activated

* unset currency filter to apply default currency or so

* python 2 - 3 fix
2018-06-21 10:53:12 +05:30
Siddhi Sawant
51e4d641c8 Job Applicant Source (#14543)
* New doctype - Job Applicant Source

* Source and source name field in job applicant

* Updated install_fixtures with default options

* Update install_fixtures.py

* Fixes codacy
2018-06-21 10:47:54 +05:30
Prateeksha Singh
ab37c6912c
Merge pull request #14621 from pratu16x7/probot
[probot-stale][config] Mark and close inactive PRs
2018-06-21 10:38:16 +05:30
Frappe PR Bot
748c0240db [Translation] Updated Translations (#14615) 2018-06-21 10:34:28 +05:30
Prateeksha Singh
f9284228f1 [probot-stale] add config 2018-06-21 10:28:44 +05:30
Charles-Henri Decultot
fc2292f08c Email alert renamed to Notification (#14618) 2018-06-21 09:17:52 +05:30
Nabin Hait
3946b77555 changed fieldname of inventory section break in Item 2018-06-20 22:33:34 +05:30
Shreya Shah
b125ba9ed8 Update status if tasks have been completed (#14601) 2018-06-20 17:52:21 +05:30
Manas Solanki
616a6d2bc2 Test leave management (#14587)
* test max allowed days in leave policy

* test the leave period

* test leave encashment
2018-06-20 17:47:45 +05:30
Suraj Shetty
be3ce16352 Daily work summary reply report (#14583)
* Add daily work summary reply report

* Show user name instead of email

* Remove print statement

* Change field datatype

* ReRun Travis
2018-06-20 17:46:03 +05:30
Nabin Hait
7aae0e66df minor fix 2018-06-20 17:45:39 +05:30
Bassam Ramadan
45725c2c7b add missing brand filter to stock balance report (#14597)
add missing brand filter to stock balance report
2018-06-20 17:41:29 +05:30
Shreya
3fd21d4273 Fix codacy 2018-06-20 16:09:16 +05:30
Shreya
5c6ade4bd8 Update and set status on the basis of project completion 2018-06-20 15:55:27 +05:30
Shreya
a5afd96019 Employee Onboarding and Separation lists 2018-06-20 15:55:14 +05:30
Saurabh
59798b4e88 resolved merge conflict 2018-06-20 15:23:25 +05:30
Saurabh
e6498996fa Merge branch 'hotfix' 2018-06-20 15:21:40 +05:30
Saurabh
98b7bb5679 bumped to version 10.1.39 2018-06-20 15:51:40 +06:00
Zarrar
99017b173d naming for asset maintenance task should be task name (#14607) 2018-06-20 14:53:13 +05:30