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 remote-tracking branch 'upstream/version-13-hotfix' into dev-quality-inspection-accounts

Browse Source
This commit is contained in:
Rohan Bansal
2021-06-02 14:22:32 +05:30
parent 9857d63523 865663857c
commit 11aff80dea
75 changed files with 2044 additions and 2945 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
erpnext/public/js/help_links.js
View File

@@ -644,14 +644,14 @@ frappe.help.help_links["List/Payment Request"] = [
frappe.help.help_links["List/Asset"] = [
{
label: "Managing Fixed Assets",
url: docsUrl + "user/manual/en/accounts/managing-fixed-assets",
url: docsUrl + "user/manual/en/accounts/opening-balance/fixed_assets",
},
];
frappe.help.help_links["List/Asset Category"] = [
{
label: "Asset Category",
url: docsUrl + "user/manual/en/accounts/managing-fixed-assets",
url: docsUrl + "user/manual/en/asset/asset-category",
},
];
@@ -663,7 +663,7 @@ frappe.help.help_links["List/Item"] = [
{ label: "Item", url: docsUrl + "user/manual/en/stock/item" },
{
label: "Item Price",
url: docsUrl + "user/manual/en/stock/item/item-price",
url: docsUrl + "user/manual/en/stock/item-price",
},
{
label: "Barcode",
@@ -672,25 +672,25 @@ frappe.help.help_links["List/Item"] = [
},
{
label: "Item Wise Taxation",
url: docsUrl + "user/manual/en/accounts/item-wise-taxation",
url: docsUrl + "user/manual/en/accounts/item-tax-template",
},
{
label: "Managing Fixed Assets",
url: docsUrl + "user/manual/en/accounts/managing-fixed-assets",
url: docsUrl + "user/manual/en/accounts/opening-balance/fixed_assets",
},
{
label: "Item Codification",
url: docsUrl + "user/manual/en/stock/item/item-codification",
url: docsUrl + "user/manual/en/stock/articles/item-codification",
},
{
label: "Item Variants",
url: docsUrl + "user/manual/en/stock/item/item-variants",
url: docsUrl + "user/manual/en/stock/item-variants",
},
{
label: "Item Valuation",
url:
docsUrl +
"user/manual/en/stock/item/item-valuation-fifo-and-moving-average",
"user/manual/en/stock/articles/item-valuation-fifo-and-moving-average",
},
];
@@ -698,7 +698,7 @@ frappe.help.help_links["Form/Item"] = [
{ label: "Item", url: docsUrl + "user/manual/en/stock/item" },
{
label: "Item Price",
url: docsUrl + "user/manual/en/stock/item/item-price",
url: docsUrl + "user/manual/en/stock/item-price",
},
{
label: "Barcode",
@@ -707,19 +707,19 @@ frappe.help.help_links["Form/Item"] = [
},
{
label: "Item Wise Taxation",
url: docsUrl + "user/manual/en/accounts/item-wise-taxation",
url: docsUrl + "user/manual/en/accounts/item-tax-template",
},
{
label: "Managing Fixed Assets",
url: docsUrl + "user/manual/en/accounts/managing-fixed-assets",
url: docsUrl + "user/manual/en/accounts/opening-balance/fixed_assets",
},
{
label: "Item Codification",
url: docsUrl + "user/manual/en/stock/item/item-codification",
url: docsUrl + "user/manual/en/stock/articles/item-codification",
},
{
label: "Item Variants",
url: docsUrl + "user/manual/en/stock/item/item-variants",
url: docsUrl + "user/manual/en/stock/item-variants",
},
{
label: "Item Valuation",

26
erpnext/public/scss/shopping_cart.scss
View File

@@ -1,4 +1,3 @@
@import "frappe/public/scss/desk/variables";
@import "frappe/public/scss/common/mixins";
body.product-page {
@@ -74,15 +73,6 @@ body.product-page {
}
}
// .card-body {
// text-align: center;
// }
// .featured-item {
// .card-body {
// text-align: left;
// }
// }
.card-img-container {
height: 210px;
width: 100%;
@@ -217,12 +207,12 @@ body.product-page {
border-color: var(--table-border-color) !important;
padding: 15px;
@include media-breakpoint-between(xs, md) {
@media (max-width: var(--md-width)) {
height: 300px;
width: 300px;
}
@include media-breakpoint-up(lg) {
@media (min-width: var(--lg-width)) {
height: 350px;
width: 350px;
}
@@ -233,11 +223,12 @@ body.product-page {
}
.item-slideshow {
@include media-breakpoint-between(xs, md) {
@media (max-width: var(--md-width)) {
max-height: 320px;
}
@include media-breakpoint-up(lg) {
@media (min-width: var(--lg-width)) {
max-height: 430px;
}
@@ -254,7 +245,7 @@ body.product-page {
cursor: pointer;
&:hover, &.active {
border-color: $primary;
border-color: var(--primary);
}
}
@@ -316,12 +307,9 @@ body.product-page {
}
.item-group-slideshow {
.item-group-description {
// max-width: 900px;
}
.carousel-inner.rounded-carousel {
border-radius: $card-border-radius;
border-radius: var(--card-border-radius);
}
}

9
erpnext/public/scss/website.scss
View File

@@ -1,4 +1,3 @@
@import "frappe/public/scss/website/variables";
.filter-options {
max-height: 300px;
@@ -14,7 +13,7 @@
}
&.active {
border-color: $primary;
border-color: var(--primary);
.check {
display: inline-flex;
@@ -25,7 +24,7 @@
.check {
display: inline-flex;
padding: 0.25rem;
background: $primary;
background: var(--primary);
color: white;
border-radius: 50%;
font-size: 12px;
@@ -38,12 +37,12 @@
}
.result {
border-bottom: 1px solid $border-color;
border-bottom: 1px solid var(--border-color);
}
.transaction-list-item {
padding: 1rem 0;
border-top: 1px solid $border-color;
border-top: 1px solid var(--border-color);
position: relative;
a.transaction-item-link {