Zarrar
b9f54ca946
[Enhance] Group same items during printing Delivery Note, Invoices, etc ( #14250 )
...
* add doctypes allowed to group items, average the rate
* add check field to group items during print
* call common before_print in delivery note
* fix precision issue while calculating average
2018-05-28 17:41:09 +05:30
rohitwaghchaure
a8c6ec27c0
Merge pull request #14252 from rohitwaghchaure/leaderboard_translation_issue
...
[Fix] Translation issue in leaderboard
2018-05-28 15:51:00 +05:30
Saurabh
3c1b153cdb
Merge pull request #14111 from netchampfaris/stock-ledger-report-hotfix
...
[fix] Stock Ledger report item filter
2018-05-28 15:23:21 +05:30
rohitwaghchaure
bd2989a541
Merge pull request #14254 from rohitwaghchaure/leave_application_issue_for_leave_approver
...
[Fix] Leave application, leave approver not fetching
2018-05-28 15:11:08 +05:30
Rohit Waghchaure
81302a8b12
[Fix] Leave application, leave approver not fetching
2018-05-28 15:10:19 +05:30
rohitwaghchaure
65684564c2
Merge pull request #14253 from rohitwaghchaure/financial_report_issue
...
[Fix] Data not displaying in financial reports
2018-05-28 15:03:43 +05:30
Rohit Waghchaure
c89a84b61e
Fixed data not displaying in financial reports
2018-05-28 15:01:57 +05:30
Rohit Waghchaure
06f91e2dc1
[Fix] Translation issue in leaderboard
2018-05-28 14:43:17 +05:30
rohitwaghchaure
30c88fe1a5
Merge pull request #14247 from rohitwaghchaure/patch_fixed_for_asset_warehouse
...
Fixed patch, checked warehouse available in the asset
2018-05-28 12:30:55 +05:30
Rohit Waghchaure
ad184f62e3
Fixed patch, checked warehouse available in the asset
2018-05-28 12:29:42 +05:30
Shreya Shah
13f39eb821
Display rate on the basis of stock UOM ( #14246 )
2018-05-28 11:50:28 +05:30
Shreya Shah
e329038aaa
Total Quantity in Sales and Purchase DocTypes ( #14114 )
...
* Add field to all sales and purchase doctypes
* Add patch to update existing records
* Modify taxes_and_totals.py
2018-05-28 11:49:08 +05:30
tundebabzy
3eb235a53b
Sales Payment Summart Report Improvement ( #14243 )
...
* fix iteritems() takes exactly 1 argument (2 given)
* adds new helper functions
* use new functions to make POS invoices filterable on warehouse and cost center
* more PEP8 fixes
2018-05-28 10:26:45 +05:30
Kenneth Sequeira
119cc5dec6
Documentation - Open Divs and Video Resolutions ( #14242 )
...
* fixed open div tag in edu docs
* fixed open div tag in projects page
* fixed open div for item variants, serialized inventory article
* fixed video aspect ratio and open div for Selling, Workflow, and Material Request
2018-05-28 10:24:43 +05:30
Ameya Shenoy
67c9566e77
Duct tape for demo ( #14241 )
...
The demo is just too old and needs a complete refactor. This is just a
workaroud to keep the demo working
2018-05-27 12:45:32 +05:30
Solufyin
64d02f917a
[ADD] Department Analytics Bar Chart Feature ( #14217 )
2018-05-26 09:26:03 +05:30
rohitwaghchaure
a8fb2db001
[Fix] If two po consolidated in one purchase invoice, Total Net Weight not get summed ( #14230 )
2018-05-26 09:23:02 +05:30
Kenneth Sequeira
089a41c679
Fixed code in Embed Link ( #14228 )
2018-05-26 09:22:43 +05:30
Suraj Shetty
084b0b3a67
Treeview permission ( #14232 )
...
* Replace frappe.db.sql to frappe.get_list to apply permissions (#14037 )
* Replace frappe.db.sql to frappe.get_list to apply permission
- All get_children method had frappe.db.sql in them which
had no permission check, now its replaced with frappe.get_list
which will check permission based on the user.
* Fix codacy
- Remove trailing whitespace
* Add parent filter
* Add ifnull checks
2018-05-26 09:12:59 +05:30
Suraj Shetty
aadfaa4493
Minor fixes ( #14231 )
...
* Parse date using getdate to avoid TypeError
* Fix alignment of application dashboard table text
* Use `user` instead of `email` to get value from user table
2018-05-26 09:10:47 +05:30
Nabin Hait
33df0b4fbf
Test case fixes ( #14219 )
...
* Test case fixes
* fetch_from fixes
2018-05-26 09:09:02 +05:30
Jamsheer
e6eef3085c
Remove unused imports
2018-05-25 15:20:50 +05:30
Manas Solanki
d09a6c9ccb
Merge pull request #14225 from frappe/manassolanki-patch-8
...
Update employee.py
2018-05-25 14:47:49 +05:30
Rushabh Mehta
92bb786320
[fix] .travis.yml
2018-05-25 14:47:01 +05:30
Jamsheer
9416ac4ad4
Leave Priod - fix - grant leave allocation filter by grade
2018-05-25 14:46:31 +05:30
Manas Solanki
730cb3b547
Update employee.py
2018-05-25 14:46:21 +05:30
Jamsheer
fca88a6b22
Employee benefits - get_assigned_salary_structure
2018-05-25 14:35:02 +05:30
Jamsheer
79a6b42353
Salary Slip - options to fetch from migration
2018-05-25 12:56:22 +05:30
Jamsheer
ce89199abb
taxable salary slabs remove from Salary Component and add to Payroll Period
2018-05-25 12:52:23 +05:30
Jamsheer
f1d10bf286
Salary Component - remove flexi_default
2018-05-25 12:52:23 +05:30
Jamsheer
620c3a872c
Employee Benefit Claim - non pro-rata claim validation updated
2018-05-25 12:52:23 +05:30
Jamsheer
dc698a891d
options to fetch from migration
2018-05-25 12:52:23 +05:30
Jamsheer
8eec40cb8a
Employee Benefits in Salary Slip - Application and Claim
2018-05-25 12:46:31 +05:30
Jamsheer
16e924333e
get payroll period days - fix
2018-05-25 12:46:31 +05:30
Jamsheer
47d865baa0
Calculate remaining benefit amount in Employee Benefit Application
2018-05-25 12:46:31 +05:30
Jamsheer
8a953ba516
Validate remaining benefit amount in Employee Benefit Application
2018-05-25 12:46:31 +05:30
Jamsheer
772f257ff3
Employee Benefit Claim - date default to Today
2018-05-25 12:46:31 +05:30
Jamsheer
eacaad3aec
Max benefit amount in Employee Benefit Application Detail
2018-05-25 12:42:21 +05:30
Jamsheer
c1ae88ba02
Employee Benefit Calim - earning component filter updated
2018-05-25 12:42:20 +05:30
Jamsheer
c5629efe0e
Employee Benefit Application - refactor validation
2018-05-25 12:42:20 +05:30
Jamsheer
9d5d328a4f
Salary Structure - validate flexi with max benefit
2018-05-25 12:42:20 +05:30
Jamsheer
65a5e47e68
Payroll Period - validate dates and overlap
2018-05-25 12:37:36 +05:30
Jamsheer
cf414cc499
Payroll Period - fields refactor
2018-05-25 12:37:36 +05:30
Jamsheer
2ee211ad21
Salary Structure - validate max benefits with flexi
2018-05-25 12:37:36 +05:30
Jamsheer
ce7310255e
Salary Structure - filter for earnings
2018-05-25 12:37:36 +05:30
Jamsheer
43e191289c
Employee Benefit Application - earning component filter by salary structure flexi component
2018-05-25 12:37:36 +05:30
Jamsheer
77a91f0d01
Salary Component - account mandatory for separate payment entry
2018-05-25 12:37:36 +05:30
Jamsheer
1248f6a752
Codacy fix
2018-05-25 12:37:36 +05:30
Jamsheer
0493c22f3c
Additional Salary Component - filter updated - salary_component
2018-05-25 12:37:35 +05:30
Jamsheer
f647aa15af
Salary Component - fields - refactor fields behaviour
2018-05-25 12:37:35 +05:30
