Merge branch 'develop' into fix-ipme
diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.py b/erpnext/selling/page/point_of_sale/point_of_sale.py
index 6b9939e..a690050 100644
--- a/erpnext/selling/page/point_of_sale/point_of_sale.py
+++ b/erpnext/selling/page/point_of_sale/point_of_sale.py
@@ -14,11 +14,9 @@
def get_items(start, page_length, price_list, item_group, pos_profile, search_value=""):
data = dict()
result = []
- warehouse, hide_unavailable_items = "", False
allow_negative_stock = frappe.db.get_single_value('Stock Settings', 'allow_negative_stock')
- if not allow_negative_stock:
- warehouse, hide_unavailable_items = frappe.db.get_value('POS Profile', pos_profile, ['warehouse', 'hide_unavailable_items'])
+ warehouse, hide_unavailable_items = frappe.db.get_value('POS Profile', pos_profile, ['warehouse', 'hide_unavailable_items'])
if not frappe.db.exists('Item Group', item_group):
item_group = get_root_of('Item Group')
@@ -97,7 +95,7 @@
for item in items_data:
item_code = item.item_code
item_price = item_prices.get(item_code) or {}
- if not allow_negative_stock:
+ if allow_negative_stock:
item_stock_qty = frappe.db.sql("""select ifnull(sum(actual_qty), 0) from `tabBin` where item_code = %s""", item_code)[0][0]
else:
item_stock_qty = get_stock_availability(item_code, warehouse)
@@ -231,13 +229,31 @@
frappe.db.set_value('Customer', customer, 'loyalty_program', value)
contact = frappe.get_cached_value('Customer', customer, 'customer_primary_contact')
+ if not contact:
+ contact = frappe.db.sql("""
+ SELECT parent FROM `tabDynamic Link`
+ WHERE
+ parenttype = 'Contact' AND
+ parentfield = 'links' AND
+ link_doctype = 'Customer' AND
+ link_name = %s
+ """, (customer), as_dict=1)
+ contact = contact[0].get('parent') if contact else None
- if contact:
- contact_doc = frappe.get_doc('Contact', contact)
- if fieldname == 'email_id':
- contact_doc.set('email_ids', [{ 'email_id': value, 'is_primary': 1}])
- frappe.db.set_value('Customer', customer, 'email_id', value)
- elif fieldname == 'mobile_no':
- contact_doc.set('phone_nos', [{ 'phone': value, 'is_primary_mobile_no': 1}])
- frappe.db.set_value('Customer', customer, 'mobile_no', value)
- contact_doc.save()
\ No newline at end of file
+ if not contact:
+ new_contact = frappe.new_doc('Contact')
+ new_contact.is_primary_contact = 1
+ new_contact.first_name = customer
+ new_contact.set('links', [{'link_doctype': 'Customer', 'link_name': customer}])
+ new_contact.save()
+ contact = new_contact.name
+ frappe.db.set_value('Customer', customer, 'customer_primary_contact', contact)
+
+ contact_doc = frappe.get_doc('Contact', contact)
+ if fieldname == 'email_id':
+ contact_doc.set('email_ids', [{ 'email_id': value, 'is_primary': 1}])
+ frappe.db.set_value('Customer', customer, 'email_id', value)
+ elif fieldname == 'mobile_no':
+ contact_doc.set('phone_nos', [{ 'phone': value, 'is_primary_mobile_no': 1}])
+ frappe.db.set_value('Customer', customer, 'mobile_no', value)
+ contact_doc.save()
\ No newline at end of file
diff --git a/erpnext/selling/page/point_of_sale/pos_controller.js b/erpnext/selling/page/point_of_sale/pos_controller.js
index 3d00546..f7d1fa4 100644
--- a/erpnext/selling/page/point_of_sale/pos_controller.js
+++ b/erpnext/selling/page/point_of_sale/pos_controller.js
@@ -637,7 +637,7 @@
if (!(available_qty > 0)) {
frappe.model.clear_doc(item_row.doctype, item_row.name);
frappe.throw({
- title: _("Not Available"),
+ title: __("Not Available"),
message: __('Item Code: {0} is not available under warehouse {1}.', [bold_item_code, bold_warehouse])
})
} else if (available_qty < qty_needed) {
diff --git a/erpnext/selling/page/point_of_sale/pos_item_selector.js b/erpnext/selling/page/point_of_sale/pos_item_selector.js
index 4139e29..49d4281 100644
--- a/erpnext/selling/page/point_of_sale/pos_item_selector.js
+++ b/erpnext/selling/page/point_of_sale/pos_item_selector.js
@@ -81,7 +81,7 @@
function get_item_image_html() {
if (item_image) {
return `<div class="flex items-center justify-center h-32 border-b-grey text-6xl text-grey-100">
- <img class="h-full" src="${item_image}" alt="${item_image}" style="object-fit: cover;">
+ <img class="h-full" src="${item_image}" alt="${frappe.get_abbr(item.item_name)}" style="object-fit: cover;">
</div>`
} else {
return `<div class="flex items-center justify-center h-32 bg-light-grey text-6xl text-grey-100">
diff --git a/erpnext/selling/page/point_of_sale/pos_payment.js b/erpnext/selling/page/point_of_sale/pos_payment.js
index e89cf01..e4d8965 100644
--- a/erpnext/selling/page/point_of_sale/pos_payment.js
+++ b/erpnext/selling/page/point_of_sale/pos_payment.js
@@ -409,7 +409,7 @@
${
shortcuts.map(s => {
return `<div class="shortcut rounded bg-light-grey text-dark-grey pt-2 pb-2 no-select pointer" data-value="${s}">
- ${format_currency(s, currency)}
+ ${format_currency(s, currency, 0)}
</div>`
}).join('')
}