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

Get items from quotation in sales invoice

Browse Source
This commit is contained in:
Nabin Hait 2017-11-14 17:13:19 +05:30
parent 04e3518fad
commit cd13a28417
2 changed files with 44 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,8 +95,9 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
// Show buttons only when pos view is active
if (cint(doc.docstatus==0) && cur_frm.page.current_view_name!=="pos" && !doc.is_return) {
cur_frm.cscript.sales_order_btn();
cur_frm.cscript.delivery_note_btn();
this.frm.cscript.sales_order_btn();
this.frm.cscript.delivery_note_btn();
this.frm.cscript.quotation_btn();
}
this.set_default_print_format();
@ -163,7 +164,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
this.$quotation_btn = this.frm.add_custom_button(__('Quotation'),
function() {
erpnext.utils.map_current_doc({
method: "erpnext.selling.doctype.quotation.quotation.make_quotation",
method: "erpnext.selling.doctype.quotation.quotation.make_sales_invoice",
source_doctype: "Quotation",
target: me.frm,
setters: {

11
erpnext/selling/doctype/quotation/quotation.py
View File

@ -169,10 +169,10 @@ def _make_sales_order(source_name, target_doc=None, ignore_permissions=False):
return doclist
@frappe.whitelist()
def make_quotation(source_name, target_doc=None):
return _make_quotation(source_name, target_doc)
def make_sales_invoice(source_name, target_doc=None):
return _make_sales_invoice(source_name, target_doc)
def _make_quotation(source_name, target_doc=None, ignore_permissions=False):
def _make_sales_invoice(source_name, target_doc=None, ignore_permissions=False):
customer = _make_customer(source_name, ignore_permissions)
def set_missing_values(source, target):
@ -196,9 +196,6 @@ def _make_sales_order(source_name, target_doc=None, ignore_permissions=False):
},
"Quotation Item": {
"doctype": "Sales Invoice Item",
"field_map": {
"parent": "prevdoc_docname"
},
"postprocess": update_item
},
"Sales Taxes and Charges": {
@ -211,8 +208,6 @@ def _make_sales_order(source_name, target_doc=None, ignore_permissions=False):
}
}, target_doc, set_missing_values, ignore_permissions=ignore_permissions)
# postprocess: fetch shipping address, set missing values
return doclist
def _make_customer(source_name, ignore_permissions=False):