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

Merge branch 'develop'

Browse Source
This commit is contained in:
Nabin Hait 2016-01-21 18:53:36 +05:30
commit e4b44a86a6
6 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__version__.py
View File

@ -1,2 +1,2 @@
from __future__ import unicode_literals from __future__ import unicode_literals
__version__ = '6.18.1' __version__ = '6.18.2'

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

@ -70,7 +70,8 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
}); });
if(!from_delivery_note && !is_delivered_by_supplier) { if(!from_delivery_note && !is_delivered_by_supplier) {
cur_frm.add_custom_button(__('Delivery'), cur_frm.cscript['Delivery Note'], __("Make")); cur_frm.add_custom_button(__('Delivery'), cur_frm.cscript['Make Delivery Note'],
__("Make"));
} }
} }

2
erpnext/hooks.py
View File

@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd."
app_description = """ERP made simple""" app_description = """ERP made simple"""
app_icon = "icon-th" app_icon = "icon-th"
app_color = "#e74c3c" app_color = "#e74c3c"
app_version = "6.18.1" app_version = "6.18.2"
app_email = "info@erpnext.com" app_email = "info@erpnext.com"
app_license = "GNU General Public License (v3)" app_license = "GNU General Public License (v3)"
source_link = "https://github.com/frappe/erpnext" source_link = "https://github.com/frappe/erpnext"

6
erpnext/public/js/controllers/transaction.js
View File

@ -170,8 +170,6 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
barcode: item.barcode, barcode: item.barcode,
serial_no: item.serial_no, serial_no: item.serial_no,
warehouse: item.warehouse, warehouse: item.warehouse,
parenttype: me.frm.doc.doctype,
parent: me.frm.doc.name,
customer: me.frm.doc.customer, customer: me.frm.doc.customer,
supplier: me.frm.doc.supplier, supplier: me.frm.doc.supplier,
currency: me.frm.doc.currency, currency: me.frm.doc.currency,
@ -186,8 +184,8 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
is_subcontracted: me.frm.doc.is_subcontracted, is_subcontracted: me.frm.doc.is_subcontracted,
transaction_date: me.frm.doc.transaction_date || me.frm.doc.posting_date, transaction_date: me.frm.doc.transaction_date || me.frm.doc.posting_date,
ignore_pricing_rule: me.frm.doc.ignore_pricing_rule, ignore_pricing_rule: me.frm.doc.ignore_pricing_rule,
doctype: item.doctype, doctype: me.frm.doctype,
name: item.name, name: me.frm.name,
project_name: item.project_name || me.frm.doc.project_name, project_name: item.project_name || me.frm.doc.project_name,
qty: item.qty qty: item.qty
} }

2
erpnext/stock/doctype/manufacturer/manufacturer.json
View File

@ -167,7 +167,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2016-01-17 11:39:36.686949", "modified": "2016-01-21 11:39:36.686949",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Manufacturer", "name": "Manufacturer",

2
setup.py
View File

@ -1,7 +1,7 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
from pip.req import parse_requirements from pip.req import parse_requirements
version = "6.18.1" version = "6.18.2"
requirements = parse_requirements("requirements.txt", session="") requirements = parse_requirements("requirements.txt", session="")
setup( setup(