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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Nabin Hait 2017-06-08 10:34:45 +05:30
commit 2c808c578d
5 changed files with 7 additions and 7 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.45' __version__ = '8.0.46'
def get_default_company(user=None): def get_default_company(user=None):

3
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
View File

@ -2664,6 +2664,7 @@
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"depends_on": "eval:doc.is_pos===1",
"fieldname": "payments", "fieldname": "payments",
"fieldtype": "Table", "fieldtype": "Table",
"hidden": 0, "hidden": 0,
@ -4564,7 +4565,7 @@
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"menu_index": 0, "menu_index": 0,
"modified": "2017-05-17 10:34:44.412147", "modified": "2017-06-07 11:00:01.903429",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice", "name": "Sales Invoice",

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

@ -833,7 +833,6 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
update_customer: function (new_customer) { update_customer: function (new_customer) {
var me = this; var me = this;
if (!this.connection_status) return;
this.customer_doc = new frappe.ui.Dialog({ this.customer_doc = new frappe.ui.Dialog({
'title': 'Customer', 'title': 'Customer',

6
erpnext/stock/doctype/material_request/material_request.js
View File

@ -60,11 +60,11 @@ erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.exten
if(doc.docstatus == 1 && doc.status != 'Stopped') { if(doc.docstatus == 1 && doc.status != 'Stopped') {
if(flt(doc.per_ordered, 2) < 100) { if(flt(doc.per_ordered, 2) < 100) {
// make // make
if(doc.material_request_type === "Material Transfer" && doc.status === "Submitted") if(doc.material_request_type === "Material Transfer")
cur_frm.add_custom_button(__("Transfer Material"), cur_frm.add_custom_button(__("Transfer Material"),
this.make_stock_entry, __("Make")); this.make_stock_entry, __("Make"));
if(doc.material_request_type === "Material Issue" && doc.status === "Submitted") if(doc.material_request_type === "Material Issue")
cur_frm.add_custom_button(__("Issue Material"), cur_frm.add_custom_button(__("Issue Material"),
this.make_stock_entry, __("Make")); this.make_stock_entry, __("Make"));
@ -80,7 +80,7 @@ erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.exten
cur_frm.add_custom_button(__("Supplier Quotation"), cur_frm.add_custom_button(__("Supplier Quotation"),
this.make_supplier_quotation, __("Make")); this.make_supplier_quotation, __("Make"));
if(doc.material_request_type === "Manufacture" && doc.status === "Submitted") if(doc.material_request_type === "Manufacture")
cur_frm.add_custom_button(__("Production Order"), cur_frm.add_custom_button(__("Production Order"),
function() { me.raise_production_orders() }, __("Make")); function() { me.raise_production_orders() }, __("Make"));

2
erpnext/templates/includes/projects/project_tasks.html
View File

@ -6,7 +6,7 @@
<span class="indicator {{ "red" if task.status=="Open" else "green" if task.status=="Closed" else "darkgrey" }}" title="{{ task.status }}" > {{ task.subject }}</span> <span class="indicator {{ "red" if task.status=="Open" else "green" if task.status=="Closed" else "darkgrey" }}" title="{{ task.status }}" > {{ task.subject }}</span>
<div class="small text-muted item-timestamp" <div class="small text-muted item-timestamp"
title="{{ frappe.utils.pretty_date(task.modified) }}"> title="{{ frappe.utils.pretty_date(task.modified) }}">
{{ __("modified") }} {{ frappe.utils.pretty_date(task.modified) }} {{ _("modified") }} {{ frappe.utils.pretty_date(task.modified) }}
</div> </div>
</div> </div>
<div class='col-xs-1'>{% if task.todo %} <div class='col-xs-1'>{% if task.todo %}