CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-13 01:34:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into version-15-beta

Browse Source
This commit is contained in:
Ankush Menat
2023-08-13 18:38:50 +05:30
parent 300a120e91 39ec11200e
commit b7c2491ba0
6 changed files with 83 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/payment_entry/payment_entry.py
View File

@@ -71,7 +71,7 @@ class PaymentEntry(AccountsController):
self.setup_party_account_field()
self.set_missing_values()
self.set_liability_account()
self.set_missing_ref_details()
self.set_missing_ref_details(force=True)
self.validate_payment_type()
self.validate_party_details()
self.set_exchange_rate()

8
erpnext/accounts/report/financial_statements.py
View File

@@ -637,7 +637,13 @@ def get_columns(periodicity, period_list, accumulated_values=1, company=None):
if periodicity != "Yearly":
if not accumulated_values:
columns.append(
{"fieldname": "total", "label": _("Total"), "fieldtype": "Currency", "width": 150}
{
"fieldname": "total",
"label": _("Total"),
"fieldtype": "Currency",
"width": 150,
"options": "currency",
}
)
return columns

5
erpnext/manufacturing/doctype/work_order/work_order.json
View File

@@ -404,6 +404,8 @@
"read_only": 1
},
{
"fetch_from": "production_item.stock_uom",
"fetch_if_empty": 1,
"fieldname": "stock_uom",
"fieldtype": "Link",
"label": "Stock UOM",
@@ -590,7 +592,7 @@
"image_field": "image",
"is_submittable": 1,
"links": [],
"modified": "2023-06-09 13:20:09.154362",
"modified": "2023-08-11 18:35:49.852069",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Work Order",
@@ -610,7 +612,6 @@
"read": 1,
"report": 1,
"role": "Manufacturing User",
"set_user_permissions": 1,
"share": 1,
"submit": 1,
"write": 1

65
erpnext/public/scss/point-of-sale.scss
View File

@@ -53,7 +53,7 @@
.seperator {
margin-left: var(--margin-sm);
margin-right: var(--margin-sm);
margin-right: var(--margin-md);
border-bottom: 1px solid var(--gray-300);
}
@@ -381,6 +381,7 @@
align-items: center;
padding: var(--padding-sm);
border-radius: var(--border-radius-md);
margin-right: var(--margin-sm);
&:hover {
background-color: var(--control-bg);
@@ -858,13 +859,10 @@
> .fields-section {
flex: 1;
position: absolute;
display: flex;
flex-direction: column;
width: 50%;
height: 100%;
top: 0;
left: 0;
padding-bottom: var(--margin-md);
.invoice-fields {
@@ -1152,3 +1150,62 @@
}
}
}
@media screen and (max-width: 620px) {
.point-of-sale-app {
grid-template-columns: repeat(1, minmax(0, 1fr));
> .items-selector {
grid-column: span 6 / span 1 !important;
> .items-container {
grid-template-columns: repeat(2, minmax(0, 1fr)) !important;
}
}
> .item-details-container, .customer-cart-container {
grid-column: span 6 / span 1;
}
> .payment-container {
overflow: scroll;
> .fields-numpad-container {
flex-direction: column-reverse;
> .number-pad {
display: none;
}
> .fields-section {
width: 100%;
}
}
}
> .past-order-summary{
> .invoice-summary-wrapper {
width: 100%;
}
}
.numpad-totals {
> span {
padding: 0 5px;
font-size: var(--text-sm);
}
}
.col > * {
font-size: var(--text-sm) !important;
}
.control-input-wrapper {
padding-left: 0.15rem;
}
.pay-amount {
margin-left: 0.2rem;
}
.past-order-list {
grid-column: span 6 / span 1;
}
}
}

2
erpnext/selling/page/point_of_sale/pos_item_cart.js
View File

@@ -286,7 +286,7 @@ erpnext.PointOfSale.ItemCart = class {
this.item_is_selected = false;
this.$cart_container.find('.cart-item-wrapper').css("background-color", "");
} else {
$cart_item.css("background-color", "var(--gray-50)");
$cart_item.css("background-color", "var(--control-bg)");
this.item_is_selected = true;
this.$cart_container.find('.cart-item-wrapper').not(item).css("background-color", "");
}

10
erpnext/setup/demo_data/item.json
View File

@@ -4,6 +4,7 @@
"item_group": "Demo Item Group",
"item_code": "SKU001",
"item_name": "T-shirt",
"gst_hsn_code": "999512",
"image": "https://images.pexels.com/photos/1484808/pexels-photo-1484808.jpeg"
},
{
@@ -11,6 +12,7 @@
"item_group": "Demo Item Group",
"item_code": "SKU002",
"item_name": "Laptop",
"gst_hsn_code": "999512",
"image": "https://images.pexels.com/photos/3999538/pexels-photo-3999538.jpeg"
},
{
@@ -18,6 +20,7 @@
"item_group": "Demo Item Group",
"item_code": "SKU003",
"item_name": "Book",
"gst_hsn_code": "999512",
"image": "https://images.pexels.com/photos/2422178/pexels-photo-2422178.jpeg"
},
{
@@ -25,6 +28,7 @@
"item_group": "Demo Item Group",
"item_code": "SKU004",
"item_name": "Smartphone",
"gst_hsn_code": "999512",
"image": "https://images.pexels.com/photos/1647976/pexels-photo-1647976.jpeg"
},
{
@@ -32,6 +36,7 @@
"item_group": "Demo Item Group",
"item_code": "SKU005",
"item_name": "Sneakers",
"gst_hsn_code": "999512",
"image": "https://images.pexels.com/photos/1598505/pexels-photo-1598505.jpeg"
},
{
@@ -39,6 +44,7 @@
"item_group": "Demo Item Group",
"item_code": "SKU006",
"item_name": "Coffee Mug",
"gst_hsn_code": "999512",
"image": "https://images.pexels.com/photos/585753/pexels-photo-585753.jpeg"
},
{
@@ -46,6 +52,7 @@
"item_group": "Demo Item Group",
"item_code": "SKU007",
"item_name": "Television",
"gst_hsn_code": "999512",
"image": "https://images.pexels.com/photos/8059376/pexels-photo-8059376.jpeg"
},
{
@@ -53,6 +60,7 @@
"item_group": "Demo Item Group",
"item_code": "SKU008",
"item_name": "Backpack",
"gst_hsn_code": "999512",
"image": "https://images.pexels.com/photos/3731256/pexels-photo-3731256.jpeg"
},
{
@@ -60,6 +68,7 @@
"item_group": "Demo Item Group",
"item_code": "SKU009",
"item_name": "Headphones",
"gst_hsn_code": "999512",
"image": "https://images.pexels.com/photos/3587478/pexels-photo-3587478.jpeg"
},
{
@@ -67,6 +76,7 @@
"item_group": "Demo Item Group",
"item_code": "SKU010",
"item_name": "Camera",
"gst_hsn_code": "999512",
"image": "https://images.pexels.com/photos/51383/photo-camera-subject-photographer-51383.jpeg"
}
]