Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,615 Commits 3 Branches 0 Tags 1 GiB
4e2256f2e3
Commit Graph

1630 Commits

Author SHA1 Message Date
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
Nabin Hait
aafd64d9b4
fix: On change of currency, set margin amount based on exchange rate (#17712) 2019-05-27 17:15:47 +05:30
Suraj Shetty
bd03a51e8f fix: Handle end call 2019-05-27 15:30:41 +05:30
Suraj Shetty
39a4d59cf6 fix: Call popup modal 2019-05-27 10:38:43 +05:30
deepeshgarg007
e9c6e644f7 fix: Multiple changes in dimension creation logic 2019-05-26 12:34:13 +05:30
deepeshgarg007
d330519f7c fix: Merge branch develop into dimensions 2019-05-25 18:18:08 +05:30
Suraj Shetty
591ad37894 fix: call popup [wip] 2019-05-24 10:11:48 +05:30
Suraj Shetty
07fe299628 fix: Make changes to fix call flow and popup trigger 2019-05-22 15:48:57 +05:30
Suraj Shetty
ee7d6e4598 Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog 2019-05-22 14:55:48 +05:30
Suraj Shetty
fb1964aa18 fix: Changes to fix popup 2019-05-22 06:38:25 +05:30
Suraj Shetty
863b93c32d refator: Rename files and move code 2019-05-21 07:57:06 +05:30
Shivam Mishra
823c79588b feat: Moving to Jinja 2019-05-19 16:01:45 +05:30
Suraj Shetty
8a178d6f30 fix: Update call summary dialog 2019-05-18 16:11:29 +05:30
Suraj Shetty
dd6b70c7cd feat: Show contact on incoming call 2019-05-16 23:55:35 +05:30
Shivam Mishra
8a976ba8ab
feat: LMS is now compatible with Frappe Theme (#17600) 
* style: UI fixes for frappe_theme compatibility

* chore: minor ui fixes
 2019-05-16 16:38:13 +05:30
Nabin Hait
3fccfaa7ce feat: Added 'Add Multiple' options in all sales / purchase transactions 2019-05-16 14:54:05 +05:30
Suraj Shetty
03c3bd5f4a feat: Open modal in realtime for incoming call 2019-05-16 13:39:50 +05:30
Suraj Shetty
d382f1d470 Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog 2019-05-16 09:47:17 +05:30
deepeshgarg007
60f4dd0736 Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions 2019-05-14 15:51:12 +05:30
Shivam Mishra
f82d0a6074 fix: show video duration and publish date only if data exists 2019-05-14 12:02:51 +05:30
Shivam Mishra
2430fd3a4c chore: show description on course card 2019-05-14 11:24:51 +05:30
deepeshgarg007
e64c357216 fix: Commified function to get dimensions 2019-05-14 08:50:45 +05:30
deepeshgarg007
d83cf65be1 fix: Added dimensions in financial reports and general ledger 2019-05-12 18:34:23 +05:30
Faris Ansari
cb03bb1c00 fix: Allow variant attributes to be optional 2019-05-03 13:41:50 +05:30
Suraj Shetty
8b0588deaf feat: Init call summary popup 2019-05-02 14:59:44 +05:30
Nabin Hait
b8103ac077
Merge branch 'develop' into item-discount 2019-05-01 12:23:30 +05:30
Faris Ansari
1e55c2e713
Remove old style custom scripts (#17077) 
* fix: Move Newsletter script from frappe to erpnext

* fix: Remove old style client scripts

* C-Form

* fix: Cost Center

* fix: Fiscal Year

* fix: Monthly Distribution

* fix: Payment Gateway Account

* fix: Pricing Rule

* fix: Missing semicolon
 2019-04-30 10:18:09 +05:30
Suraj Shetty
c87b47a575
fix: Price list conversion for other UOM from stock UOM item price (#17386) 
* fix: Price list for UOM other than stock UOM

-Fixes conversion from default UOM item price to  other UOMs

* fix: Typo
 2019-04-29 23:18:47 +05:30
Shivam Mishra
9fe7257bfc fix (ui): refactored breadcrumbs 2019-04-25 19:44:37 +05:30
Shivam Mishra
2428485ebb fix (ui): Card layout 2019-04-25 19:33:22 +05:30
scmmishra
bf7d13a7be Merge branch 'develop' of https://github.com/frappe/erpnext into lms-beta-v2 2019-04-24 09:50:19 +05:30
Nabin Hait
593242fa5c fix: Calculate rate based on discount on server side only if not rate or pricing rule applied 2019-04-23 13:22:38 +05:30
Rushabh Mehta
77b82894ff fix(style): buttons in address and contact 2019-04-23 07:57:31 +05:30
scmmishra
68b3203366 chore: Moved get_quiz_progress and get_program_progress to a class function in program_enrollment 2019-04-22 18:50:08 +05:30
scmmishra
804a74c01c fix (ui): UI fixes to Video page 2019-04-22 17:52:48 +05:30
scmmishra
6c8f23b27e fixed (ui): Fixed cards with better buttons 2019-04-22 17:51:30 +05:30
Rohit Waghchaure
270d4e9f4e fix: moved erpnext related methods from frappe to erpnext 2019-04-22 14:11:43 +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
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
823d89cf66 fix (linting): codacy fixes 2019-04-22 11:46:22 +05:30
scmmishra
fed4fd0f02 style: linting issue fixed 2019-04-17 15:46:15 +05:30
scmmishra
5522cf8c26 fix: codacy linting 2019-04-17 10:26:21 +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
61d6b677e4 feat: Show standard serial number selector in item grid form 2019-04-16 15:17:27 +05:30
scmmishra
407496b528 chore: minor changes to labels 2019-04-16 13:32:41 +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
scmmishra
b98612ff5b feat: Added auto fetch logic and button for client 2019-04-16 12:20:42 +05:30
scmmishra
5b9df676a4 fix: minor bug in breadcrumb routing 2019-04-13 18:53:49 +05:30
Rohit Waghchaure
72cc37e8da fix: Taxes and charges table not clear the existing rows if the template is changed 2019-04-11 18:35:15 +05:30
scmmishra
bae2d669b5 fix: codacy linting issues 2019-04-09 12:57:56 +05:30
scmmishra
b7d9efe901 Merged develop in lms 2019-04-09 11:39:12 +05:30
scmmishra
88f0c464b4 feat: Added breadcrumbs 2019-04-08 19:56:21 +05:30
Rushabh Mehta
fbc56c6d97 fix(style): left padding in marketplace view 2019-04-08 17:02:22 +05:30
Nabin Hait
b861c4bc46
Merge pull request #16895 from Alchez/hotfix-shipping-charge-override 
fix(transaction): Fix shipping rule charge override by tax template
 2019-04-04 11:48:48 +05:30
scmmishra
d3bae4e8b5 feat: better cards in lms 2019-04-01 15:38:56 +05:30
Rohit Waghchaure
70b996af73 fix: test cases 2019-03-31 20:34:52 +05:30
Rohit Waghchaure
e540534e42 fix: Pricing rule not working for POS 2019-03-31 17:13:18 +05:30
scmmishra
2b7e158e50 feat: Quiz attempt limits is configurable 
- Added a 'no limit' check to `check_quiz_completion` in utils.py
- Added disabled flag for questions in quiz component
- Refactored `get_quiz_without_answers` to send attempt limit data to client
 2019-03-29 12:45:08 +05:30
scmmishra
d4ed56af02 fix: navbar login bug 2019-03-29 11:03:34 +05:30
scmmishra
cea851522f feat: Added custom navbar 2019-03-28 15:33:08 +05:30
scmmishra
6123ff3251 fix: styled program card 2019-03-28 15:32:54 +05:30
scmmishra
9b7ac3e7d2 fix: fixed joining date bug on lms profile 2019-03-28 14:47:22 +05:30
scmmishra
281902f530 chore: clean up 2019-03-28 14:35:15 +05:30
scmmishra
394e93c2bf chore: Minor fixes on profile page 2019-03-28 14:34:23 +05:30
scmmishra
209250ccae fix: Profile page cards 
- Only show attempted quizzes
- Show 0 percent complete if program is enrolled but unattempted
 2019-03-28 14:27:51 +05:30
scmmishra
c03db190d2 fix: layout for hero image of program card 2019-03-28 14:15:30 +05:30
scmmishra
29aaee1488 feat: Added youtube video component 2019-03-28 13:44:25 +05:30
scmmishra
92e311d9d7 feat: refactored YoutubePlayer component 2019-03-28 13:44:05 +05:30
scmmishra
15f6faad9b fix: Video stops on closing modal 2019-03-28 13:11:00 +05:30
scmmishra
526af9d268 feat: added Youtube Video component 2019-03-28 13:10:42 +05:30
scmmishra
9bfe3a0315 feat: Added Program Intro Video modal 2019-03-28 12:20:24 +05:30
scmmishra
233db67451 Merge branch 'develop' of https://github.com/frappe/erpnext into lms-beta-v2 2019-03-27 18:27:05 +05:30
scmmishra
f04ceaec95 chore: removed commented code 2019-03-27 18:14:59 +05:30
scmmishra
5b57d977d8 fix: single primary action on LMS home 2019-03-27 18:14:41 +05:30
scmmishra
3d39b88e7c feat: LMS now supports multiple correct choice questions 2019-03-27 18:01:14 +05:30
Frappe Bot
b07a5d449d Merge branch 'master' into develop 2019-03-23 07:25:03 +00:00
Rushabh Mehta
c0de5b741e fix: remove gitter chat 2019-03-22 14:32:00 +05:30
scmmishra
43e9375642 feat [WIP]: Added multiple choice question component 2019-03-20 13:25:02 +05:30
Rohit Waghchaure
8bfe330b37 feat: pricing rule enhancements 2019-03-19 12:44:30 +05:30
scmmishra
000e706337 feat: Only student progress is recorded in LMS 
Changes
- Instructors can freely audit the course and their progress will not be recorded
- Added check for super access for get_program in utils.py
- Guests can view topics page
- Instructors can see explore topic button
- Content Activity is only saved for a student in lms.py
- Modified variable names in topic.py
 2019-03-19 12:30:43 +05:30
Faris Ansari
5f8b358fd4
Website: Product Configurator and Bootstrap 4 (#15965) 
- Refactored Homepage with customisable Hero Section
- New Homepage Section to add content on Homepage as cards or using Custom HTML
- Products page at "/all-products" with customisable filters
- Item Configure dialog to find an Item Variant filtered by attribute values
- Contact Us dialog on Item page
- Customisable Item page content using the Website Content field
 2019-03-19 11:48:32 +05:30
scmmishra
e3dea29f58 fix: Minor UI fix 2019-03-18 15:44:55 +05:30
scmmishra
14d70ce444 chore: updated education config 2019-03-14 12:31:25 +05:30
Rohan Bansal
90972cfbf9 fix(transaction): Avoid shipping rule charge override by tax template 2019-03-11 15:00:48 +05:30
Frappe Bot
7e67a400cd Merge branch 'master' into develop 2019-03-08 09:39:33 +00:00
rohitwaghchaure
d4754619d0
Merge pull request #16806 from rohitwaghchaure/set_scanned_barcode_in_the_table 
fix: scan barcode not adding the barcode value in the items table
 2019-03-07 11:29:56 +05:30
scmmishra
18a1a8d4f4 style: Fixed route.js 2019-03-06 10:55:21 +05:30
Frappe Bot
8f0660ab31 Merge branch 'master' into develop 2019-03-01 09:22:36 +00:00
scmmishra
471140c6d4 fix: Minor changes 2019-02-28 18:14:25 +05:30
scmmishra
f0a56b977a feat: Minor fixes to profile page 2019-02-28 18:11:46 +05:30
scmmishra
ab8fc8c2bf feat: Quizzes fixed 2019-02-28 16:42:37 +05:30
scmmishra
b793cc8e1e fix: Minor changes 2019-02-28 16:33:38 +05:30
Rohit Waghchaure
c21cda2790 Removed validation for group by voucher in general ledger 2019-02-28 16:20:45 +05:30
scmmishra
5e61b17cf8 fix: Routing after finishing a course topic 2019-02-28 15:43:33 +05:30
scmmishra
de5f71ae9e fix: Showing Topic Progress 2019-02-28 15:40:49 +05:30
scmmishra
b17d289bda fix: Course card progress 2019-02-28 15:21:43 +05:30
Rohit Waghchaure
ab4ff984c4 fix: scan barcode not adding the barcode value in the items table 2019-02-28 13:31:02 +05:30
scmmishra
56ad5da090 fix: Minor Changes 2019-02-27 15:32:36 +05:30
scmmishra
e6735e418f fix: Content navigation 2019-02-27 12:46:23 +05:30
scmmishra
8747900aa1 Fix: Content title fields 2019-02-27 12:34:53 +05:30
scmmishra
47ccad9661 fix: Reloading bug on Content page 2019-02-27 12:24:17 +05:30
scmmishra
23880ae567 fix: Content fetching for articles and videos 2019-02-27 12:09:57 +05:30
scmmishra
628659e02a fix: Routing for course 2019-02-27 12:09:28 +05:30
scmmishra
90b503621b fix: Content Routing 2019-02-26 17:20:38 +05:30
scmmishra
7e1678e287 fix: TopicMeta fixes 2019-02-26 17:11:01 +05:30
scmmishra
03c4c635e0 fix: list title on CoursePage 2019-02-26 16:54:32 +05:30
scmmishra
c011b08699 fix: Fixed UI and API for course page 2019-02-26 16:49:38 +05:30
scmmishra
fed9adbc77 fix: Fixed API and UI for topic card 2019-02-26 16:49:15 +05:30
scmmishra
5ae51dc849 fix: Minor UI fixes 2019-02-26 16:48:49 +05:30
scmmishra
b5ba518bdb style: Minor code formatting 2019-02-26 16:48:12 +05:30
scmmishra
a8ef773978 fix: Course Card shows topic list 2019-02-26 16:47:54 +05:30
scmmishra
a2ca8dd92f fix: Route for course page 2019-02-26 16:47:10 +05:30
Saurabh
3dd7ddd838 Merge branch 'master' into develop 2019-02-21 18:25:29 +05:30
deepeshgarg007
0d64d622e5 fix: filter only unique values for tree options 2019-02-20 17:55:14 +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
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
scmmishra
765529241e [Major][Breaking] More changes 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
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
scmmishra
308f235859 Added Profile page 2019-02-19 13:06:33 +05:30
scmmishra
201fec3101 Minor Improvements 2019-02-19 13:06:33 +05:30
scmmishra
97c994f394 create course enrollment if not already enrolled for a program 2019-02-19 13:06:33 +05:30
scmmishra
cbb7c7ff23 ui fixes 2019-02-19 13:06:33 +05:30
scmmishra
788ffbd5b6 Minor improvements 2019-02-19 13:06:33 +05:30
scmmishra
9229f4fc92 UI fixes 2019-02-19 13:06:33 +05:30
scmmishra
fdbabde80a UI fixes for course card 2019-02-19 13:06:32 +05:30
scmmishra
be7fadc521 Renamed CoursePage to ContentPage 2019-02-19 13:06:32 +05:30
scmmishra
d93cec374d Minor UI changes 2019-02-19 13:06:32 +05:30
scmmishra
a592f70d4a Refactored Course Progression Logic 2019-02-19 13:06:32 +05:30
scmmishra
8951c165f0 Fixed major bugs 2019-02-19 13:06:32 +05:30
scmmishra
53c2d5db63 Refactored lms store 2019-02-19 13:06:32 +05:30
scmmishra
babb68d36c Refactored server side code 2019-02-19 13:06:32 +05:30
scmmishra
80ecc56cbe Using lms.call across the Vue app 2019-02-19 13:06:32 +05:30
scmmishra
0a4902f8b5 UI Changes 2019-02-19 13:06:32 +05:30
scmmishra
c5a1226e93 Refactored State management store 2019-02-19 13:06:32 +05:30
scmmishra
85c2feec0d Added ListPage and other UI improvements 2019-02-19 13:06:32 +05:30
scmmishra
efb01c3f75 Renamed components 2019-02-19 13:06:32 +05:30
scmmishra
2596ea0816 Renamed Vue Files 2019-02-19 13:06:32 +05:30
scmmishra
0225642459 Renamed Pages 2019-02-19 13:06:32 +05:30
scmmishra
8ff1028665 Renamed AcademyRoot to lmsRoot 2019-02-19 13:06:32 +05:30
scmmishra
1fbe2d4b2b Renamed academy to lms (Client Side) 2019-02-19 13:06:32 +05:30
scmmishra
44921a3ee9 Renamed default element for Vue to mount on 2019-02-19 13:06:32 +05:30
scmmishra
91bbe776c1 Modified academy.call to point to erpnext.www.lms 2019-02-19 13:06:32 +05:30
scmmishra
d7c993f028 Minor UI changes 2019-02-19 13:06:32 +05:30
scmmishra
f9b2fb6717 Fixed course and content page 2019-02-19 13:06:32 +05:30
scmmishra
708756ed40 Added academy namespace 2019-02-19 13:06:32 +05:30
scmmishra
cc166c01eb Improved Client implementation 2019-02-19 13:06:31 +05:30
scmmishra
8fa9adec37 More Bug fixes UI and Permissions 2019-02-19 13:06:31 +05:30
scmmishra
b409f7a388 Minor UI Changes and Fixes 2019-02-19 13:06:31 +05:30
scmmishra
86897b3cc8 UI: Kinda fixed "Completed" button render issue 2019-02-19 13:06:31 +05:30
scmmishra
5611bf4e29 Minor change 2019-02-19 13:06:31 +05:30
scmmishra
25e42baeaf Course completion logic complete 2019-02-19 13:06:31 +05:30
scmmishra
a920bca044 Minor UI fixes 2019-02-19 13:06:31 +05:30
scmmishra
0187b18c06 Added methods to saving Quiz attempts 2019-02-19 13:06:31 +05:30
scmmishra
a3afe2a998 Sending session data explicitly 2019-02-19 13:06:31 +05:30
scmmishra
cfce153ed4 Minor UI changes 2019-02-19 13:06:31 +05:30
scmmishra
1f4835b3b4 Added Video UI 2019-02-19 13:06:31 +05:30
scmmishra
6de9cbb52d Solved minor issue (Last activity not being saved) 2019-02-19 13:06:31 +05:30
scmmishra
1a04f774d7 LMS: Saving Course Activity 2019-02-19 13:06:31 +05:30
scmmishra
ed5892c7a5 UI: Components rendered based on student progress 2019-02-19 13:06:31 +05:30
scmmishra
a054655442 Updated state functions for session management 2019-02-19 13:06:31 +05:30
scmmishra
8b8db54ef4 Added enroll function 2019-02-19 13:06:30 +05:30
scmmishra
15012c08a4 UI Fixes 2019-02-19 13:06:30 +05:30
scmmishra
72fd3bc0ea Removed unnecessary watcher 2019-02-19 13:06:30 +05:30
scmmishra
3c412f56c9 UI: Changes to AcademyTopSection 2019-02-19 13:06:30 +05:30
scmmishra
bcafe84bb6 Adding session management to client 2019-02-19 13:06:30 +05:30
scmmishra
7a19b63837 Minor changes 2019-02-19 13:06:30 +05:30
scmmishra
e30f2eb297 Re-factored CourseCard UI 2019-02-19 13:06:30 +05:30
scmmishra
6678f5b88e Added custom store for state management 2019-02-19 13:06:30 +05:30
scmmishra
cd0cab78a5 Quiz UI Working 2019-02-19 13:06:30 +05:30
scmmishra
f7029f084c Quiz is now submittable 2019-02-19 13:06:30 +05:30
scmmishra
cfc35f4424 Quiz: Save responses as an object 2019-02-19 13:06:30 +05:30
scmmishra
d2e040b6f1 Added separate ContentTitle component 2019-02-19 13:06:30 +05:30
scmmishra
160d8b0914 Added separate ContentTitle component 2019-02-19 13:06:30 +05:30
scmmishra
d87ca178d8 UI for Quiz 2019-02-19 13:06:30 +05:30
scmmishra
7a59f9501e UI for Content 2019-02-19 13:06:30 +05:30
scmmishra
bcafbea481 UI for Course page 2019-02-19 13:06:30 +05:30
scmmishra
b43ab3317c UI for home page and program page 2019-02-19 13:06:30 +05:30
scmmishra
84297fa349 Starting with VueJS 2019-02-19 13:06:30 +05:30
scmmishra
1778b59efa Started with Vue 2019-02-19 13:06:30 +05:30
Rushabh Mehta
f3b33f3ab2
Merge pull request #16611 from karthikeyan5/hotfix-marketplace-features 
feat(marketplace): seller profile page
 2019-02-18 11:24:01 +05:30
Frappe Bot
74fd5daeb2 Merge branch 'master' into develop 2019-02-15 10:22:33 +00:00
Faris Ansari
5631ffca68 fix: Barcode scanning UX 2019-02-12 17:12:48 +05:30
Sagar Vora
551f52fd25 Merge branch 'master' into develop 2019-02-12 16:41:24 +05:30
karthikeyan5
4324dc6ea8 fix(marketplace): fixing hubmarket server specific error 2019-02-12 15:12:23 +05:30
karthikeyan5
4df6003bd9 feat(marketplace): seller profile page 2019-02-12 15:12:23 +05:30
karthikeyan5
2894f7935a feat(marketplace): featured Items for sellers 2019-02-12 15:12:23 +05:30
karthikeyan5
88baf53cc1 feat(marketplace): navigation link to seller profile from item page 2019-02-12 15:12:23 +05:30
Prateeksha Singh
3423407314 feat(module_links): rearrange links 2019-02-07 09:58:22 +05:30
Faris Ansari
8ae5dbcac8 fix: Set barcode in Item row after scanning barcode (#16591) 2019-02-07 07:09:49 +05:30
Sagar Vora
da1dc7fa52 Merge branch 'master' into develop 2019-02-05 18:40:39 +05:30
karthikeyan5
4cb0a250a0 fix(marketplace): bug in filtering menu_items 
> UX improvment for incomplete feature
 2019-02-05 18:07:48 +05:30
Saif Ur Rehman
1a441b267d Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 
# Conflicts:
#	erpnext/patches.txt
 2019-02-01 19:17:04 +05:00
Sagar Vora
f97c5dad82 Merge branch 'staging' into develop 2019-01-29 18:39:14 +05:30
Deepesh Garg
a8cc4b105d
Merge branch 'staging-fixes' into pos_issue 2019-01-29 11:29:41 +05:30
Nabin Hait
7c0fbfab0a
Merge pull request #16482 from pipech/staging-fixes 
fix(Stock Entry): "Select Serial Numbers" dialog won't fill mandatory field
 2019-01-29 11:23:05 +05:30
Nabin Hait
3ccc16e4e0
Merge pull request #16449 from scmmishra/remove-foundation 
feat: Deprecated In App Help
 2019-01-29 11:20:23 +05:30
deepeshgarg007
49cca7ac76 fix: Customer based price_list in online POS 2019-01-25 16:41:01 +05:30
Shivam Mishra
67c338fd51
[fix] Fixed links 
Previous commit missed the links starting with `http://`
 2019-01-25 15:17:44 +05:30
scmmishra
f44dfb1582 [fix] Formatting issues 2019-01-25 14:56:30 +05:30
scmmishra
d71de2a23e [fix] Code formatting, removed trailing spaces 2019-01-25 14:27:23 +05:30
scmmishra
9731a02657 [feat] Added docsUrl variable to configure help_links 2019-01-25 13:14:11 +05:30
scmmishra
3f9b231f31 [fix] Links now redirect to erpnext.com 2019-01-25 12:56:27 +05:30
pipeCh
c16c7fffb4 fixed for "Select Serial Numbers" dialog won't fill mandatory field 2019-01-24 15:00:07 +07:00
Saif Ur Rehman
74a3370095 Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 
# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/patches.txt
#	erpnext/selling/doctype/quotation/quotation.json
#	erpnext/selling/doctype/sales_order/sales_order.json
 2019-01-22 16:20:40 +05:00
Sagar Vora
4d1a9b10ed Merge branch 'staging' into develop 2019-01-22 15:56:39 +05:30
Nabin Hait
48fa697d54
Merge pull request #16439 from nabinhait/disable-rounded-total 
fix: Disable rounded total field's value honours docfield's default value
 2019-01-22 09:58:06 +05:30
scmmishra
f2d0be7299 [feat] Modified help config 2019-01-21 19:35:46 +05:30
scmmishra
dd461636e3 [feat] Updated all help_links 2019-01-21 19:35:02 +05:30
Nabin Hait
a39f324682 fix: Disable rounded total field's value honours docfield's default value 2019-01-21 18:50:50 +05:30
Aditya Hase
442c85c006 fix(marketplace): Capitalize marketplace factory class to support router changes (#16428) 2019-01-18 21:28:37 +05:30
Saif Ur Rehman
398f593e5f Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 
# Conflicts:
#	erpnext/patches.txt
 2019-01-18 17:33:19 +05:00
Nabin Hait
bef2c22d23 Fix: merge conflict 2019-01-18 10:15:47 +05:30
Nabin Hait
158e7dcd8b fix(bom-uom_issue)Fetch rate in BOM from Price List based on UOM 2019-01-16 16:00:25 +05:30
Saif Ur Rehman
8d61794540 Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12 
# Conflicts:
#	erpnext/patches.txt
#	erpnext/stock/doctype/item/item.json
 2019-01-10 04:23:40 +05:00
Saif Ur Rehman
2689dea72a fix: Give higher precedence to set_warehouse in get_item_details while setting item level warehouse 2019-01-09 13:43:06 +05:00
Saurabh
afec3ca89a Merge branch 'staging' into develop 2019-01-08 17:09:36 +05:30
Saif Ur Rehman
380b4b0926 Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template 
# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#	erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#	erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#	erpnext/buying/doctype/supplier/supplier.json
#	erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#	erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
#	erpnext/selling/doctype/quotation/quotation.json
#	erpnext/selling/doctype/quotation_item/quotation_item.json
#	erpnext/selling/doctype/sales_order/sales_order.json
#	erpnext/selling/doctype/sales_order_item/sales_order_item.json
#	erpnext/setup/doctype/item_group/item_group.json
#	erpnext/stock/doctype/delivery_note/delivery_note.json
#	erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
#	erpnext/stock/doctype/item/item.json
#	erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
 2019-01-08 13:41:46 +05:00
Saif Ur Rehman
13a6c0aeff Fix tests 2019-01-06 18:14:18 +05:00
Saif Ur Rehman
7ea6554f1f Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template 
# Conflicts:
#	erpnext/selling/doctype/quotation_item/quotation_item.json
#	erpnext/stock/doctype/item/item.json
 2019-01-06 04:43:13 +05:00
deepeshgarg007
8300f5ede7 fix: Codacy issues and added test case 2019-01-01 20:28:49 +05:30
deepeshgarg007
78ad6c4cb7 Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into loyalty-program-fix 2019-01-01 19:46:08 +05:30
Saif Ur Rehman
eeead1d777 fix: Only load transaction's company's tax accounts in item tax map 2018-12-29 02:25:00 +05:00
Saif Ur Rehman
fd531a6b5e feat: Tax Category based on Address 2018-12-29 01:49:11 +05:00
Saif Ur Rehman
e414a92d55 fix: Run get_item_tax_info and set_taxes serially 2018-12-28 04:59:42 +05:00
Saif Ur Rehman
aca374e478 feat: add_taxes_from_item_tax_template 2018-12-28 04:53:25 +05:00
Suraj Shetty
3de12db2b1 Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes 2018-12-27 09:05:25 +05:30
Saif Ur Rehman
677866824a More work on Tax Category and Item Tax Template 2018-12-27 02:11:07 +05:00
Frappe Bot
9e09b3adbe Merge branch 'staging' into develop 2018-12-26 12:16:20 +00:00
Frappe Bot
e8c2fdfb8c Merge branch 'master' into staging-fixes 2018-12-26 11:44:09 +00:00
deepeshgarg007
64238ee91f (Codacy Fix) Fixed indenttion 2018-12-25 16:28:39 +05:30
deepeshgarg007
12f5cefc12 Loyalty program issue fix in customer dashboard 2018-12-25 16:06:19 +05:30
Suraj Shetty
146be9f6a6 Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes 2018-12-24 16:08:43 +05:30
Suraj Shetty
b2965001d1 Replace 'Make' with 'Create' 2018-12-23 13:25:58 +05:30
Frappe Bot
1b7c583c48 Merge branch 'staging' into develop 2018-12-21 05:46:23 +00:00
Suraj Shetty
5555bf82f8 Capitalize marketplace factory class to support recent router changes (#16238) 2018-12-19 10:15:59 +05:30