Shivam Mishra
8ddb63adae
feat: added auto course enrollment for enrolled programs
2019-06-03 14:40:52 +05:30
Nabin Hait
49133c5620
Merge pull request #17835 from deepeshgarg007/serial-no-devlop
...
fix: Serial no filtering issue for delivered items
2019-06-03 14:24:56 +05:30
Nabin Hait
37fdeee367
Merge pull request #17805 from nabinhait/discount-rounding-adjustment-dev
...
fix: Rounding adjustment while additional discount amount is applied on grand total
2019-06-03 13:09:04 +05:30
deepeshgarg007
545fef9934
fix: Pass delivery document no as empty string
2019-06-03 13:06:37 +05:30
Shivam Mishra
d1a252190b
refactor: refactored quiz api and added quiz.js
2019-06-03 12:57:38 +05:30
deepeshgarg007
853a561f11
fix: Serial no filtering issue for delivered items
2019-06-03 12:11:54 +05:30
Himanshu Warekar
9f458e3413
fix: codacy
2019-06-02 20:47:23 +05:30
Himanshu Warekar
4a7a380f0c
fix: codacy
2019-06-02 19:46:44 +05:30
deepeshgarg007
290847df46
fix: Fixes in accounting doctype dashboards
2019-06-02 19:35:18 +05:30
deepeshgarg007
6d313c72e1
fix: Remove diemnsion from value list if present
2019-06-01 23:26:42 +05:30
deepeshgarg007
e19abb162a
fix: Resolve merge conflicts in purchase_receipt_item
2019-06-01 23:26:09 +05:30
deepeshgarg007
55b894bfef
Merge branch develop into dimensions
2019-06-01 23:13:36 +05:30
deepeshgarg007
223225e785
fix: Update function name
2019-06-01 23:09:04 +05:30
deepeshgarg007
ce15591872
Merge branch 'develop' of https://github.com/frappe/erpnext into dashboards
2019-06-01 22:57:51 +05:30
Faris Ansari
b8eaa3d377
fix: Issue list portal styling
2019-06-01 20:56:37 +05:30
Saurabh
011fe48ec3
Merge pull request #17823 from abhijitkumbharInd/develop
...
fix: Vehicle Master - Last carbon check accepting future date.(#17821 )
2019-05-31 14:26:08 +05:30
Saurabh
f68bd8f349
Merge pull request #17813 from rohitwaghchaure/allow_import_for_packing_slip_develop
...
fix: allow import for packing slip
2019-05-31 14:24:51 +05:30
Saurabh
b6028b0495
Merge pull request #17809 from Alchez/develop-sales-analytics-total
...
fix(selling): Remove Totals row for Sales Analytics
2019-05-31 14:21:01 +05:30
Saurabh
731986d8ee
Merge pull request #17811 from nabinhait/pr-expense-account-dev
...
fix: Added Expense Account field to push value from PO-PR-PI
2019-05-31 14:19:47 +05:30
abhijitkumbharIND
39d6cf38fc
fix: Vehicle Master - Last carbon check accepting future date.( #17821 )
2019-05-31 14:19:04 +05:30
abhijitkumbharIND
302bce355f
fix: Vehicle Master - Last carbon check accepting future date.( #17821 )
2019-05-31 14:19:04 +05:30
Rohit Waghchaure
e98d1c1147
fix: allow import for packing slip
2019-05-31 14:16:11 +05:30
Deepesh Garg
bd3c60254a
Merge pull request #17819 from deepeshgarg007/module
...
fix: Add chart of accounts importer in data import module
2019-05-31 13:33:20 +05:30
Deepesh Garg
25857d6ee3
Merge pull request #17816 from deepeshgarg007/ar_translations_develop
...
fix: Add translations for missing labels in AR report
2019-05-31 12:37:36 +05:30
Saurabh
90b60cfb0d
Merge pull request #17818 from rohitwaghchaure/fixed_pos_cash_payment_modal_develop
...
fix: POS cash mode of payment css
2019-05-31 12:29:19 +05:30
Rohit Waghchaure
840244c562
fix: pricing rule is applying on the incorrect item
2019-05-31 12:16:35 +05:30
deepeshgarg007
9f9516597c
fix: Add chart of accounts importer in data import module
2019-05-31 10:11:46 +05:30
Rohit Waghchaure
4fd704dbb6
fix: POS cash mode of payment css
2019-05-30 23:25:41 +05:30
deepeshgarg007
480586152b
fix: Label translations
2019-05-30 22:34:00 +05:30
deepeshgarg007
da2e456f70
fix: Add translations for missing labels in AR report
2019-05-30 22:30:32 +05:30
Rohit Waghchaure
ac8f4b449d
fix: pricing rule not exists issue
2019-05-30 22:24:24 +05:30
deepeshgarg007
2580075583
Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions
2019-05-30 22:11:27 +05:30
deepeshgarg007
52ea2874ec
fix: Multiple fixes in accounting dimensions
2019-05-30 22:09:36 +05:30
Shivam Mishra
46b3446da0
refactor: add check for max passing score
2019-05-30 18:55:16 +05:30
Shivam Mishra
7c7053fcf5
refactor: added question type field
2019-05-30 18:54:58 +05:30
Shivam Mishra
253a2bd260
refactor: goodbye Vue 👋
2019-05-30 18:54:11 +05:30
Shivam Mishra
e94e9d2b06
feat: content navigation and activity tracking working
2019-05-30 18:23:03 +05:30
Nabin Hait
0e1e37c921
fix: Added Expense Account field to push value from PO-PR-PI
2019-05-30 18:13:41 +05:30
Shivam Mishra
3336fb595c
style: removed console.logs
2019-05-30 18:04:36 +05:30
Rohan Bansal
250734dd24
fix(selling): Remove Totals row for tree-based Sales Analytics
2019-05-30 17:30:50 +05:30
Nabin Hait
b6ffaf11fe
Merge pull request #17787 from nabinhait/naming-series-chars
...
fix: Allowed '{' and '}' in naming series
2019-05-30 17:25:08 +05:30
Nabin Hait
1bb3fc3c19
Merge pull request #17789 from sunnyakaxd/patch-2
...
fix: Dont fetch all orders to update a few
2019-05-30 17:24:49 +05:30
Shivam Mishra
12579617f3
refactor: added enrolled status to program card
2019-05-30 17:20:31 +05:30
Shivam Mishra
4991fca5cc
feat: enabled per student access
2019-05-30 16:37:15 +05:30
Shivam Mishra
24bd07d000
refactor: style changes and template refactor
2019-05-30 16:36:58 +05:30
Shivam Mishra
dfdb92f4b1
refactor: added enrollment api
2019-05-30 16:36:01 +05:30
Shivam Mishra
f22793f91b
refactor: added program card macro
2019-05-30 16:34:53 +05:30
Nabin Hait
d060890817
fix: Rounding adjustment while additional discount amount is aplied on grand total
2019-05-30 16:05:30 +05:30
Deepesh Garg
af32ed6d8f
Merge pull request #17360 from SaiFi0102/Product-Bundle-Balance
...
feat: Product Bundle Balance Report
2019-05-30 15:58:25 +05:30
Saurabh
2b40a44429
Merge pull request #17802 from frappe-pr-bot/translations-2019-05-30
...
feat: Updated translation
2019-05-30 15:56:45 +05:30
Nabin Hait
4d58734492
fix: Rounding adjustment while additional discount amount is aplied on grand total
2019-05-30 15:51:29 +05:30
Saif Ur Rehman
7129231dbb
fix(Product Bundle Balance): Update frappe.db.escape for v12
2019-05-30 13:55:32 +05:00
Anurag Mishra
62d58acea9
fix: Added description if item variants does not have description in map(v12) ( #17796 )
...
* fix: variant item description based on attribute
* style: removed unwanted changes
2019-05-30 14:04:08 +05:30
frappe
5aeb62f288
feat: Updated translation
2019-05-30 08:17:59 +00:00
deepeshgarg007
a9b2e4e4a8
fix: White space in subscription plan dashboard
2019-05-30 12:18:10 +05:30
deepeshgarg007
e233708754
fix: Tax category dashboard
2019-05-30 12:14:16 +05:30
deepeshgarg007
4baf69656d
Merge branch 'develop' of https://github.com/frappe/erpnext into dashboards
2019-05-30 11:54:31 +05:30
deepeshgarg007
8f3a6c1596
fix: Dashboards for doctypes in accounting modules
2019-05-30 11:53:12 +05:30
Himanshu Warekar
70a2734aab
fix: config file for qms
2019-05-30 01:40:31 +05:30
Shivam Mishra
f927502cc5
refactor: added lms utilities for enrollment and program list
2019-05-29 18:39:52 +05:30
Shivam Mishra
5aa8df840e
refactor: cards and hero markup
2019-05-29 18:38:58 +05:30
Shivam Mishra
08425d46fa
refactor: set Student as default portal role for Education
2019-05-29 18:37:52 +05:30
Deepesh Garg
12a9a3ffa3
Merge branch 'develop' into Product-Bundle-Balance
2019-05-29 18:23:21 +05:30
Shivam Mishra
63d8cabb3d
fix: program card height bug
2019-05-29 15:16:59 +05:30
Shivam Mishra
b7874157f7
refactor: /lms redirects to home if lms is disbaled
2019-05-29 15:15:59 +05:30
Shivam Mishra
65681bf317
refactor: allow disbaling self enroll on lms
2019-05-29 15:15:30 +05:30
Himanshu Mishra
70029b818b
Update status_updater.py
2019-05-29 14:19:35 +05:30
Nabin Hait
f1cde0ccf6
fix: Allowed '{' and '}' in naming series
2019-05-29 13:44:03 +05:30
Shivam Mishra
16f3b713bc
Merge branch 'lms-refactor' of github.com:scmmishra/erpnext into lms-refactor
2019-05-29 13:14:50 +05:30
Shivam Mishra
ae2871f962
feat: content not visible to guest users
2019-05-29 13:11:34 +05:30
Himanshu Warekar
38ed090bf8
test: fix test case
2019-05-29 00:16:04 +05:30
Himanshu Warekar
775e9e423a
refactor: QMS refactor initial bringup
2019-05-29 00:05:58 +05:30
deepeshgarg007
c97c7c51a9
fix: Test cases for accounting dimension
2019-05-28 18:51:10 +05:30
Faris Ansari
da2c742cea
Merge branch 'develop' into request_to_quatation_fix
2019-05-28 18:28:13 +05:30
Faris Ansari
dd016479af
fix: Remove print statement
2019-05-28 18:27:22 +05:30
Anurag Mishra
5afe9f2200
fix: changed dialog field to select
2019-05-28 18:23:34 +05:30
deepeshgarg007
233b88dc52
fix: Test case fixes
2019-05-28 17:58:22 +05:30
deepeshgarg007
ffec8be85f
fix: Styling and test case fixes
2019-05-28 17:56:07 +05:30
Nabin Hait
e7b8400fc7
Merge pull request #17696 from Anurag810/warehouse_type
...
feat: Added Warehouse Type master
2019-05-28 17:25:13 +05:30
deepeshgarg007
e025aabef0
fix: Indentation fixes
2019-05-28 16:25:55 +05:30
deepeshgarg007
a8cb00f31f
fix: Styling and test case fixes
2019-05-28 16:03:08 +05:30
deepeshgarg007
adccb2c3a4
fix: Remove print statements
2019-05-28 12:24:28 +05:30
deepeshgarg007
acc2422167
Merge branch develop into dimensions
2019-05-28 12:18:32 +05:30
deepeshgarg007
f5b6ee9ae7
fix: Multiple fixes in accounting doctype
2019-05-28 12:15:56 +05:30
deepeshgarg007
50ea99e35b
fix: Is group filter for dimensions for doctype
2019-05-28 12:13:53 +05:30
deepeshgarg007
7dfffb5f73
fix: Updated test cases for accounting dimensions
2019-05-28 12:09:45 +05:30
Nabin Hait
5fef786441
Merge pull request #17765 from nabinhait/salary-slip-tax-calc-dev
...
fix: Tax calculation on salary slip
2019-05-28 11:16:31 +05:30
Anurag Mishra
a69f72988a
fix: requested filters changes
2019-05-28 11:08:14 +05:30
Nabin Hait
351e9983cf
Merge pull request #17389 from mujeerhashmi/develop
...
feat: Student Group with Student Category filter
2019-05-27 19:14:31 +05:30
Nabin Hait
9813897ec3
Merge pull request #17759 from saurabh6790/custom_field_fix
...
fix: add shopify_supplier_id custom field while setting up shopify
2019-05-27 19:12:39 +05:30
Nabin Hait
60f04d181d
Merge pull request #17756 from nabinhait/property-decorator
...
fix(subscription): Remove property decorator (#17395 )
2019-05-27 19:11:17 +05:30
Nabin Hait
7f375d209c
fix: Tax calculation on salary slip
2019-05-27 18:42:53 +05:30
Anurag Mishra
32c23ae274
fix: added read write permission to stock manager
2019-05-27 18:37:04 +05:30
Anurag Mishra
61a7b42aea
fix: added permission and fix filters in stock balance report
2019-05-27 18:37:04 +05:30
Anurag Mishra
7376b4f4f0
feat: added warehouse type master
2019-05-27 18:37:04 +05:30
Nabin Hait
1f24a4d44c
Merge pull request #17691 from netchampfaris/upload-attendance-progress
...
fix(UX): Upload Attendance
2019-05-27 17:17:03 +05:30
Nabin Hait
e662be7508
Merge pull request #17697 from nabinhait/po-status-updater-dev-1
...
fix: update received qty in PO from PR and PI
2019-05-27 17:16:40 +05:30
Nabin Hait
4f549cc196
Merge branch 'develop' into opening-stock-entry-dev
2019-05-27 17:16:03 +05:30
Nabin Hait
aafd64d9b4
fix: On change of currency, set margin amount based on exchange rate ( #17712 )
2019-05-27 17:15:47 +05:30
Saurabh
fdf0d91087
fix: add shopify_supplier_id custom field while setting up shopify
2019-05-27 15:17:58 +05:30
Joe Paul
4a8ed90255
fix(subscription): Remove property decorator ( #17395 )
2019-05-27 14:14:26 +05:30
Nabin Hait
99fa813799
Merge branch 'develop' into Product-Bundle-Balance
2019-05-27 14:01:00 +05:30
Nabin Hait
8b1d347cb5
Merge branch 'develop' into develop
2019-05-27 14:00:53 +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
Nabin Hait
235332d4ab
Merge branch 'develop' into lms-refactor
2019-05-27 13:47:45 +05:30
Nabin Hait
a659e615f3
Merge branch 'develop' into upload-attendance-progress
2019-05-27 13:47:36 +05:30
Nabin Hait
769024e2b6
Merge branch 'develop' into po-status-updater-dev-1
2019-05-27 13:47:15 +05:30
Nabin Hait
f3ccf0e949
Merge branch 'develop' into opening-stock-entry-dev
2019-05-27 13:47:07 +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
Nabin Hait
331dcc06c9
Merge branch 'develop' into upload-attendance-progress
2019-05-27 11:59:16 +05:30
Nabin Hait
6211e7343c
Merge branch 'develop' into po-status-updater-dev-1
2019-05-27 11:50:29 +05:30
Nabin Hait
ca8dae183a
Merge branch 'develop' into opening-stock-entry-dev
2019-05-27 11:50:16 +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
deepeshgarg007
e9c6e644f7
fix: Multiple changes in dimension creation logic
2019-05-26 12:34:13 +05:30
deepeshgarg007
6f6636abfe
fix: Add dimension section in multiple doctypes
2019-05-26 12:31:01 +05:30
deepeshgarg007
d330519f7c
fix: Merge branch develop into dimensions
2019-05-25 18:18:08 +05:30
Faris Ansari
932a767de4
Merge branch 'develop' into upload-attendance-progress
2019-05-24 14:46:02 +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
Faris Ansari
513bfc26d2
Merge branch 'develop' into upload-attendance-progress
2019-05-23 20:04:16 +05:30
Nabin Hait
d8496a770a
fix: validate expense account for opening stock reco
2019-05-23 15:32:55 +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
Faris Ansari
8f784c8555
fix: Remove console statement
2019-05-23 14:39:38 +05:30
Saurabh
ba04c3e5bb
fix: table name alias ( #17706 )
2019-05-23 14:16:56 +05:30
Nabin Hait
5173170be3
fix: validate expense account for opening stock entry
2019-05-23 12:10:51 +05:30
deepeshgarg007
7de05ae8f3
fix: Dashboards for doctypes in accounting module
2019-05-23 11:29:39 +05:30
Nabin Hait
79f84e58ba
test: Add test case for opening stock entry gle
2019-05-23 11:16:12 +05:30
Nabin Hait
8770ea2631
fix: Opening accounting entry for stock entry
2019-05-23 11:15:04 +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
Rushabh Mehta
04e89ce808
refactor: deprecate old API
2019-05-22 16:52:36 +05:30
Nabin Hait
318ba2b538
Merge branch 'develop' into lms-refactor
2019-05-22 15:15:51 +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
Nabin Hait
13e0fcde0c
Merge branch 'develop' into upload-attendance-progress
2019-05-22 15:05:50 +05:30
Nabin Hait
5ee08620cb
Merge branch 'develop' into po-status-updater-dev-1
2019-05-22 15:05:08 +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
Nabin Hait
ecf25907a5
fix: set schedule date from MR to PO
2019-05-22 13:07:26 +05:30
Nabin Hait
bfb09d51a3
fix: test cases
2019-05-22 12:15:56 +05:30
Nabin Hait
b7bdcc3992
fix: Don't set reqd date in PO based on MR, if less than today
2019-05-22 12:01:17 +05:30
Nabin Hait
915edbf9ce
fix: po status
2019-05-22 12:00:36 +05:30
Nabin Hait
d752051b8d
fix: update received qty in PO from PR
2019-05-22 11:59:19 +05:30
Faris Ansari
9e5665dc0a
Merge branch 'develop' into upload-attendance-progress
2019-05-21 18:01:30 +05:30
Faris Ansari
81e698d225
fix(UX): Upload Attendance
...
Enqueue import if rows more than 200. Show import progress in dashboard.
2019-05-21 17:58:55 +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
