Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hotfix'

Browse Source
This commit is contained in:
Nabin Hait 2017-03-30 19:35:51 +05:30
commit a8b2cdf65a
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -2,7 +2,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
__version__ = '8.0.0' __version__ = '8.0.1'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

2
erpnext/accounts/page/pos/pos.js
View File

@ -1089,6 +1089,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
// if form is local then allow this function // if form is local then allow this function
// $(me.wrapper).find(".pos-item-wrapper").on("click", function () { // $(me.wrapper).find(".pos-item-wrapper").on("click", function () {
$(this.wrapper).on("click", ".pos-item-wrapper", function () { $(this.wrapper).on("click", ".pos-item-wrapper", function () {
me.item_code = '';
if($(me.pos_bill).is(":hidden")) return; if($(me.pos_bill).is(":hidden")) return;
me.customer_validate(); me.customer_validate();
@ -1419,6 +1420,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
}, },
make_new_cart: function (){ make_new_cart: function (){
this.item_code = '';
this.page.clear_secondary_action(); this.page.clear_secondary_action();
this.save_previous_entry(); this.save_previous_entry();
this.create_new(); this.create_new();