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

Fixed version conflict

Browse Source
This commit is contained in:
Nabin Hait 2016-10-03 14:13:50 +05:30
commit 5fd5a77750
7 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/sales_invoice/pos.py
View File

@ -63,7 +63,7 @@ def update_pos_profile_data(doc, pos_profile, company_data):
doc.naming_series = pos_profile.get('naming_series') or 'SINV-' doc.naming_series = pos_profile.get('naming_series') or 'SINV-'
doc.letter_head = pos_profile.get('letter_head') or company_data.default_letter_head doc.letter_head = pos_profile.get('letter_head') or company_data.default_letter_head
doc.ignore_pricing_rule = pos_profile.get('ignore_pricing_rule') or 0 doc.ignore_pricing_rule = pos_profile.get('ignore_pricing_rule') or 0
doc.apply_discount_on = pos_profile.get('apply_discount_on') or '' doc.apply_discount_on = pos_profile.get('apply_discount_on') if pos_profile.get('apply_discount') else ''
doc.customer_group = pos_profile.get('customer_group') or get_root('Customer Group') doc.customer_group = pos_profile.get('customer_group') or get_root('Customer Group')
doc.territory = pos_profile.get('territory') or get_root('Territory') doc.territory = pos_profile.get('territory') or get_root('Territory')

4
erpnext/accounts/general_ledger.py
View File

@ -168,8 +168,8 @@ def delete_gl_entries(gl_entries=None, voucher_type=None, voucher_no=None,
if not gl_entries: if not gl_entries:
gl_entries = frappe.db.sql(""" gl_entries = frappe.db.sql("""
select account, posting_date, party_type, party, cost_center, fiscal_year, select account, posting_date, party_type, party, cost_center, fiscal_year,voucher_type,
voucher_type, voucher_no, against_voucher_type, against_voucher, cost_center voucher_no, against_voucher_type, against_voucher, cost_center, company
from `tabGL Entry` from `tabGL Entry`
where voucher_type=%s and voucher_no=%s""", (voucher_type, voucher_no), as_dict=True) where voucher_type=%s and voucher_no=%s""", (voucher_type, voucher_no), as_dict=True)

7
erpnext/accounts/report/accounts_receivable/accounts_receivable.py
View File

@ -93,9 +93,10 @@ class ReceivablePayableReport(object):
data = [] data = []
for gle in self.get_entries_till(self.filters.report_date, args.get("party_type")): for gle in self.get_entries_till(self.filters.report_date, args.get("party_type")):
if self.is_receivable_or_payable(gle, dr_or_cr, future_vouchers): if self.is_receivable_or_payable(gle, dr_or_cr, future_vouchers):
outstanding_amount = self.get_outstanding_amount(gle, self.filters.report_date, dr_or_cr) outstanding_amount = flt(self.get_outstanding_amount(gle,
if abs(outstanding_amount) > 0.1/10**currency_precision: self.filters.report_date, dr_or_cr), currency_precision)
if abs(outstanding_amount) > 0.1/10**currency_precision:
row = [gle.posting_date, gle.party] row = [gle.posting_date, gle.party]
# customer / supplier name # customer / supplier name
@ -227,7 +228,7 @@ class ReceivablePayableReport(object):
account_currency, remarks, {0} account_currency, remarks, {0}
from `tabGL Entry` from `tabGL Entry`
where docstatus < 2 and party_type=%s and (party is not null and party != '') {1} where docstatus < 2 and party_type=%s and (party is not null and party != '') {1}
group by voucher_type, voucher_no, against_voucher_type, against_voucher group by voucher_type, voucher_no, against_voucher_type, against_voucher, party
order by posting_date, party""" order by posting_date, party"""
.format(select_fields, conditions), values, as_dict=True) .format(select_fields, conditions), values, as_dict=True)

6
erpnext/setup/doctype/sales_partner/sales_partner.js
View File

@ -12,9 +12,3 @@ cur_frm.cscript.refresh = function(doc,dt,dn){
erpnext.utils.render_address_and_contact(cur_frm); erpnext.utils.render_address_and_contact(cur_frm);
} }
} }
cur_frm.fields_dict['targets'].grid.get_field("item_group").get_query = function(doc, dt, dn) {
return{
filters:{ 'is_group': 0 }
}
}

2
erpnext/stock/doctype/material_request/material_request.py
View File

@ -75,7 +75,7 @@ class MaterialRequest(BuyingController):
pc_obj = frappe.get_doc('Purchase Common') pc_obj = frappe.get_doc('Purchase Common')
pc_obj.validate_for_items(self) pc_obj.validate_for_items(self)
self.set_title() # self.set_title()
# self.validate_qty_against_so() # self.validate_qty_against_so()

2
erpnext/support/doctype/warranty_claim/warranty_claim.js
View File

@ -37,7 +37,7 @@ $.extend(cur_frm.cscript, new erpnext.support.WarrantyClaim({frm: cur_frm}));
cur_frm.cscript.onload = function(doc,cdt,cdn){ cur_frm.cscript.onload = function(doc,cdt,cdn){
if(!doc.status) if(!doc.status)
set_multiple(dt,dn,{status:'Open'}); set_multiple(cdt,cdn,{status:'Open'});
} }
cur_frm.fields_dict['customer_address'].get_query = function(doc, cdt, cdn) { cur_frm.fields_dict['customer_address'].get_query = function(doc, cdt, cdn) {