Shreya
|
362e0a9f6e
|
Fix patch
|
2018-05-17 15:43:03 +05:30 |
|
rohitwaghchaure
|
967d04ed0d
|
Merge pull request #14096 from ESS-LLP/jam_enterprise_emp_benefit
Employee Benefit
|
2018-05-17 14:09:04 +05:30 |
|
rohitwaghchaure
|
8c6b7557db
|
Merge branch 'develop' into jam_enterprise_emp_benefit
|
2018-05-17 14:08:06 +05:30 |
|
rohitwaghchaure
|
4444430200
|
Merge pull request #14108 from ESS-LLP/tax_deduction
Variable tax deduction
|
2018-05-17 13:55:52 +05:30 |
|
rohitwaghchaure
|
4c82ede9e1
|
Merge pull request #14112 from vjFaLk/item-uom
Add UOM to POS Item Template
|
2018-05-17 12:51:10 +05:30 |
|
Valmik Jangla
|
b52d5b21a1
|
Add UOM to Item View with Price
|
2018-05-17 00:09:21 -07:00 |
|
rohitwaghchaure
|
d2f0d08234
|
Merge pull request #14105 from Zlash65/fix-dept
[Minor] Typo in Employee Transfer
|
2018-05-17 11:23:52 +05:30 |
|
rohitwaghchaure
|
509847a674
|
Merge pull request #14109 from rohitwaghchaure/asset_adjustment_fixes
[Fix] Asset adjustment issues
|
2018-05-17 11:23:26 +05:30 |
|
Rohit Waghchaure
|
992fb34c95
|
[Fix] Asset adjustment issues
|
2018-05-17 11:22:59 +05:30 |
|
Ranjith
|
fcfb5a3769
|
Merge remote-tracking branch 'frappe/develop' into develop
|
2018-05-17 10:07:23 +05:30 |
|
Ranjith
|
58363e6bbd
|
get_payroll_period return name, fix hard coded leave period
|
2018-05-17 10:00:33 +05:30 |
|
Zlash65
|
e3f7e8b101
|
typo in frappe.throw in employee_transfer
|
2018-05-17 01:34:35 +05:30 |
|
rohitwaghchaure
|
de6ce587d0
|
Merge pull request #14104 from rohitwaghchaure/asset_wrong_account_linking_issue
Allow to select Asset Received But Not Billed in expense account head
|
2018-05-17 00:24:46 +05:30 |
|
Rohit Waghchaure
|
585945e65d
|
Allow to select Asset Received But Not Billed in expense account head
|
2018-05-17 00:23:27 +05:30 |
|
rohitwaghchaure
|
e8ef69ec33
|
Merge pull request #14103 from rohitwaghchaure/asset_validation_issue_for_multiple_qty
[Fix] Validation issue
|
2018-05-16 23:58:09 +05:30 |
|
Rohit Waghchaure
|
2868840e6b
|
[Fix] Validation issue
|
2018-05-16 23:57:28 +05:30 |
|
rohitwaghchaure
|
627c0a3acb
|
Merge pull request #14102 from rohitwaghchaure/company_not_found_issue_v11
[Fix] Company mandatory issue
|
2018-05-16 23:32:33 +05:30 |
|
Rohit Waghchaure
|
44fda65b1d
|
[Fix] Company mandatory issue
|
2018-05-16 23:31:09 +05:30 |
|
Ranjith
|
31eeff00f7
|
merge frappe/develop
|
2018-05-16 23:24:34 +05:30 |
|
rohitwaghchaure
|
39223e0341
|
Merge pull request #14100 from rohitwaghchaure/tds_issue
[Fix] TDS issue
|
2018-05-16 23:13:41 +05:30 |
|
Rohit Waghchaure
|
a91765707a
|
[Fix] TDS issue
|
2018-05-16 23:13:02 +05:30 |
|
Ranjith
|
b485b1ef80
|
Salary Slip calc tax, except for flexi benefits
|
2018-05-16 23:01:40 +05:30 |
|
Ranjith
|
c6b2575a9c
|
fields in salary detail, copy data from salary component on change
|
2018-05-16 22:59:21 +05:30 |
|
rohitwaghchaure
|
274f890246
|
Merge pull request #14099 from rohitwaghchaure/fixed_asset_date
Multiple fixes in asset
|
2018-05-16 22:13:15 +05:30 |
|
Rohit Waghchaure
|
e6acd4c57a
|
Multiple fixes in asset
|
2018-05-16 22:12:39 +05:30 |
|
rohitwaghchaure
|
64e81b436e
|
Merge pull request #14098 from rohitwaghchaure/minor_button_not_showing
[Fix] Custom buttons not showing
|
2018-05-16 21:45:12 +05:30 |
|
Rohit Waghchaure
|
976af6b422
|
[Fix] Cystom buttons not showing
|
2018-05-16 21:43:16 +05:30 |
|
rohitwaghchaure
|
660ca9b6c0
|
Merge pull request #14097 from rohitwaghchaure/purchase_invoice_gl_entry_issue
[Fix] Gl Enrty issue
|
2018-05-16 21:34:44 +05:30 |
|
Rohit Waghchaure
|
1a328d02d2
|
[Fix] Gl Enrty issue
|
2018-05-16 21:34:06 +05:30 |
|
rohitwaghchaure
|
513cd189f0
|
Merge pull request #14095 from rohitwaghchaure/leave_application_issue_v11
[Fix] onload set default employee, leave approver, company
|
2018-05-16 19:57:09 +05:30 |
|
Rohit Waghchaure
|
8e4f676c8c
|
[Fix] onload set default employee, leave approver, company
|
2018-05-16 19:55:52 +05:30 |
|
Jamsheer
|
8b86d18f73
|
Remove unused imports
|
2018-05-16 19:50:30 +05:30 |
|
Jamsheer
|
3434aabc28
|
Employee Benefit Claim in Salary Slip
|
2018-05-16 19:50:30 +05:30 |
|
Jamsheer
|
3abae9c1ba
|
Employee Benefit Application - whitlist method get_max_benefits
|
2018-05-16 19:50:30 +05:30 |
|
Jamsheer
|
3e64297a3d
|
Employee Benefit Application - validate maximun benefit
|
2018-05-16 19:50:30 +05:30 |
|
Jamsheer
|
3cd0ad4c98
|
Codacy fixes
|
2018-05-16 19:50:30 +05:30 |
|
Jamsheer
|
c9287b5b88
|
Manage grouping of salary component for flexible benefit
|
2018-05-16 19:50:30 +05:30 |
|
Jamsheer
|
6410022cab
|
minor fixes
|
2018-05-16 19:49:39 +05:30 |
|
Jamsheer
|
c678d037e7
|
Salary slip - throw if no default flexi component
|
2018-05-16 19:49:39 +05:30 |
|
Jamsheer
|
5f6e274505
|
Salary slip - default flexi component
|
2018-05-16 19:49:39 +05:30 |
|
Jamsheer
|
43740a6511
|
Employee Benefit Application - employee benefit in salary slip
|
2018-05-16 19:49:39 +05:30 |
|
Jamsheer
|
0bc665c0a5
|
Salary Copmonent - Default flexible componnent
|
2018-05-16 19:49:39 +05:30 |
|
Jamsheer
|
15613e46ad
|
Salary Copmonent - Defualt flexible componnent
|
2018-05-16 19:48:47 +05:30 |
|
Jamsheer
|
d63c39a514
|
Payroll Period - get payroll period days
|
2018-05-16 19:47:18 +05:30 |
|
Jamsheer
|
d66fb842c1
|
Employee Benefit Application - validate max benefit for employee
|
2018-05-16 19:47:18 +05:30 |
|
Jamsheer
|
2d6901d5dc
|
Employee Benefit Application - validate max benefit amount for component
|
2018-05-16 19:47:18 +05:30 |
|
Jamsheer
|
9cb2fc2766
|
Employee Benefit Application - calcluate benefit amount
|
2018-05-16 19:47:18 +05:30 |
|
Jamsheer
|
d48998bae1
|
Employee Benefit Application - Calculate benefit amounts
|
2018-05-16 19:47:18 +05:30 |
|
Jamsheer
|
779f8ebbb3
|
Employee Benefit Application - get max benefit
|
2018-05-16 19:47:18 +05:30 |
|
Jamsheer
|
41616de9cc
|
Employee Benefit Application - validate duplicate
|
2018-05-16 19:47:18 +05:30 |
|