+
+#### Show Tax break-up
+
+
For example you buy Items worth X and sell them for 1.3X. So your Customer
pays 1.3 times the tax you pay your Supplier. Since you have already paid tax
to your Supplier for X, what you owe your government is only the tax on 0.3X.
@@ -49,7 +55,7 @@ Ideally you must create two Accounts for each type of VAT you pay and collect,
effect. Please contact your accountant if you need more help or post a query
on our forums!
-
+
#### Purchase UOM and Stock UOM Conversion
@@ -82,5 +88,5 @@ __Step 5:__ Notice that the stock quantity will be updated accordingly.
__Step 6:__ Save and Submit the Form.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/buying/supplier-quotation.md b/erpnext/docs/user/manual/en/buying/supplier-quotation.md
index 0f1d51aae4..868a2977e9 100644
--- a/erpnext/docs/user/manual/en/buying/supplier-quotation.md
+++ b/erpnext/docs/user/manual/en/buying/supplier-quotation.md
@@ -8,7 +8,7 @@ You can make a supplier quotation from a Material Request
#### Supplier Quotation Flow-Chart
-
+
You can also make a Supplier Quotation directly from:
@@ -23,11 +23,22 @@ usually send out a message (Request for Quote) to various Suppliers. In
many cases, especially if you have centralized buying, you may want to record
all the quotes so that
- * You can easily compare prices in the future
+ * You can easily compare prices in the future
* Audit whether all Suppliers were given the opportunity to quote.
Supplier Quotations are not necessary for most small businesses. Always
evaluate the cost of collecting information to the value it really provides!
You could only do this for high value items.
+#### Taxes
+If your Supplier is going to charge you additional taxes or charge like a shipping or insurance charge, you can add it here. It will help you to accurately track your costs. Also, if some of these charges add to the value of the product you will have to mention them in the Taxes table. You can also use templates for your taxes. For more information on setting up your taxes see the Purchase Taxes and Charges Template.
+
+You can select relevant tax by going to "Taxes and Charges" section and adding an entry to the table as shown below,
+
+
+
+Besides, in case of multiple items you can keep track of taxes on each by clicking "Show tax break-up"
+
+
+
{next}
diff --git a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
index aa9e78c399..a3d0f1b406 100644
--- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
+++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
@@ -486,7 +486,9 @@ class ProductionPlanningTool(Document):
"qty": requested_qty,
"schedule_date": add_days(nowdate(), cint(item_wrapper.lead_time_days)),
"warehouse": self.purchase_request_for_warehouse,
- "sales_order": sales_order if sales_order!="No Sales Order" else None
+ "sales_order": sales_order if sales_order!="No Sales Order" else None,
+ "project": frappe.db.get_value("Sales Order", sales_order, "project") \
+ if sales_order!="No Sales Order" else None
})
material_request.flags.ignore_permissions = 1
diff --git a/erpnext/manufacturing/doctype/workstation/workstation.js b/erpnext/manufacturing/doctype/workstation/workstation.js
index 153d7e5623..ba8e30cba0 100644
--- a/erpnext/manufacturing/doctype/workstation/workstation.js
+++ b/erpnext/manufacturing/doctype/workstation/workstation.js
@@ -1,17 +1,19 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-
-
-//--------- ONLOAD -------------
-cur_frm.cscript.onload = function(doc, cdt, cdn) {
- frappe.call({
- type:"GET",
- method:"erpnext.manufacturing.doctype.workstation.workstation.get_default_holiday_list",
- callback: function(r) {
- if(!r.exe && r.message){
- cur_frm.set_value("holiday_list", r.message);
- }
+frappe.ui.form.on("Workstation", {
+ onload: function(frm) {
+ if(frm.is_new())
+ {
+ frappe.call({
+ type:"GET",
+ method:"erpnext.manufacturing.doctype.workstation.workstation.get_default_holiday_list",
+ callback: function(r) {
+ if(!r.exe && r.message){
+ cur_frm.set_value("holiday_list", r.message);
+ }
+ }
+ })
}
- })
-}
+ }
+})
\ No newline at end of file
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 5f8531d1a3..30e8e038f7 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -349,3 +349,4 @@ erpnext.patches.v7_0.set_base_amount_in_invoice_payment_table
erpnext.patches.v7_1.update_invoice_status
erpnext.patches.v7_0.po_status_issue_for_pr_return
erpnext.patches.v7_1.update_missing_salary_component_type
+erpnext.patches.v7_0.update_autoname_field
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/fix_duplicate_icons.py b/erpnext/patches/v7_0/fix_duplicate_icons.py
index 3e762f79b4..f6d227d304 100644
--- a/erpnext/patches/v7_0/fix_duplicate_icons.py
+++ b/erpnext/patches/v7_0/fix_duplicate_icons.py
@@ -6,6 +6,8 @@ from erpnext.patches.v7_0.migrate_schools_to_erpnext import reload_doctypes_for_
def execute():
'''hide new style icons if old ones are set'''
+ frappe.reload_doc('desk', 'doctype', 'desktop_icon')
+
reload_doctypes_for_schools_icons()
sync_desktop_icons()
diff --git a/erpnext/patches/v7_0/update_autoname_field.py b/erpnext/patches/v7_0/update_autoname_field.py
new file mode 100644
index 0000000000..bfa9b281df
--- /dev/null
+++ b/erpnext/patches/v7_0/update_autoname_field.py
@@ -0,0 +1,14 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+ doctypes = frappe.db.sql(""" select name, autoname from `tabDocType`
+ where autoname like 'field:%' and allow_rename = 1""", as_dict=1)
+
+ for doctype in doctypes:
+ fieldname = doctype.autoname.split(":")[1]
+ if fieldname:
+ frappe.db.sql(""" update `tab%s` set %s = name """%(doctype.name, fieldname))
\ No newline at end of file
diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js
index a04c652104..59fdf703a3 100644
--- a/erpnext/selling/sales_common.js
+++ b/erpnext/selling/sales_common.js
@@ -66,27 +66,41 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
});
}
+ if(this.frm.fields_dict["packed_items"].grid.get_field('batch_no')) {
+ this.frm.set_query("batch_no", "packed_items", function(doc, cdt, cdn) {
+ return me.set_query_for_batch(doc, cdt, cdn)
+ });
+ }
+
if(this.frm.fields_dict["items"].grid.get_field('batch_no')) {
this.frm.set_query("batch_no", "items", function(doc, cdt, cdn) {
- var item = frappe.get_doc(cdt, cdn);
- if(!item.item_code) {
- frappe.throw(__("Please enter Item Code to get batch no"));
- } else {
- filters = {
- 'item_code': item.item_code,
- 'posting_date': me.frm.doc.posting_date || frappe.datetime.nowdate(),
- }
- if(item.warehouse) filters["warehouse"] = item.warehouse
-
- return {
- query : "erpnext.controllers.queries.get_batch_no",
- filters: filters
- }
- }
+ return me.set_query_for_batch(doc, cdt, cdn)
});
}
},
+ set_query_for_batch: function(doc, cdt, cdn) {
+ // Show item's batches in the dropdown of batch no
+
+ var me = this;
+ var item = frappe.get_doc(cdt, cdn);
+
+ if(!item.item_code) {
+ frappe.throw(__("Please enter Item Code to get batch no"));
+ } else {
+ filters = {
+ 'item_code': item.item_code,
+ 'posting_date': me.frm.doc.posting_date || frappe.datetime.nowdate(),
+ }
+ if(item.warehouse) filters["warehouse"] = item.warehouse
+
+ return {
+ query : "erpnext.controllers.queries.get_batch_no",
+ filters: filters
+ }
+ }
+ },
+
refresh: function() {
this._super();
this.frm.toggle_display("customer_name",
diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py
index 06df636cd7..4fb5f5d639 100644
--- a/erpnext/stock/doctype/material_request/material_request.py
+++ b/erpnext/stock/doctype/material_request/material_request.py
@@ -372,6 +372,7 @@ def raise_production_orders(material_request):
mr= frappe.get_doc("Material Request", material_request)
errors =[]
production_orders = []
+ default_wip_warehouse = frappe.db.get_single_value("Manufacturing Settings", "default_wip_warehouse")
for d in mr.items:
if (d.qty - d.ordered_qty) >0:
if frappe.db.get_value("BOM", {"item": d.item_code, "is_default": 1}):
@@ -379,6 +380,7 @@ def raise_production_orders(material_request):
prod_order.production_item = d.item_code
prod_order.qty = d.qty - d.ordered_qty
prod_order.fg_warehouse = d.warehouse
+ prod_order.wip_warehouse = default_wip_warehouse
prod_order.description = d.description
prod_order.stock_uom = d.uom
prod_order.expected_delivery_date = d.schedule_date
diff --git a/erpnext/stock/doctype/packed_item/packed_item.py b/erpnext/stock/doctype/packed_item/packed_item.py
index 2078eebded..09affe0494 100644
--- a/erpnext/stock/doctype/packed_item/packed_item.py
+++ b/erpnext/stock/doctype/packed_item/packed_item.py
@@ -16,7 +16,7 @@ class PackedItem(Document):
def get_product_bundle_items(item_code):
return frappe.db.sql("""select t1.item_code, t1.qty, t1.uom, t1.description
from `tabProduct Bundle Item` t1, `tabProduct Bundle` t2
- where t2.new_item_code=%s and t1.parent = t2.name""", item_code, as_dict=1)
+ where t2.new_item_code=%s and t1.parent = t2.name order by t1.idx""", item_code, as_dict=1)
def get_packing_item_details(item):
return frappe.db.sql("""select item_name, description, stock_uom from `tabItem`