Commit Graph

26491 Commits

Author SHA1 Message Date
rohitwaghchaure
e141865c43
Merge pull request #16722 from rohitwaghchaure/stop_button_not_working
fix: stop button not working in material request
2019-02-20 12:30:26 +05:30
Sagar Vora
eba76c99a3 Merge branch 'master' into develop 2019-02-20 12:11:25 +05:30
Sagar Vora
c09ffe1308 Merge branch 'hotfix' 2019-02-20 12:11:25 +05:30
Sagar Vora
d48393541d bumped to version 11.1.8 2019-02-20 12:31:25 +05:50
Gaurav Naik
3bf0acbac6 fix(regional,italy): renamed validate hook for address (#16732) 2019-02-20 12:08:53 +05:30
Rohit Waghchaure
7e02e1c3cd fix: not able to cancel maintenance visit 2019-02-19 22:53:31 +05:30
deepeshgarg007
1b04534095 fix: Removed duplicate fields from BOM Item 2019-02-19 21:36:12 +05:30
deepeshgarg007
942c894f93 fix: fetch item name in item dashboard 2019-02-19 19:51:23 +05:30
Rohit Waghchaure
f4049f9dfd fix: user progress issue 2019-02-19 19:46:14 +05:30
Rohit Waghchaure
389cd6ad63 fix: stop button not working in material request 2019-02-19 19:18:07 +05:30
scmmishra
62968b318f wip 2019-02-19 18:25:07 +05:30
Sagar Vora
cc6e51c62d Merge branch 'master' into develop 2019-02-19 18:09:49 +05:30
Sagar Vora
2b7ce3dc71 Merge branch 'hotfix' 2019-02-19 17:54:14 +05:30
Sagar Vora
f5c511c193 bumped to version 11.1.7 2019-02-19 18:14:14 +05:50
Nabin Hait
2c23f98b65
Merge pull request #16721 from nabinhait/ar-ap-fix
fix: AR/AP report based on account type
2019-02-19 17:45:30 +05:30
Nabin Hait
06e6e87e3b
Merge pull request #16720 from gaurav-naik/italy-state-codes
fix(regional,italy): added state code on address, updated patch
2019-02-19 17:44:49 +05:30
Gaurav
3f046136d4 fix(regional,italy): added state code on address, updated patch
moved state codes to init, rewired patch
added logic to autoset state code on address validate
handled multiple names for Italy
refactored validate_address_italy to validate_address
2019-02-19 17:28:36 +05:30
Nabin Hait
e4f73929c4 fix: AR/AP report based on account type 2019-02-19 17:11:50 +05:30
scmmishra
cb8ef96f6b chore (css): Switched to frappe navbar 2019-02-19 17:03:16 +05:30
scmmishra
1682aa8a36 fix (css): Removed container class 2019-02-19 17:01:31 +05:30
Nabin Hait
ff6d2692d3
Merge pull request #16663 from netchampfaris/fix-item-variant-settings-barcodes
fix: Validate invalid fields in Item Variant Settings
2019-02-19 15:07:55 +05:30
Nabin Hait
8e9d947527
Merge branch 'hotfix' into fix-item-variant-settings-barcodes 2019-02-19 15:07:46 +05:30
Nabin Hait
21706894af
Merge pull request #16705 from deepeshgarg007/pos-precision
fix: Fetch precision form system settings in Sales invoice payment(POS)
2019-02-19 15:06:56 +05:30
Nabin Hait
2c65ef0286
Merge pull request #16710 from deepeshgarg007/purchase-qty-fix
Received Qty Label rename to accepted qty in purchase invoice
2019-02-19 15:06:18 +05:30
Nabin Hait
818ead4041
Merge branch 'hotfix' into purchase-qty-fix 2019-02-19 15:06:10 +05:30
Nabin Hait
157526c978
Merge pull request #16711 from rohitwaghchaure/multi_uom_not_working_for_rate_pricing_rule
fix: multi-uom not working for the pricing rule rate
2019-02-19 15:05:07 +05:30
Nabin Hait
6bd3098824
Merge pull request #16716 from deepeshgarg007/precision-fix
fix: Removed precision from multiple doctypes
2019-02-19 15:03:00 +05:30
rohitwaghchaure
e938306e7d
Merge pull request #16598 from gaurav-naik/italy-hotfix-new
feat(regional): Italian Localization and E-Invoicing export
2019-02-19 14:56:07 +05:30
Gaurav
2670ad7eb2 mod(regional,italy): adjusted calculation logic for charges
validation for missing code on mode of payment
UOM from settings
Replace str with cstr
2019-02-19 13:15:25 +05:30
scmmishra
765529241e [Major][Breaking] More changes 2019-02-19 13:06:33 +05:30
scmmishra
da39da627c [Major][Breaking] Server side changes to handle Topic Layer
- Moved `get_course_progress` to CourseEnrollment class.
- Added Topic context to progress functions in lms.py
- Create user on creation of a student
2019-02-19 13:06:33 +05:30
scmmishra
cc7290b7af [Major][Breaking] Student Class 2019-02-19 13:06:33 +05:30
scmmishra
766f68a20a [Major][Breaking] Modified lms.py and utils 2019-02-19 13:06:33 +05:30
scmmishra
e7d52c594b [Major][Breaking] Program Enrollment Creates Course enrollment 2019-02-19 13:06:33 +05:30
scmmishra
1253061055 [Major][Breaking] Modified Course Doctype, added Topic based functions 2019-02-19 13:06:33 +05:30
scmmishra
42f50fd82c [Major][Breaking] Added Topic Layer in Course 2019-02-19 13:06:33 +05:30
scmmishra
699f7c6fee Minor changes 2019-02-19 13:06:33 +05:30
scmmishra
42f3c51ff7 Removed Content Doctype 2019-02-19 13:06:33 +05:30
scmmishra
6663ca1d7f Adding Test Utils 2019-02-19 13:06:33 +05:30
scmmishra
c51f738b03 Refactored student creation 2019-02-19 13:06:33 +05:30
scmmishra
689500d081 Minor UI Fixes 2019-02-19 13:06:33 +05:30
scmmishra
d02fd13bf0 UI Improvements: Added Custom Navbar 2019-02-19 13:06:33 +05:30
scmmishra
87df23b52d Added quiz card on profile page 2019-02-19 13:06:33 +05:30
scmmishra
4d10229cef Quiz Progress and Minor fixes 2019-02-19 13:06:33 +05:30
scmmishra
c84a318591 Student and User link for LMS added 2019-02-19 13:06:33 +05:30
scmmishra
b3154efa84 UI Fixes 2019-02-19 13:06:33 +05:30
scmmishra
798f13be0d More Improvements 2019-02-19 13:06:33 +05:30
scmmishra
02420bd4ba Client side improvements 2019-02-19 13:06:33 +05:30
scmmishra
edc54cd5f6 Minor improvements for CardList.vue 2019-02-19 13:06:33 +05:30
scmmishra
2955851867 Built Student Profile Page 2019-02-19 13:06:33 +05:30