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

22906 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jignesh Greycube
9aca025be2 Documentation to Fetch value in Child Table for a field (#14282) 
* Fetch value in Child Table for a field

Sample Script to fetch value in child table

* Update fetch value in child table field
 2018-05-30 15:08:55 +05:30
Ranjith
806cd93791 Merge remote-tracking branch 'frappe/develop' into dev_hra 2018-05-30 13:37:47 +05:30
Ranjith
155ecc1b4a Tax Exemption Declaration - HRA Calculation 2018-05-30 13:37:15 +05:30
Faris Ansari
6ac9c0f71e
Merge pull request #14267 from surajshetty3416/workflow-doc-changes 
Add doc related to workflow action
 2018-05-30 12:34:21 +05:30
Zarrar
39c0add5a2 query fix sales-person-target-variance-item-group-wise (#14271) 2018-05-30 11:56:58 +05:30
Zarrar
58200182b4 update timeline data form Activity Log (#14276) 
Documents updated are stored in Activity Log rather than Communication
 2018-05-30 11:56:23 +05:30
Ameya Shenoy
c2c73ae96a [minor] removed vim swap file (#14277) 2018-05-30 11:55:38 +05:30
Prateeksha Singh
865e16621c [docs] fix embed issues (#14268) 2018-05-29 17:09:56 +05:30
Suraj Shetty
e51e51e138 Add requested changes 2018-05-29 16:46:19 +05:30
Nabin Hait
348a6a8b17 patch fixes 2018-05-29 16:17:15 +05:30
Suraj Shetty
77aed9d58b Move video section to bottom 2018-05-29 15:45:22 +05:30
Suraj Shetty
16d3494efc Add doc related to workflow action 2018-05-29 15:29:18 +05:30
Vladyslav Baidak
13d4391e70 Fixed SQL syntax error in Get Loan Details (#14265) 2018-05-29 15:22:05 +05:30
Ranjith
7bb621d2bf Tax Exemption Declaration, Proof Submission HRA fields 2018-05-29 13:58:31 +05:30
Ranjith
fb257ba19c Company - Payroll Settings- fields 2018-05-29 13:57:27 +05:30
Nabin Hait
4d0c73a5c8 Submit auto created salary structure assignments 2018-05-29 13:25:28 +05:30
Nabin Hait
3aa205f19d Fixes related to department tree 2018-05-29 13:08:48 +05:30
Saurabh
d3a8c9308b [fix] add ignore validate flag (#14238) 2018-05-29 13:07:27 +05:30
Nabin Hait
288cbcafce Create demo data for salary structure 2018-05-29 11:04:11 +05:30
Nabin Hait
153536bf70 minor test fixes 2018-05-29 10:58:57 +05:30
Shreya Shah
ae95a8aa15 Update status in Purchase Receipt (#14257) 
* Update status on submission if per_billed = 100

* Add patch to update existing records
 2018-05-28 18:24:28 +05:30
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