Nabin Hait
c43c95e0aa
Fixed merge conflict
2018-03-05 14:54:44 +05:30
Zarrar
950fff0ba1
changes according to the workflow ( #13160 )
2018-03-05 11:30:53 +05:30
Zarrar
1e4e004667
leave application assigned by naming_series ( #13158 )
2018-03-05 11:05:59 +05:30
rohitwaghchaure
0eb8bb2511
[Fix] Wrong salary slips showing when click on view salary slips from payroll entry ( #13152 )
2018-03-05 11:03:27 +05:30
Nabin Hait
f68dc69078
Set auto created serial nos in incoming transactions in case of multi UOM ( #13112 )
...
* Create user from Employee
* Set auto created serial nos in incoming transactions in case of multi uom
2018-03-01 10:54:24 +05:30
tundebabzy
3fecbb98c5
Make Expense Claim from Employee Advance #13053 ( #13074 )
...
* allow to make expense claim from employee advance
* make expense claim only if claimed amount < paid_amount
* expense claim made from employee advance is paid
2018-03-01 10:50:45 +05:30
Nabin Hait
a645f36b2b
Get valuation rate from historical SLE even if it is zero ( #13129 )
...
* Don't overwrite start and end date comes from payroll entry
* Get valuation rate from historical SLE even if it is zero, if records exists
* Valid till should be autoset if not any default value
* Set status of expense claim based on is_paid check
2018-03-01 10:31:24 +05:30
Achilles Rasquinha
646522886c
self.assertEqual
2018-02-28 21:13:51 +05:30
Shreya Shah
70a57e08fd
New Report Employee Advance Summary ( #13040 )
...
* New Report Employee Advance Summary
* JSON style column definition
2018-02-26 15:58:57 +05:30
Suraj Shetty
d3069fee4d
Daily work summary refactor ( #12944 )
...
* added daily work summary setting doctype and code to support feature
this will allow multiple setting for daily work summary
* added daily work summary setting user doctype
* made changes in daily work summary code
* [minor] entry change in hr config file
* deleted previous daily work summary settings (and its company) doctype
* removed unwanted permission check
* toggled read_only option for enabled field
* removed print statements
* add patch for the changes
* doc changes
* [minor] indentation fix
* fixed tests
* indentation fixes
* codacy issue fix
* formatting fixes
* renamed doctype
Renamed Daily Work Summary Setting to Daily Work Summary Group and did related code and doc changes
* fixed typo
* updated doc
* codacy issue fix
* [minor] renamed doctype name in json
* Renamed old doctype
* fixed indentation
* codacy fix
* indentation fix
* renamed doctype
* handled patch exception
* fixed exception
* Update daily_work_summary_group.py
* rename patch file
removed abbreviation in file name
* handled exception in patch code
* removed Unnecessary pass statement
* [minor] indentation fix
2018-02-21 15:15:43 +05:30
Shreya Shah
093e7e6e98
Refactor Expense Claim ( #12883 )
...
* patch for custom workflow
* deleted field approval_status
* replaced approval_status with workflow_state
* updated test cases
* validation to check expense approver
* check if workflow_state_name already exists
* fixes
* modified notifications.py
* removed field exp_approval and modified test cases
2018-02-16 14:49:39 +05:30
Nabin Hait
b95ecd7fcd
Gstr reports ( #12940 )
...
* GSTR1 for B2B (#12296 )
* [minor] Modified GSTR1 report to identify missing GST Account in GST Settings (#12426 )
* [minor] Modified GSTR1 report to identify missing GST Account in GST Settings
* Update gstr_1.py
* GSTR1 for B2B, B2CL and B2CS (#12459 )
* [Report] GSTR - 1 CDNR Report (#12554 )
* [wip] cdnr
* [WIP] cdnr with optional data
* [wip] Export GSTR-1
* [minor] Minor changes in export
* [new] Custom field added for GST
* [fix] Minor changes in GSTR1 Report
* [minor] Minor changes in gstr1
* [fix] Codacy Fixed
* Update setup.py
* [wip] Gstr2
* [fix] Fetch correct Tax Details
* [minor] ITC data append to row
* [fix] CDNR negative value
* Cleanup and fixes on GSTR-2
* Minor fixes in gstr reports (#12848 )
* [new] B2C limit fetch from GST Settings (#12905 )
* [new] b2c limit fetch from gst setting
* [fix] Patch Added for b2c limit
* Update gstr_1.py
* Update utils.py
* Cusotm fields related GSTR2
* minor fixes
* minor fixes
* some more fixes
* Added duplicate patch and some tests as not required on develop
2018-02-16 13:19:04 +05:30
Shreya Shah
394b7a2fa3
Rename Offer Letter to Job Offer ( #12934 )
2018-02-16 10:49:34 +05:30
Nabin Hait
e6d65bc2a1
Fixed translations and tests ( #12900 )
...
* Fixed translations and tests
* minor fixes
* minor test fixes
2018-02-14 17:44:06 +05:30
Achilles Rasquinha
361366ebe6
Python 3 fixes. ( #12916 )
...
* Fixed iteritems and exceptions
* python3-fixes
* fixed iteritems
2018-02-14 17:08:59 +05:30
Saurabh
2735701aab
resolved merge conflicts
2018-02-14 11:51:09 +05:30
rohitwaghchaure
62d6593fe7
[Fix] Allow to make disbursement entry even if payment account in not set in the employee loan ( #12882 )
2018-02-13 14:43:37 +05:30
Shreya Shah
d9a585bdad
Leave workflow patch fixes ( #12823 )
...
* modified patch for leave application workflow
* removed leave approval field from leave application doctype
* fetch lwp and attendance only if workflow field exists
* modified test cases
* modified files with leave application
* docstatus draft for rejected applications
* modified leave application calendar
* test fixed
* run patch only if any record exists
2018-02-12 16:02:57 +05:30
Shreya Shah
caccd2289d
posting-date-fix ( #12849 )
2018-02-12 11:34:46 +05:30
Nabin Hait
c224d34a2c
Merge branch 'master' into develop
2018-02-07 16:07:20 +05:30
Shreya Shah
80423de611
posting date in journal entry should not be nowdate ( #12801 )
2018-02-07 12:08:08 +05:30
rohitwaghchaure
8df0556af5
Merge pull request #12587 from shreyashah115/leave-workflow
...
Refactor Leave Application
2018-01-24 15:04:17 +05:30
Rushabh Mehta
b5a3df920c
[fix] primary button color for make
2018-01-23 16:08:52 +05:30
Shreya
5164997db7
delete column status
2018-01-22 14:13:03 +05:30
Shreya
dd66bc03c7
fixes
2018-01-22 12:28:38 +05:30
Shreya
fc0e8e5c6a
modified patches.txt
2018-01-22 12:26:41 +05:30
Shreya
4298bcfa40
modified leave application tests
2018-01-22 12:26:41 +05:30
Shreya
05f7e14b5a
replaced status with workflow_state
2018-01-22 12:26:41 +05:30
Shreya
d0b60e8254
set posting date only if null
2018-01-18 17:35:29 +05:30
Achilles Rasquinha
b6365b729e
Deleted Previous Chat Reference for Leave Application Approval ( #12482 )
...
* deleted previous chat reference
* txt to messge
* removed comment
2018-01-15 14:12:41 +05:30
Nabin Hait
cb495fb33b
Merge branch 'master' into develop
2018-01-05 13:17:00 +05:30
Nabin Hait
28d0230e56
Multiple small fixes
2018-01-05 13:14:25 +05:30
Shreya Shah
df0dd8be5f
Travis fix for client side tests ( #12224 )
...
* salary slip test fix
* attendance tool test fix
* timeout after routing
2017-12-29 14:04:46 +05:30
Shreya Shah
dd700a550f
test fixed ( #12094 )
2017-12-19 11:24:07 +05:30
Shreya Shah
ec1cb79e5f
Fetch employee advance in expense claim on adding it manually ( #12069 )
...
* added trigger on manually adding an advance
* improvised the query
* codacy fix
* updated
2017-12-18 18:06:01 +05:30
Nabin Hait
6a640b78c4
Minor fixes in payroll entry and opening invoice tool
2017-12-15 15:34:14 +05:30
Nabin Hait
6b0d4bd01b
Minor fixes related to employee advance
2017-12-14 18:03:10 +05:30
Nabin Hait
d0249b0880
Employee advance ( #11875 )
...
* Employee Advances against Expense Claim
* added employee advance test cases and docs
* Default Employee Advance Account field in company
* Cleanup and fixes of employee advance
2017-12-14 13:25:57 +05:30
tundebabzy
02b4b5f526
Payroll Entry ( #11936 ) ( #11968 )
...
* add functions for tracking related salary slips
* PEP 8 style
* put buttons into Make based on context
* add function to test for bank entry journal
* refeactor `add_bank_entry_button`
* "View Salary Slips" made a standalone secondary button
* set_inner_btn_group for Make Bank Entry
* refresh button after journal is submitted
* edit javascript test case
* codacy
* fix as per review
* no longer use $c
2017-12-14 13:15:28 +05:30
Shreya Shah
8cad3f12a2
Salary Slip not updating when adding/removing Timesheet links ( #11982 )
...
* timesheet on salary slip
* changes
* cal total wages
* calculate gross_pay and net_pay
* codacy fix
2017-12-13 18:43:01 +05:30
tundebabzy
ff1b875661
Improve Validation Message in the Payroll Entry ( #11937 ) ( #11944 )
...
* change error message from `create_log`
* PEP 8 compliance
2017-12-12 14:18:14 +05:30
Shreya Shah
6b64947f47
Route to Payment Entry instead of Journal Entry in paid Expense Claim ( #11874 )
...
* route fixed
* improvised
2017-12-08 16:14:23 +05:30
Zarrar
17fd6610dc
Fix travis ( #11882 )
...
* fieldname wrong
* bifurcated test into two - error when both were running async
* minor fixes with link and route
* move school domain rename up
* fix async creation of operations test
* edit-in-full-page is button, not link
* set_route issue in production order test
* minor changes
* fix task tree test
* more fixes
* fix server side issue
* improvising ui tests
2017-12-08 14:57:38 +05:30
Zarrar
5ee5d43295
ontrash of nestedset wasn't ideal for employee's usecase ( #11876 )
2017-12-07 17:16:59 +05:30
Nabin Hait
97b8a7b237
Minor fixes in payroll entry
2017-12-06 19:55:57 +05:30
Shreya
e570e4a049
fixed a test
2017-12-04 16:49:44 +05:30
Shreya
f8e7bc7c5b
removed process payroll doctype
2017-12-04 16:49:44 +05:30
Shreya Shah
db332f2c08
employee_details table added
2017-12-04 16:49:44 +05:30
Shreya
9956f15c80
added py test
2017-12-04 16:49:44 +05:30
Shreya
b5dff03453
added changes from process payroll
2017-12-04 16:49:44 +05:30
