@@ -76,11 +76,11 @@
{% } %}
{% } %}
{% if(filters.print_in_account_currency) { %}
- | {%= get_currency_symbol(data[i].account_currency)%}
- {%= data[i].balance_in_account_currency %} |
+
+ {%= format_currency(data[i].balance_in_account_currency, data[i].account_currency) %}
+ |
{% } else { %}
- {%= get_currency_symbol()%}
- {%= data[i].balance %} |
+ {%= format_currency(data[i].balance) %} |
{% } %}
{% } %}
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py
index b6b26b1eed..8e4259c542 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/general_ledger.py
@@ -241,13 +241,13 @@ def get_result_as_list(data, filters):
if not d.get('posting_date'):
balance, balance_in_account_currency = 0, 0
- balance, label = get_balance(d, balance, 'debit', 'credit')
- d['balance'] = '{0} {1}'.format(fmt_money(abs(balance)), label)
+ balance = get_balance(d, balance, 'debit', 'credit')
+ d['balance'] = balance
if filters.get("show_in_account_currency"):
- balance_in_account_currency, label = get_balance(d, balance_in_account_currency,
+ balance_in_account_currency = get_balance(d, balance_in_account_currency,
'debit_in_account_currency', 'credit_in_account_currency')
- d['balance_in_account_currency'] = '{0} {1}'.format(fmt_money(abs(balance_in_account_currency)), label)
+ d['balance_in_account_currency'] = balance_in_account_currency
else:
d['debit_in_account_currency'] = d.get('debit', 0)
d['credit_in_account_currency'] = d.get('credit', 0)
@@ -268,9 +268,8 @@ def get_supplier_invoice_details():
def get_balance(row, balance, debit_field, credit_field):
balance += (row.get(debit_field, 0) - row.get(credit_field, 0))
- label = 'DR' if balance > 0 else 'CR'
- return balance, label
+ return balance
def get_columns(filters):
columns = [
@@ -300,10 +299,10 @@ def get_columns(filters):
"width": 100
},
{
- "label": _("Balance"),
+ "label": _("Balance (Dr - Cr)"),
"fieldname": "balance",
- "fieldtype": "Data",
- "width": 100
+ "fieldtype": "Float",
+ "width": 130
}
]
diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py
index 2ec6b83861..a64e76fdca 100644
--- a/erpnext/controllers/selling_controller.py
+++ b/erpnext/controllers/selling_controller.py
@@ -156,7 +156,7 @@ class SellingController(StockController):
last_purchase_rate, is_stock_item = frappe.db.get_value("Item", it.item_code, ["last_purchase_rate", "is_stock_item"])
last_purchase_rate_in_sales_uom = last_purchase_rate / (it.conversion_factor or 1)
- if flt(it.base_rate) < flt(last_purchase_rate_in_sales_uom):
+ if flt(it.base_rate) < flt(last_purchase_rate_in_sales_uom) and not self.is_return:
throw_message(it.item_name, last_purchase_rate_in_sales_uom, "last purchase rate")
last_valuation_rate = frappe.db.sql("""
@@ -166,7 +166,7 @@ class SellingController(StockController):
""", (it.item_code, it.warehouse))
if last_valuation_rate:
last_valuation_rate_in_sales_uom = last_valuation_rate[0][0] / (it.conversion_factor or 1)
- if is_stock_item and flt(it.base_rate) < flt(last_valuation_rate_in_sales_uom):
+ if is_stock_item and flt(it.base_rate) < flt(last_valuation_rate_in_sales_uom) and not self.is_return:
throw_message(it.name, last_valuation_rate_in_sales_uom, "valuation rate")
diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py
index 4547ac1113..0e35cb89e6 100644
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -491,11 +491,13 @@ class calculate_taxes_and_totals(object):
if self.doc.doctype == "Sales Invoice" \
and self.doc.paid_amount > self.doc.grand_total and not self.doc.is_return \
and any([d.type == "Cash" for d in self.doc.payments]):
+ grand_total = self.doc.rounded_total or self.doc.grand_total
+ base_grand_total = self.doc.base_rounded_total or self.doc.base_grand_total
- self.doc.change_amount = flt(self.doc.paid_amount - self.doc.grand_total +
+ self.doc.change_amount = flt(self.doc.paid_amount - grand_total +
self.doc.write_off_amount, self.doc.precision("change_amount"))
- self.doc.base_change_amount = flt(self.doc.base_paid_amount - self.doc.base_grand_total +
+ self.doc.base_change_amount = flt(self.doc.base_paid_amount - base_grand_total +
self.doc.base_write_off_amount, self.doc.precision("base_change_amount"))
def calculate_write_off_amount(self):
diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry.py b/erpnext/hr/doctype/payroll_entry/payroll_entry.py
index 0b4e3bf0c7..77cece3cfe 100644
--- a/erpnext/hr/doctype/payroll_entry/payroll_entry.py
+++ b/erpnext/hr/doctype/payroll_entry/payroll_entry.py
@@ -321,7 +321,7 @@ class PayrollEntry(Document):
journal_entry.user_remark = _('Payment of salary from {0} to {1}')\
.format(self.start_date, self.end_date)
journal_entry.company = self.company
- journal_entry.posting_date = nowdate()
+ journal_entry.posting_date = self.posting_date
payment_amount = flt(total_salary_amount.rounded_total, precision)
diff --git a/erpnext/projects/doctype/timesheet/timesheet.js b/erpnext/projects/doctype/timesheet/timesheet.js
index 43f5705e82..99ee2a2c5e 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.js
+++ b/erpnext/projects/doctype/timesheet/timesheet.js
@@ -39,7 +39,7 @@ frappe.ui.form.on("Timesheet", {
refresh: function(frm) {
if(frm.doc.docstatus==1) {
- if(frm.doc.per_billed < 100){
+ if(frm.doc.per_billed < 100 && frm.doc.total_billable_hours && frm.doc.total_billable_hours > frm.doc.total_billed_hours){
frm.add_custom_button(__("Make Sales Invoice"), function() { frm.trigger("make_invoice") },
"fa fa-file-alt");
}
diff --git a/erpnext/projects/doctype/timesheet/timesheet.py b/erpnext/projects/doctype/timesheet/timesheet.py
index 01552a50c9..8d339b9ce6 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.py
+++ b/erpnext/projects/doctype/timesheet/timesheet.py
@@ -310,16 +310,16 @@ def get_timesheet(doctype, txt, searchfield, start, page_len, filters):
@frappe.whitelist()
def get_timesheet_data(name, project):
+ data = None
if project and project!='':
data = get_projectwise_timesheet_data(project, name)
else:
data = frappe.get_all('Timesheet',
fields = ["(total_billable_amount - total_billed_amount) as billing_amt", "total_billable_hours as billing_hours"], filters = {'name': name})
-
return {
- 'billing_hours': data[0].billing_hours,
- 'billing_amount': data[0].billing_amt,
- 'timesheet_detail': data[0].name if project and project!= '' else None
+ 'billing_hours': data[0].billing_hours if data else None,
+ 'billing_amount': data[0].billing_amt if data else None,
+ 'timesheet_detail': data[0].name if data and project and project!= '' else None
}
@frappe.whitelist()
@@ -327,6 +327,12 @@ def make_sales_invoice(source_name, item_code=None, customer=None):
target = frappe.new_doc("Sales Invoice")
timesheet = frappe.get_doc('Timesheet', source_name)
+ if not timesheet.total_billable_hours:
+ frappe.throw(_("Invoice can't be made for zero billing hour"))
+
+ if timesheet.total_billable_hours == timesheet.total_billed_hours:
+ frappe.throw(_("Invoice already created for all billing hours"))
+
hours = flt(timesheet.total_billable_hours) - flt(timesheet.total_billed_hours)
billing_amount = flt(timesheet.total_billable_amount) - flt(timesheet.total_billed_amount)
billing_rate = billing_amount / hours
diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index 4847dae555..c1b020bbe5 100644
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js
@@ -653,11 +653,14 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
var payment_types = $.map(this.frm.doc.payments, function(d) { return d.type; });
if (in_list(payment_types, 'Cash')) {
- this.frm.doc.change_amount = flt(this.frm.doc.paid_amount - this.frm.doc.grand_total +
+ var grand_total = this.frm.doc.rounded_total || this.frm.doc.grand_total;
+ var base_grand_total = this.frm.doc.base_rounded_total || this.frm.doc.base_grand_total;
+
+ this.frm.doc.change_amount = flt(this.frm.doc.paid_amount - grand_total +
this.frm.doc.write_off_amount, precision("change_amount"));
this.frm.doc.base_change_amount = flt(this.frm.doc.base_paid_amount -
- this.frm.doc.base_grand_total + this.frm.doc.base_write_off_amount,
+ base_grand_total + this.frm.doc.base_write_off_amount,
precision("base_change_amount"));
}
}
diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.js b/erpnext/selling/page/point_of_sale/point_of_sale.js
index 5c2662c36e..2d7711523c 100644
--- a/erpnext/selling/page/point_of_sale/point_of_sale.js
+++ b/erpnext/selling/page/point_of_sale/point_of_sale.js
@@ -15,6 +15,7 @@ frappe.pages['point-of-sale'].on_page_load = function(wrapper) {
window.cur_pos = wrapper.pos;
} else {
// offline
+ frappe.flags.is_offline = true;
frappe.set_route('pos');
}
});
@@ -24,6 +25,10 @@ frappe.pages['point-of-sale'].refresh = function(wrapper) {
if (wrapper.pos) {
cur_frm = wrapper.pos.frm;
}
+
+ if (frappe.flags.is_offline) {
+ frappe.set_route('pos');
+ }
}
erpnext.pos.PointOfSale = class PointOfSale {
diff --git a/erpnext/shopping_cart/cart.py b/erpnext/shopping_cart/cart.py
index c3deaf238f..254d7b74af 100644
--- a/erpnext/shopping_cart/cart.py
+++ b/erpnext/shopping_cart/cart.py
@@ -65,10 +65,13 @@ def place_order():
from erpnext.selling.doctype.quotation.quotation import _make_sales_order
sales_order = frappe.get_doc(_make_sales_order(quotation.name, ignore_permissions=True))
for item in sales_order.get("items"):
- item.reserved_warehouse = frappe.db.get_value("Item", item.item_code, "website_warehouse") or None
- item_stock = get_qty_in_stock(item.item_code, "website_warehouse")
- if item.qty > item_stock.stock_qty[0][0]:
- throw(_("Only {0} in stock for item {1}").format(item_stock.stock_qty[0][0], item.item_code))
+ item.reserved_warehouse, is_stock_item = frappe.db.get_value("Item",
+ item.item_code, ["website_warehouse", "is_stock_item"]) or None, None
+
+ if is_stock_item:
+ item_stock = get_qty_in_stock(item.item_code, "website_warehouse")
+ if item.qty > item_stock.stock_qty[0][0]:
+ throw(_("Only {0} in stock for item {1}").format(item_stock.stock_qty[0][0], item.item_code))
sales_order.flags.ignore_permissions = True
sales_order.insert()