mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-31 18:59:08 +00:00
removed gl mapper with patch
This commit is contained in:
@@ -143,7 +143,6 @@ class DocType(AccountsController):
|
||||
from `tabPurchase Invoice` where name=%s""", d.against_voucher)
|
||||
if bill_no and bill_no[0][0] and bill_no[0][0].lower().strip() \
|
||||
not in ['na', 'not applicable', 'none']:
|
||||
bill_no = bill_no and bill_no[0]
|
||||
r.append('%s %s against Bill %s dated %s' %
|
||||
(cstr(bill_no[0][2]), fmt_money(flt(d.debit)), bill_no[0][0],
|
||||
bill_no[0][1] and formatdate(bill_no[0][1].strftime('%Y-%m-%d')) or ''))
|
||||
@@ -238,11 +237,11 @@ class DocType(AccountsController):
|
||||
def check_account_against_entries(self):
|
||||
for d in self.doclist.get({"parentfield": "entries"}):
|
||||
if d.against_invoice and webnotes.conn.get_value("Sales Invoice",
|
||||
d.against_invoice, "credit_to") != d.account:
|
||||
d.against_invoice, "debit_to") != d.account:
|
||||
msgprint("Debit account is not matching with Sales Invoice", raise_exception=1)
|
||||
|
||||
if d.against_voucher and webnotes.conn.get_value("Purchase Invoice",
|
||||
d.against_voucher, "debit_to") != d.account:
|
||||
d.against_voucher, "credit_to") != d.account:
|
||||
msgprint("Credit account is not matching with Purchase Invoice", raise_exception=1)
|
||||
|
||||
def make_gl_entries(self, cancel=0, adv_adj=0):
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
[
|
||||
{
|
||||
"creation": "2013-01-19 10:23:34",
|
||||
"creation": "2013-01-30 12:49:46",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-01-29 18:19:58",
|
||||
"modified": "2013-02-01 10:50:16",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@@ -83,6 +83,7 @@
|
||||
"fieldname": "posting_date",
|
||||
"fieldtype": "Date",
|
||||
"in_filter": 1,
|
||||
"in_list_view": 1,
|
||||
"label": "Posting Date",
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "posting_date",
|
||||
@@ -176,6 +177,7 @@
|
||||
"fieldname": "cheque_no",
|
||||
"fieldtype": "Data",
|
||||
"in_filter": 1,
|
||||
"in_list_view": 1,
|
||||
"label": "Reference Number",
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "cheque_no",
|
||||
@@ -224,7 +226,7 @@
|
||||
"doctype": "DocField",
|
||||
"fieldname": "remark",
|
||||
"fieldtype": "Small Text",
|
||||
"in_list_view": 1,
|
||||
"in_list_view": 0,
|
||||
"label": "Remark",
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "remark",
|
||||
@@ -236,6 +238,7 @@
|
||||
"doctype": "DocField",
|
||||
"fieldname": "bill_no",
|
||||
"fieldtype": "Data",
|
||||
"in_list_view": 0,
|
||||
"label": "Bill No",
|
||||
"oldfieldname": "bill_no",
|
||||
"oldfieldtype": "Data",
|
||||
|
||||
@@ -250,8 +250,7 @@ class DocType(SellingController):
|
||||
for d in getlist(self.doclist, doctype):
|
||||
if d.item_code:
|
||||
item = webnotes.conn.get_value("Item", d.item_code,
|
||||
["default_income_account", "default_sales_cost_center"])
|
||||
|
||||
["default_income_account", "default_sales_cost_center"], as_dict=True)
|
||||
d.income_account = item['default_income_account'] or ""
|
||||
d.cost_center = item['default_sales_cost_center'] or ""
|
||||
|
||||
|
||||
Reference in New Issue
Block a user