nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 12:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fix] merge conflict

Browse Source
This commit is contained in:
Akhilesh Darjee
2013-09-05 13:18:22 +05:30
parent 38e8f989fa ea55734df5
commit a7b7d2559e
173 changed files with 1635 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accounts/doctype/pos_setting/pos_setting.js
View File

@@ -74,5 +74,5 @@ cur_frm.fields_dict['select_print_heading'].get_query = function(doc, cdt, cdn)
cur_frm.fields_dict.user.get_query = function(doc,cdt,cdn) {
return{ query:"controllers.queries.profile_query"}
return{ query:"core.doctype.profile.profile.profile_query"}
}

2
accounts/doctype/sales_invoice/pos.js
View File

@@ -425,7 +425,7 @@ erpnext.POS = Class.extend({
dialog.show();
cur_frm.pos.barcode.$input.focus();
dialog.get_input("total_amount").attr("disabled", "disabled");
dialog.get_input("total_amount").prop("disabled", true);
dialog.fields_dict.pay.input.onclick = function() {
cur_frm.set_value("mode_of_payment", dialog.get_values().mode_of_payment);

1
accounts/doctype/sales_invoice/sales_invoice.js
View File

@@ -92,7 +92,6 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
source_doctype: "Delivery Note",
get_query: function() {
var filters = {
docstatus: 1,
company: cur_frm.doc.company
};
if(cur_frm.doc.customer) filters["customer"] = cur_frm.doc.customer;