Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,857 Commits 3 Branches 0 Tags 1 GiB
7cc6a67c18
Commit Graph

26857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mangesh-Khairnar
7cc6a67c18 add department filter to employee leave balance 2019-05-29 15:59:20 +05:30
Mangesh-Khairnar
8f47bffa0e fix: create an instance 2019-05-29 15:54:14 +05:30
Mangesh-Khairnar
ae4228aed4 fix: fetch queries 2019-05-28 13:24:15 +05:30
Mangesh-Khairnar
9d6151d200 patch: add reload doc for leave ledger entry 2019-05-28 11:45:51 +05:30
Mangesh-Khairnar
c6d6adcbf3 fix: ledger entry creation for encashment 2019-05-28 09:44:38 +05:30
Mangesh-Khairnar
61bb236cfa test: delete ledger entry after each test to maintain balance 2019-05-27 19:36:40 +05:30
Mangesh-Khairnar
35786c0067 Merge branch 'leave-management' of https://github.com/Mangesh-Khairnar/erpnext into leave-management 2019-05-27 15:42:11 +05:30
Mangesh-Khairnar
6f69bbe1d7 test: leave ledger balance 2019-05-27 15:40:36 +05:30
Mangesh-Khairnar
7fbaef5de3 fix: expiry ledger creation 2019-05-27 15:39:48 +05:30
Nabin Hait
c9a4111f4d
Merge branch 'develop' into leave-management 2019-05-27 13:59:27 +05:30
Mitchy25
a8f6938556 Fix: Precision in Appraisals (#17673) 
* Update appraisal.js

This fixes issues associated with 2 decimal places. Example: 4 questions (Each weighted 25%), will give a total result of 5.2 (If 5 achieved on every question). This is because 5*0.25 = 1.25 which is rounded to 1.3 for precision=2. When precision = 3, this is not an issue.

* fix: score based on field's precisin
 2019-05-27 13:57:56 +05:30
Deepesh Garg
5f2afb8803 fix: Do not fetch batch items and serialized items in stock reconciliation (#17725) 2019-05-27 13:42:29 +05:30
asbasawaraj
a281ce3dde fix: Updated Field Labels in Work Order (#17750) 2019-05-27 13:33:37 +05:30
Deepesh Garg
7fc8b2fa50 fix: GSTR-1 Report B2B fixes (#17751) 
* fix: GSTR-1 Report fixes

* fix: Simply add tax if item tax is not specified
 2019-05-27 13:30:52 +05:30
Anurag Mishra
9d9440277c fix: holidays was showing on same date in calendar view (#17754) 2019-05-27 13:20:42 +05:30
Kenneth Sequeira
a29ed40ad3 fix: Improve error message (#17747) 
Change ```Allocated amount can not greater than unadjusted amount``` to ```Allocated amount cannot be greater than unadjusted amount```

```Allocated amount can not be negative``` to ```Allocated amount cannot be negative```
 2019-05-27 11:47:07 +05:30
Nabin Hait
5cd04a6d30
fix: payment reconciliation against expense claim (#17729) 
* fix: payment reconciliation against expense claim

* feat: Added dashboard for expense claim
 2019-05-27 11:44:06 +05:30
Mangesh-Khairnar
705b7dc9c2 Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-05-27 11:21:06 +05:30
Mangesh-Khairnar
71cdcb3593 style: add a more descriptive method name 2019-05-27 11:00:04 +05:30
Mangesh-Khairnar
24248f687b patch: create entries for only missing transactions 2019-05-27 10:58:42 +05:30
Mangesh-Khairnar
45197965d7 fix: give cancellation permission to hr manager 2019-05-27 03:26:48 +05:30
Mangesh-Khairnar
d751281fa7 fix: application and leave encashment test cases 2019-05-27 03:23:58 +05:30
Mangesh-Khairnar
e7d307e6bf fix: only expire carry forwarded allocation via scheduler 2019-05-27 03:21:32 +05:30
Mangesh-Khairnar
2417c93d0e feat: create expiry and carry forward calculation on leave allocation creation 2019-05-27 03:20:10 +05:30
Mangesh-Khairnar
c99f644ffe test: carry forward and expiry allocation 2019-05-27 03:13:47 +05:30
Mangesh-Khairnar
7a7f4bd822 fix: leave balance calculation 2019-05-27 03:12:57 +05:30
Mangesh-Khairnar
9e3b688333 test: create leave policy 2019-05-27 03:10:39 +05:30
Mangesh-Khairnar
f3926d0fcb patch: leave ledger entries 2019-05-26 20:17:16 +05:30
Rushabh Mehta
2d7993592f
Merge pull request #17703 from rmehta/yeah-form-js 
refactor: deprecate old API as per https://github.com/frappe/frappe/pull/7537
 2019-05-24 11:36:16 +05:30
Rushabh Mehta
7e4fb49c61 fix(minor): after manual testing 2019-05-24 11:22:31 +05:30
Mangesh-Khairnar
45cf02308e fix: prevent manual creation of ledger entries 2019-05-23 20:29:18 +05:30
Mangesh-Khairnar
8ef81870bb test: create leave ledger entry for encashment 2019-05-23 20:28:16 +05:30
rohitwaghchaure
0c2e3c77a3 fix: range 4 for ageing filter added in the AP/AR report (#17715) 2019-05-23 15:27:47 +05:30
rohitwaghchaure
fd4815da53
Merge pull request #17690 from rohitwaghchaure/set_default_warehouse_from_the_stock_settings_v12 
fix: while making the item, default warehouse not set even if the stock settings has the warehouse
 2019-05-23 15:04:43 +05:30
Saurabh
ba04c3e5bb fix: table name alias (#17706) 2019-05-23 14:16:56 +05:30
Saurabh
45cd60dfb2
Merge pull request #17645 from nabinhait/bom-item-rate-dev 
fix: BOM Item rate based on uom conversion factor and exchange rate
 2019-05-22 18:58:34 +05:30
Mangesh-Khairnar
5ba17c87e5 feat: remove update allocation after submit 2019-05-22 18:29:22 +05:30
Rushabh Mehta
04e89ce808 refactor: deprecate old API 2019-05-22 16:52:36 +05:30
Nabin Hait
0ce85735b8
Merge branch 'develop' into set_default_warehouse_from_the_stock_settings_v12 2019-05-22 15:06:04 +05:30
rohitwaghchaure
8529cde0f0
Merge pull request #17687 from rohitwaghchaure/set_default_warehouse_from_the_stock_settings_develop 
fix: item group not disaplying in the website if shopping cart is disabled
 2019-05-22 13:23:44 +05:30
rohitwaghchaure
0432d3844b
Merge pull request #17700 from rohitwaghchaure/italian_localization_issue_for_invoices_develop 
fix: removed translation for customer type and tax charge type
 2019-05-22 13:23:25 +05:30
Rohit Waghchaure
68a1456672 fix: removed translation for customer type and tax charge type 2019-05-22 13:22:39 +05:30
Rohit Waghchaure
c41118bac7 Get default warehouse from the stock settings in the get_item_details 2019-05-21 15:21:13 +05:30
Nabin Hait
7327f8a901
fix: Person / Org name is not mandatory while creation of lead from email (#17676) 2019-05-21 15:05:26 +05:30
Rushabh Mehta
98a80407f8
Merge pull request #17538 from adityahase/fix-training-feedback 
fix(hr): Use event_status instead of status
 2019-05-21 12:19:03 +05:30
Rushabh Mehta
397a48d11f
Merge pull request #17640 from nabinhait/gle-opening-stock-reco-dev 
fix: GL Entry for opening stock reconciliation
 2019-05-21 12:17:22 +05:30
Rohit Waghchaure
5e7b4ca6a4 fix: while making the item, default warehouse not set even if the stock settings has the warehouse 2019-05-21 12:14:16 +05:30
Rushabh Mehta
8c78299158 fix(readme): logo 2019-05-21 11:57:33 +05:30
Rohit Waghchaure
6358370735 fix: item group not disaplying in the website if shopping cart is disabled 2019-05-21 10:53:39 +05:30
Deepesh Garg
9982576ea6
Merge pull request #17678 from rohitwaghchaure/show_opening_entries_gl_report_v12 
feat: added checkbox in the filter of general ledger to show opening entries
 2019-05-20 15:20:53 +05:30