nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-29 18:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing

Browse Source
This commit is contained in:
Suraj Shetty
2021-05-27 14:31:37 +05:30
parent d3b9edd2c4 59769c7a86
commit df680a2c62
3 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/education/doctype/student/student.py
View File

@@ -74,7 +74,6 @@ class Student(Document):
student_user.flags.ignore_permissions = True student_user.flags.ignore_permissions = True
student_user.add_roles("Student") student_user.add_roles("Student")
student_user.save() student_user.save()
update_password_link = student_user.reset_password()
def update_applicant_status(self): def update_applicant_status(self):
"""Updates Student Applicant status to Admitted""" """Updates Student Applicant status to Admitted"""

46
erpnext/public/scss/erpnext.scss
View File

@@ -1,5 +1,3 @@
@import "frappe/public/scss/desk/variables";
.erpnext-footer { .erpnext-footer {
margin: 11px auto; margin: 11px auto;
text-align: center; text-align: center;
@@ -141,7 +139,7 @@ body[data-route="pos"] {
} }
.pos-payment-row { .pos-payment-row {
border-bottom:1px solid $border-color; border-bottom:1px solid var(--border-color);
margin: 2px 0px 5px 0px; margin: 2px 0px 5px 0px;
height: 60px; height: 60px;
margin-top: 0px; margin-top: 0px;
@@ -154,7 +152,7 @@ body[data-route="pos"] {
} }
.pos-keyboard-key, .delete-btn { .pos-keyboard-key, .delete-btn {
border: 1px solid $border-color; border: 1px solid var(--border-color);
height:85px; height:85px;
width:85px; width:85px;
margin:10px 10px; margin:10px 10px;
@@ -165,7 +163,7 @@ body[data-route="pos"] {
} }
.numeric-keypad { .numeric-keypad {
border: 1px solid $border-color; border: 1px solid var(--border-color);
height:69px; height:69px;
width:69px; width:69px;
font-size:20px; font-size:20px;
@@ -192,13 +190,13 @@ body[data-route="pos"] {
background-color: #fff; background-color: #fff;
margin-left:-4px; margin-left:-4px;
@media (max-width: map-get($grid-breakpoints, "xl")) { @media (max-width: var(--xl-width)) {
height: 45px; height: 45px;
width: 45px; width: 45px;
font-size: 14px; font-size: 14px;
} }
@media (max-width: map-get($grid-breakpoints, "lg")) { @media (max-width: var(--lg-width)) {
height: 40px; height: 40px;
width: 40px; width: 40px;
} }
@@ -209,16 +207,16 @@ body[data-route="pos"] {
& > .row > button { & > .row > button {
border: none; border: none;
border-right: 1px solid $border-color; border-right: 1px solid var(--border-color);
border-bottom: 1px solid $border-color; border-bottom: 1px solid var(--border-color);
&:first-child { &:first-child {
border-left: 1px solid $border-color; border-left: 1px solid var(--border-color);
} }
} }
& > .row:first-child > button { & > .row:first-child > button {
border-top: 1px solid $border-color; border-top: 1px solid var(--border-color);
} }
} }
@@ -236,13 +234,13 @@ body[data-route="pos"] {
} }
.list-row-head.pos-invoice-list { .list-row-head.pos-invoice-list {
border-top: 1px solid $border-color; border-top: 1px solid var(--border-color);
} }
.modal-dialog { .modal-dialog {
width: 750px; width: 750px;
@media (max-width: map-get($grid-breakpoints, 'md')) { @media (max-width: var(--md-width)) {
width: auto; width: auto;
.modal-content { .modal-content {
@@ -251,7 +249,7 @@ body[data-route="pos"] {
} }
} }
@media (max-width: map-get($grid-breakpoints, 'md')) { @media (max-width: var(--md-width)) {
.amount-row h3 { .amount-row h3 {
font-size: 15px; font-size: 15px;
} }
@@ -291,7 +289,7 @@ body[data-route="pos"] {
padding: 9px 15px; padding: 9px 15px;
font-size: 12px; font-size: 12px;
margin: 0px; margin: 0px;
border-bottom: 1px solid $border-color; border-bottom: 1px solid var(--border-color);
.cell { .cell {
display: table-cell; display: table-cell;
@@ -313,7 +311,7 @@ body[data-route="pos"] {
.pos-bill-header { .pos-bill-header {
background-color: #f5f7fa; background-color: #f5f7fa;
border: 1px solid $border-color; border: 1px solid var(--border-color);
padding: 13px 15px; padding: 13px 15px;
} }
@@ -322,8 +320,8 @@ body[data-route="pos"] {
} }
.totals-area { .totals-area {
border-right: 1px solid $border-color; border-right: 1px solid var(--border-color);
border-left: 1px solid $border-color; border-left: 1px solid var(--border-color);
margin-bottom: 15px; margin-bottom: 15px;
} }
@@ -334,10 +332,10 @@ body[data-route="pos"] {
.item-cart-items { .item-cart-items {
height: calc(100vh - 526px); height: calc(100vh - 526px);
overflow: auto; overflow: auto;
border: 1px solid $border-color; border: 1px solid var(--border-color);
border-top: none; border-top: none;
@media (max-width: map-get($grid-breakpoints, 'md')) { @media (max-width: var(--md-width)) {
height: 30vh; height: 30vh;
} }
} }
@@ -359,12 +357,12 @@ body[data-route="pos"] {
} }
.item-list { .item-list {
border: 1px solid $border-color; border: 1px solid var(--border-color);
border-top: none; border-top: none;
max-height: calc(100vh - 190px); max-height: calc(100vh - 190px);
overflow: auto; overflow: auto;
@media (max-width: map-get($grid-breakpoints, 'md')) { @media (max-width: var(--md-width)) {
max-height: initial; max-height: initial;
} }
@@ -402,7 +400,7 @@ body[data-route="pos"] {
&> .pos-list-row { &> .pos-list-row {
border: none; border: none;
@media (max-width: map-get($grid-breakpoints, 'xl')) { @media (max-width: var(--xl-width)) {
padding: 5px 15px; padding: 5px 15px;
} }
} }
@@ -428,7 +426,7 @@ body[data-route="pos"] {
cursor: pointer; cursor: pointer;
} }
@media (max-width: map-get($grid-breakpoints, 'md')) { @media (max-width: var(--md-width)) {
.page-actions { .page-actions {
max-width: 110px; max-width: 110px;
} }

14
erpnext/public/scss/erpnext_email.bundle.scss
View File

@@ -1,14 +1,12 @@
@import "frappe/public/scss/desk/variables";
.panel-header { .panel-header {
background-color: var(--bg-color); background-color: var(--bg-color);
border: 1px solid $border-color; border: 1px solid var(--border-color);
border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0;
} }
.panel-body { .panel-body {
background-color: #fff; background-color: white;
border: 1px solid $border-color; border: 1px solid var(--border-color);
border-top: none; border-top: none;
border-radius: 0 0 3px 3px; border-radius: 0 0 3px 3px;
overflow-wrap: break-word; overflow-wrap: break-word;
@@ -26,7 +24,7 @@
line-height: 24px; line-height: 24px;
text-align: center; text-align: center;
color: $border-color; color: var(--border-color);
border: 1px solid $border-color; border: 1px solid var(--border-color);
background-color: #fff; background-color: white;
} }