Suraj Shetty
|
2a9b17efd4
|
Merge branch 'develop' of github.com:frappe/erpnext into employee-skill-map
|
2019-04-21 23:53:54 +05:30 |
|
Suraj Shetty
|
079684f7da
|
feat: Task type (#17311)
* feat: Add task type doctype
|
2019-04-20 23:37:49 +05:30 |
|
Nabin Hait
|
65b3a849d3
|
Merge pull request #17306 from surajshetty3416/fix-employee-permission
fix: Do not create employee user permission if already exists
|
2019-04-20 01:44:06 +05:30 |
|
Nabin Hait
|
ee43f9d154
|
Merge pull request #17305 from nabinhait/inv-disc-fix1
fix: fetch party account as discounted receivable account in payment entry
|
2019-04-20 01:40:55 +05:30 |
|
Nabin Hait
|
d8783343f3
|
Merge pull request #17283 from rohitwaghchaure/requested_items_tobe_ordered_issue_for_multi_uom_develop
fix: Requested Items To Be Ordered report showing records even if material request is fully ordered(Cherry-picked)
|
2019-04-20 01:27:31 +05:30 |
|
Suraj Shetty
|
98390dae49
|
fix: Do not create employee user permission if already exists
|
2019-04-19 21:52:08 +05:30 |
|
Nabin Hait
|
c8b1351e87
|
fix: fetch party account as discounted receivable account in payment entry
|
2019-04-19 21:33:29 +05:30 |
|
Nabin Hait
|
4a5bed5c07
|
fix: fetch party account as discounted receivable account in payment entry
|
2019-04-19 21:33:29 +05:30 |
|
Nabin Hait
|
06f992f850
|
Merge pull request #17299 from nabinhait/inv-disc-fixes
fix: Close loan considering latest invoice outstanding balance
|
2019-04-19 21:27:02 +05:30 |
|
Nabin Hait
|
a6e09826b3
|
Merge pull request #17297 from netchampfaris/index-item-route
fix: Add index to Item route
|
2019-04-19 20:11:29 +05:30 |
|
Nabin Hait
|
375f051b24
|
Merge pull request #17277 from nabinhait/invoice-discounting-fixes
Invoice discounting fixes
|
2019-04-19 20:00:18 +05:30 |
|
Nabin Hait
|
d2797be1cd
|
fix: Close loan considering latest inv outstanding balance
|
2019-04-19 15:33:05 +05:30 |
|
Nabin Hait
|
8da71cebb7
|
fix: test cases
|
2019-04-19 15:10:02 +05:30 |
|
Rohit Waghchaure
|
72cc7508b0
|
fix: Requested Items To Be Ordered report showing records even if material request is fully ordered
|
2019-04-19 14:57:38 +05:30 |
|
Faris Ansari
|
1d78aae2af
|
fix: Add index to Item route
Increases route resolve time if there are lots of Items.
|
2019-04-19 14:03:25 +05:30 |
|
Nabin Hait
|
0aa036cda5
|
Merge pull request #17294 from scmmishra/trial-detail-fix
fix: fixed trial details
|
2019-04-19 13:18:03 +05:30 |
|
Nabin Hait
|
48e1e04df2
|
Merge pull request #17286 from rohitwaghchaure/task_not_able_to_search_by_name_in_global_search_develop
fix: task name was not able to search by name in global search (Cherry-picked)
|
2019-04-19 13:06:42 +05:30 |
|
Nabin Hait
|
05651291b2
|
Merge pull request #17281 from rohitwaghchaure/credit_will_not_be_converted_if_debit_amount_is_there_develop
fix: credit amount in account's currency not be consider if debit amount is present in the general ledger(Cherry-picked)
|
2019-04-19 13:00:29 +05:30 |
|
scmmishra
|
a55d32236a
|
fix: fixed trial details
|
2019-04-19 12:22:30 +05:30 |
|
Rohit Waghchaure
|
94f43ca2e2
|
fix: task name was not able to search by name in global search
|
2019-04-18 22:39:42 +05:30 |
|
Rohit Waghchaure
|
376db4f6b7
|
fix: credit amount in account's currency not be consider if debit amount is present in the general ledger
|
2019-04-18 22:06:22 +05:30 |
|
Nabin Hait
|
c99c712913
|
fix: Validate and update invoice discounting status on JE submit/cancel
|
2019-04-18 15:52:50 +05:30 |
|
Nabin Hait
|
8170585faf
|
fix: Don't fetch already discounted invoice
|
2019-04-18 15:13:18 +05:30 |
|
Nabin Hait
|
36bb3f55f2
|
fix: Added invoice discounting dashboard
|
2019-04-18 14:47:44 +05:30 |
|
Suraj Shetty
|
3aa5e125bd
|
feat: Add employee training section to the employee skill map
|
2019-04-18 12:46:33 +05:30 |
|
Nabin Hait
|
0050652be9
|
Merge pull request #17265 from deepeshgarg007/gstr1-fixes-develop
fix: GSTR-1 B2C Small report fix
|
2019-04-17 17:32:29 +05:30 |
|
Nabin Hait
|
3a2d6a4043
|
Merge pull request #17169 from rohitwaghchaure/production_plan_multiple_enhancements
feat: Production plan enhancements
|
2019-04-17 17:31:14 +05:30 |
|
Nabin Hait
|
26dd192516
|
Merge pull request #17263 from rohitwaghchaure/finance_book_blank_issue_develop
fix: If finance book filter is not set then show all the entries(Cherry-pick)
|
2019-04-17 17:22:45 +05:30 |
|
Shivam Mishra
|
f3cc87455a
|
Merge pull request #17249 from scmmishra/auto-fetch-serial
feat: Auto fetch serial numbers
|
2019-04-17 17:15:27 +05:30 |
|
Rohit Waghchaure
|
38238b0cfd
|
fixed test cases
|
2019-04-17 15:56:00 +05:30 |
|
scmmishra
|
fed4fd0f02
|
style: linting issue fixed
|
2019-04-17 15:46:15 +05:30 |
|
Shivam Mishra
|
63921ebbc9
|
style: fixed formatting
Fixed formatting for for auto_fetch_serial_number
|
2019-04-17 15:29:29 +05:30 |
|
scmmishra
|
5522cf8c26
|
fix: codacy linting
|
2019-04-17 10:26:21 +05:30 |
|
Faris Ansari
|
1cf9fa9662
|
fix: Refactor Upload Attendance (#17241)
New API frappe.ui.FileUploader
https://github.com/frappe/frappe/pull/7253
|
2019-04-17 09:45:46 +05:30 |
|
deepeshgarg007
|
9f873e97fa
|
fix: Remove print statement
|
2019-04-16 20:58:22 +05:30 |
|
deepeshgarg007
|
c354a17383
|
fix: Code cleanup
|
2019-04-16 20:56:49 +05:30 |
|
deepeshgarg007
|
e5a869bc45
|
fix: GSTR-1 B2CS report fix
|
2019-04-16 20:08:12 +05:30 |
|
Rohit Waghchaure
|
7aee809571
|
fix: If finance book filter is not set then show all the entries
|
2019-04-16 19:35:18 +05:30 |
|
rohitwaghchaure
|
1ddc123dbf
|
Merge pull request #17261 from rohitwaghchaure/pos_not_working_if_user_can_access_more_than_one_company_develop
fix: POS not working if user has access of multiple company(Cherry-pick)
|
2019-04-16 18:44:27 +05:30 |
|
Rohit Waghchaure
|
00d73cda50
|
fix: POS not working if user has access of multiple company
|
2019-04-16 18:43:16 +05:30 |
|
rohitwaghchaure
|
f950275a58
|
Merge pull request #17260 from rohitwaghchaure/fix_pending_so_items_for_purchase_request_report_develop
fix: Pending SO Items For Purchase Request not showing the so quantity correctly if so has duplicate items(Cherry-pick)
|
2019-04-16 18:26:55 +05:30 |
|
Rohit Waghchaure
|
34ee41a35e
|
fix: Pending SO Items For Purchase Request not showing the so quantity correctly if so has duplicate items
|
2019-04-16 18:26:11 +05:30 |
|
scmmishra
|
6d3302b0cc
|
style (codacy): code formatting fixes
|
2019-04-16 18:25:53 +05:30 |
|
scmmishra
|
ed4b052df8
|
style (codacy): code formatting fixes
|
2019-04-16 17:03:25 +05:30 |
|
scmmishra
|
46901076be
|
feat: Use standard serial picker to add as well as update serial numbers
|
2019-04-16 17:01:01 +05:30 |
|
scmmishra
|
c791c3b24b
|
fix: Minor bug in serial no auto fetch api
|
2019-04-16 16:07:32 +05:30 |
|
scmmishra
|
eee5c38911
|
feat: Use controller for serial no. API
|
2019-04-16 15:57:51 +05:30 |
|
scmmishra
|
61d6b677e4
|
feat: Show standard serial number selector in item grid form
|
2019-04-16 15:17:27 +05:30 |
|
Rushabh Mehta
|
59c5a16037
|
fix(account_balance_timeline): remove unused import
|
2019-04-16 15:11:45 +05:30 |
|
scmmishra
|
407496b528
|
chore: minor changes to labels
|
2019-04-16 13:32:41 +05:30 |
|