Deepesh Garg
|
15a7b7ce71
|
fix: GSTR 3b report fixes (#17317)
* fix: GSTR-3b report total taxable value fixes
* fix: Test Cases
|
2019-04-22 15:22:36 +05:30 |
|
scmmishra
|
5079e6c1c1
|
chore: minor improvements
|
2019-04-22 14:48:32 +05:30 |
|
scmmishra
|
ac8d3479c9
|
feat: Added add_quiz_activity function to course_enrollment class
|
2019-04-22 14:38:51 +05:30 |
|
scmmishra
|
33969b7d7c
|
chore: Minor change to question doctype
|
2019-04-22 14:30:14 +05:30 |
|
Rohit Waghchaure
|
270d4e9f4e
|
fix: moved erpnext related methods from frappe to erpnext
|
2019-04-22 14:11:43 +05:30 |
|
scmmishra
|
66d239281c
|
chore: minor code improvements
|
2019-04-22 14:10:09 +05:30 |
|
Nabin Hait
|
d3cd98c45e
|
fix: Renamed depends_on_lwp to depends_on_payment_days
|
2019-04-22 13:45:45 +05:30 |
|
Nabin Hait
|
452f2c5694
|
Merge pull request #17322 from nabinhait/salary-structure-child-docstatus
Salary structure child docstatus
|
2019-04-22 13:42:55 +05:30 |
|
Nabin Hait
|
36561801c2
|
Update set_salary_details_submitable.py
|
2019-04-22 13:38:06 +05:30 |
|
Anurag Mishra
|
35e52b5596
|
fix: fixed spelling
|
2019-04-22 13:37:03 +05:30 |
|
Saif Ur Rehman
|
a216844d2c
|
fix: Set Allocate Advance Automatically disabled by default
|
2019-04-22 12:10:40 +05:00 |
|
scmmishra
|
64d2fe0ad7
|
fix: Minor typo
|
2019-04-22 12:30:08 +05:30 |
|
scmmishra
|
4add826703
|
chore: Minor code improvements
- Changed variable name in `get_content` function
- Added proper exceptions for `get_topic` and `get_content` functions in lms
|
2019-04-22 12:28:13 +05:30 |
|
scmmishra
|
da2c90cd18
|
chore: renamed get_program api functions
- `get_program` is renamed to `get_program_and_enrollment_status`
- `get_program_detail` is renamed to `get_program`
- Minor code improvements
|
2019-04-22 12:21:40 +05:30 |
|
scmmishra
|
9967d27b9a
|
chore: renamed ambiguous variable names in lms.py
|
2019-04-22 12:08:41 +05:30 |
|
Faris Ansari
|
733ff48d51
|
fix: Refactor for Print Format changes (#17242)
- Rename Server to Jinja
- Rename Js to JS
|
2019-04-22 12:08:18 +05:30 |
|
scmmishra
|
d78c326f95
|
chore: renamed get_topic_meta to get_student_topic_details
|
2019-04-22 12:06:28 +05:30 |
|
scmmishra
|
d5973fe4bc
|
chore: renamed get_course_meta to get_student_course_details
|
2019-04-22 12:05:22 +05:30 |
|
scmmishra
|
327334a830
|
chore: refactor utils.get_current_student
|
2019-04-22 12:03:17 +05:30 |
|
scmmishra
|
823d89cf66
|
fix (linting): codacy fixes
|
2019-04-22 11:46:22 +05:30 |
|
Nabin Hait
|
89d3aaf349
|
Merge pull request #17310 from nabinhait/ar-fix-develop
fix: Total row alignment in AR report
|
2019-04-22 11:11:38 +05:30 |
|
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
|
d21bacfc21
|
fix: Total row alignment in AR report
|
2019-04-20 10:58:58 +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 |
|
Prasad R
|
198c7ae73d
|
fix: show 2 missing doctypes in Accounts
|
2019-04-19 12:43:58 +05:30 |
|
scmmishra
|
a55d32236a
|
fix: fixed trial details
|
2019-04-19 12:22:30 +05:30 |
|
Prasad R
|
e1a6022c8c
|
fix: Allow system manager to access share ledger
|
2019-04-19 10:57:21 +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 |
|
deepeshgarg007
|
c841bd486a
|
feat: Added validations and mapper to create inter company mapper
|
2019-04-18 20:10:31 +05:30 |
|
deepeshgarg007
|
90262f84af
|
feat: Added custom button to make inter company order
|
2019-04-18 20:09:07 +05:30 |
|
deepeshgarg007
|
100bd29dfd
|
feat: Updated doctypes for sales and purchase order
|
2019-04-18 20:08:20 +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 |
|
deepeshgarg007
|
767a00fa8d
|
feat: Logic for query and report creation for inactive items
|
2019-04-18 08:45:10 +05:30 |
|
deepeshgarg007
|
4d1df416e9
|
fix: Reordered and deleted unnecessary filters
|
2019-04-18 08:29:21 +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 |
|
deepeshgarg007
|
cab2d82ea8
|
Merge branch 'develop' of https://github.com/frappe/erpnext into inactive_items
|
2019-04-17 11:35:56 +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 |
|
Rohit Waghchaure
|
00d73cda50
|
fix: POS not working if user has access of multiple company
|
2019-04-16 18:43:16 +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 |
|
deepeshgarg007
|
508e815db0
|
feat: Added filters and columns for inactive items report
|
2019-04-16 17:07:13 +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 |
|
Nabin Hait
|
0c896c38f8
|
Merge pull request #17244 from hrwX/delivery_note_fix_v12
fix(Delivery Note): show get items even if note has been amended
|
2019-04-16 13:20:26 +05:30 |
|
Himanshu
|
ef848fda2a
|
fix: let user delete the elements of items
|
2019-04-16 13:17:20 +05:30 |
|
Nabin Hait
|
00e9659e3f
|
Merge pull request #17195 from asbasawaraj/fixed_account_ranme_when_company_abbr_is_updated
Fixed Company Abbr Update Was Not Able To Update Account
|
2019-04-16 12:51:13 +05:30 |
|
scmmishra
|
19a41ed16d
|
chore: code cleaning
|
2019-04-16 12:51:05 +05:30 |
|
scmmishra
|
41cf945247
|
feat (UX): Refactored batch selector
|
2019-04-16 12:47:39 +05:30 |
|
Nabin Hait
|
d2044c0f23
|
Merge pull request #17184 from frappe/akurungadam-patch-1
fix: misleading condition example in field options
|
2019-04-16 12:44:17 +05:30 |
|
scmmishra
|
8ec54c2214
|
feat: Added auto fetch serial numbers API
|
2019-04-16 12:20:55 +05:30 |
|
scmmishra
|
b98612ff5b
|
feat: Added auto fetch logic and button for client
|
2019-04-16 12:20:42 +05:30 |
|
Himanshu Warekar
|
810dde2e0b
|
fix: show get items even if note has been amended
|
2019-04-16 12:20:35 +05:30 |
|
Suraj Shetty
|
006c3dccf9
|
feat: Add logic to auto fetch skill from designation doc
- Set today as default evaluation date
|
2019-04-16 12:14:44 +05:30 |
|
Nabin Hait
|
b5199951ad
|
Merge pull request #17239 from nabinhait/pr-pi
fix: Invoice against partially returned DN/PR
|
2019-04-16 11:54:12 +05:30 |
|
Rushabh Mehta
|
1c2eb51a91
|
fix(api)
|
2019-04-16 11:12:34 +05:30 |
|
Suraj Shetty
|
354c70a0e7
|
feat: Init employee skill map doctype
|
2019-04-16 10:20:32 +05:30 |
|
Suraj Shetty
|
a0f7656ffc
|
feat: Add skill child table to designation doctype
- To record skills required of a particular designation
|
2019-04-16 10:19:53 +05:30 |
|
Nabin Hait
|
29997e2631
|
fix: Invoice against partially returned DN/PR
|
2019-04-16 09:55:42 +05:30 |
|
Nabin Hait
|
c066bbde06
|
Merge pull request #17235 from hrwX/remove_asset_permission_v12
fix(Asset): Remove user permission for employee in asset
|
2019-04-16 09:45:40 +05:30 |
|
Rushabh Mehta
|
6dff8038e6
|
fix(account_balance_timeline)
|
2019-04-16 09:35:46 +05:30 |
|
Rushabh Mehta
|
7efe01578d
|
fix(account_balance_timeline)
|
2019-04-16 09:33:21 +05:30 |
|
Faris Ansari
|
557520148e
|
fix: Item Variant Attribute Order (#17237)
- Show Item Variant Attributes in order they appear in child table
|
2019-04-15 23:19:44 +05:30 |
|
Himanshu Warekar
|
9b7c7787e6
|
Merge develop
|
2019-04-15 22:56:41 +05:30 |
|
Himanshu Warekar
|
3e503f213b
|
fix: remove user permission for emp in asset
|
2019-04-15 22:50:22 +05:30 |
|
Nabin Hait
|
a5265113ce
|
Merge pull request #17232 from karthikeyan5/develop-woocommerce-fix
fix(woocommerce integration): 403 error and adding defaults
|
2019-04-15 21:17:16 +05:30 |
|