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

Payment tool as per party model

Browse Source
This commit is contained in:
Nabin Hait 2014-09-16 11:07:56 +05:30
parent 36cf4a4708
commit 678b441082
4 changed files with 96 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
erpnext/accounts/doctype/payment_tool/payment_tool.js
View File

@ -8,13 +8,19 @@ frappe.ui.form.on("Payment Tool", "onload", function(frm) {
frm.set_value("make_jv_help", '<i class="icon-hand-right"></i> ' frm.set_value("make_jv_help", '<i class="icon-hand-right"></i> '
+ __("Note: If payment is not made against any reference, make Journal Voucher manually.")); + __("Note: If payment is not made against any reference, make Journal Voucher manually."));
frm.set_query("party_type", function() {
return {
filters: {"name": ["in", ["Customer", "Supplier"]]}
};
});
frm.set_query("payment_account", function() { frm.set_query("payment_account", function() {
return { return {
filters: [ filters: {
['Account', 'account_type', 'in', 'Bank, Cash'], "account_type": ["in", ["Receivable", "Payable"]],
['Account', 'group_or_ledger', '=', 'Ledger'], "group_or_ledger": "Ledger",
['Account', 'company', '=', frm.doc.company] "company": frm.doc.company
] }
} }
}); });
@ -29,10 +35,24 @@ frappe.ui.form.on("Payment Tool", "refresh", function(frm) {
frappe.ui.form.trigger("Payment Tool", "party_type"); frappe.ui.form.trigger("Payment Tool", "party_type");
}); });
frappe.ui.form.on("Payment Tool", "party_type", function(frm) { frappe.ui.form.on("Payment Tool", "party", function(frm) {
frm.toggle_reqd("customer", frm.doc.party_type == "Customer"); if(!frm.doc.party_account && frm.doc.party_type && frm.doc.party) {
frm.toggle_reqd("supplier", frm.doc.party_type == "Supplier"); return frappe.call({
method: "erpnext.accounts.party.get_party_account",
args: {
company: frm.doc.company,
party_type: frm.doc.party_type,
party: frm.doc.party
},
callback: function(r) {
if(!r.exc && r.message) {
frappe.model.set_value("party_account", r.message);
erpnext.payment_tool.check_mandatory_to_set_button(frm);
}
}
}); });
}
})
frappe.ui.form.on("Payment Tool", "company", function(frm) { frappe.ui.form.on("Payment Tool", "company", function(frm) {
erpnext.payment_tool.check_mandatory_to_set_button(frm); erpnext.payment_tool.check_mandatory_to_set_button(frm);
@ -45,44 +65,12 @@ frappe.ui.form.on("Payment Tool", "received_or_paid", function(frm) {
// Fetch bank/cash account based on payment mode // Fetch bank/cash account based on payment mode
cur_frm.add_fetch("payment_mode", "default_account", "payment_account"); cur_frm.add_fetch("payment_mode", "default_account", "payment_account");
// Set party account name
frappe.ui.form.on("Payment Tool", "customer", function(frm) {
erpnext.payment_tool.set_party_account(frm);
erpnext.payment_tool.check_mandatory_to_set_button(frm);
});
frappe.ui.form.on("Payment Tool", "supplier", function(frm) {
erpnext.payment_tool.set_party_account(frm);
erpnext.payment_tool.check_mandatory_to_set_button(frm);
});
erpnext.payment_tool.check_mandatory_to_set_button = function(frm) { erpnext.payment_tool.check_mandatory_to_set_button = function(frm) {
if (frm.doc.company && frm.doc.party_type && frm.doc.received_or_paid && (frm.doc.customer || frm.doc.supplier)) { if (frm.doc.company && frm.doc.party_type && frm.doc.party && frm.doc.received_or_paid) {
frm.fields_dict.get_outstanding_vouchers.$input.addClass("btn-primary"); frm.fields_dict.get_outstanding_vouchers.$input.addClass("btn-primary");
} }
} }
//Set Button color
erpnext.payment_tool.set_party_account = function(frm) {
if(frm.doc.party_type == "Customer") {
var party_name = frm.doc.customer;
} else {
var party_name = frm.doc.supplier;
}
return frappe.call({
method: 'erpnext.accounts.doctype.payment_tool.payment_tool.get_party_account',
args: {
party_type: frm.doc.party_type,
party_name: party_name
},
callback: function(r, rt) {
if(!r.exc) {
frm.set_value("party_account", r.message);
}
}
});
}
// Get outstanding vouchers // Get outstanding vouchers
frappe.ui.form.on("Payment Tool", "get_outstanding_vouchers", function(frm) { frappe.ui.form.on("Payment Tool", "get_outstanding_vouchers", function(frm) {
erpnext.payment_tool.check_mandatory_to_fetch(frm.doc); erpnext.payment_tool.check_mandatory_to_fetch(frm.doc);
@ -96,7 +84,7 @@ frappe.ui.form.on("Payment Tool", "get_outstanding_vouchers", function(frm) {
"company": frm.doc.company, "company": frm.doc.company,
"party_type": frm.doc.party_type, "party_type": frm.doc.party_type,
"received_or_paid": frm.doc.received_or_paid, "received_or_paid": frm.doc.received_or_paid,
"party_name": frm.doc.party_type == "Customer" ? frm.doc.customer : frm.doc.supplier, "party": frm.doc.party,
"party_account": frm.doc.party_account "party_account": frm.doc.party_account
} }
}, },
@ -204,14 +192,7 @@ frappe.ui.form.on("Payment Tool", "make_journal_voucher", function(frm) {
}); });
erpnext.payment_tool.check_mandatory_to_fetch = function(doc) { erpnext.payment_tool.check_mandatory_to_fetch = function(doc) {
var check_fields = [ $.each(["Company", "Party Type", "Party", "Received or Paid"], function(i, field) {
['Company', doc.company], if(!doc[frappe.model.scrub(field)]]) frappe.throw(__("Please select {0} first", [field]));
['Party Type', doc.party_type],
['Received Or Paid', doc.received_or_paid],
['Customer / Supplier', doc.party_type == "Customer" ? doc.customer : doc.supplier]
];
$.each(check_fields, function(i, v) {
if(!v[1]) frappe.throw(__("Please select {0} first", [v[0]]));
}); });
} }

42
erpnext/accounts/doctype/payment_tool/payment_tool.json
View File

@ -26,14 +26,14 @@
"allow_on_submit": 0, "allow_on_submit": 0,
"default": "Customer", "default": "Customer",
"fieldname": "party_type", "fieldname": "party_type",
"fieldtype": "Select", "fieldtype": "Link",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Party Type", "label": "Party Type",
"no_copy": 0, "no_copy": 0,
"options": "Customer\nSupplier", "options": "DocType",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"read_only": 0, "read_only": 0,
@ -44,53 +44,33 @@
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"depends_on": "eval:(doc.party_type == 'Customer')", "depends_on": "",
"fieldname": "customer", "fieldname": "party",
"fieldtype": "Link", "fieldtype": "Dynamic Link",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Customer", "label": "Party",
"no_copy": 0, "no_copy": 0,
"options": "Customer", "options": "party_type",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 1,
"search_index": 0,
"set_only_once": 0
},
{
"allow_on_submit": 0,
"depends_on": "eval:(doc.party_type == 'Supplier')",
"fieldname": "supplier",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 1,
"label": "Supplier",
"no_copy": 0,
"options": "Supplier",
"permlevel": 0,
"print_hide": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0 "set_only_once": 0
}, },
{ {
"fieldname": "party_account", "fieldname": "party_account",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 1, "hidden": 0,
"label": "Party Account", "label": "Party Account",
"no_copy": 1, "no_copy": 1,
"options": "Account", "options": "Account",
"permlevel": 0, "permlevel": 0,
"read_only": 1 "read_only": 0
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
@ -330,7 +310,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 1, "issingle": 1,
"istable": 0, "istable": 0,
"modified": "2014-09-12 04:43:05.963218", "modified": "2014-09-15 16:01:04.820559",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Payment Tool", "name": "Payment Tool",

18
erpnext/accounts/doctype/payment_tool/payment_tool.py
View File

@ -3,7 +3,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
from frappe import _, scrub from frappe import _
from frappe.utils import flt from frappe.utils import flt
from frappe.model.document import Document from frappe.model.document import Document
import json import json
@ -37,6 +37,8 @@ class PaymentTool(Document):
if v.payment_amount: if v.payment_amount:
d1 = jv.append("entries") d1 = jv.append("entries")
d1.account = self.party_account d1.account = self.party_account
d1.party_type = self.party_type
d1.party = self.party
d1.balance = get_balance_on(self.party_account) d1.balance = get_balance_on(self.party_account)
d1.set("debit" if self.received_or_paid=="Paid" else "credit", flt(v.payment_amount)) d1.set("debit" if self.received_or_paid=="Paid" else "credit", flt(v.payment_amount))
d1.set(invoice_voucher_type.get(v.against_voucher_type), v.against_voucher_no) d1.set(invoice_voucher_type.get(v.against_voucher_type), v.against_voucher_no)
@ -51,10 +53,6 @@ class PaymentTool(Document):
return jv.as_dict() return jv.as_dict()
@frappe.whitelist()
def get_party_account(party_type, party_name):
return frappe.db.get_value("Account", {"master_type": party_type, "master_name": party_name})
@frappe.whitelist() @frappe.whitelist()
def get_outstanding_vouchers(args): def get_outstanding_vouchers(args):
from erpnext.accounts.utils import get_outstanding_invoices from erpnext.accounts.utils import get_outstanding_invoices
@ -72,13 +70,14 @@ def get_outstanding_vouchers(args):
frappe.throw(_("Please enter the Against Vouchers manually")) frappe.throw(_("Please enter the Against Vouchers manually"))
# Get all outstanding sales /purchase invoices # Get all outstanding sales /purchase invoices
outstanding_invoices = get_outstanding_invoices(amount_query, args.get("party_account")) outstanding_invoices = get_outstanding_invoices(amount_query, args.get("party_account"),
args.get("party_type"), args.get("party"))
# Get all SO / PO which are not fully billed or aginst which full advance not paid # Get all SO / PO which are not fully billed or aginst which full advance not paid
orders_to_be_billed = get_orders_to_be_billed(args.get("party_type"), args.get("party_name")) orders_to_be_billed = get_orders_to_be_billed(args.get("party_type"), args.get("party"))
return outstanding_invoices + orders_to_be_billed return outstanding_invoices + orders_to_be_billed
def get_orders_to_be_billed(party_type, party_name): def get_orders_to_be_billed(party_type, party):
voucher_type = 'Sales Order' if party_type == "Customer" else 'Purchase Order' voucher_type = 'Sales Order' if party_type == "Customer" else 'Purchase Order'
orders = frappe.db.sql(""" orders = frappe.db.sql("""
select select
@ -93,8 +92,7 @@ def get_orders_to_be_billed(party_type, party_name):
and docstatus = 1 and docstatus = 1
and ifnull(grand_total, 0) > ifnull(advance_paid, 0) and ifnull(grand_total, 0) > ifnull(advance_paid, 0)
and ifnull(per_billed, 0) < 100.0 and ifnull(per_billed, 0) < 100.0
""" % (voucher_type, 'customer' if party_type == "Customer" else 'supplier', '%s'), """ % (voucher_type, 'customer' if party_type == "Customer" else 'supplier', '%s'), party, as_dict = True)
party_name, as_dict = True)
order_list = [] order_list = []
for d in orders: for d in orders:

62
erpnext/accounts/doctype/payment_tool/test_payment_tool.py
View File

@ -22,8 +22,8 @@ class TestPaymentTool(unittest.TestCase):
self.clear_table_entries() self.clear_table_entries()
base_customer_jv = self.create_against_jv(jv_test_records[2], { "account": "_Test Customer 3 - _TC"}) base_customer_jv = self.create_against_jv(jv_test_records[2], { "party": "_Test Customer 3"})
base_supplier_jv = self.create_against_jv(jv_test_records[1], { "account": "_Test Supplier 1 - _TC"}) base_supplier_jv = self.create_against_jv(jv_test_records[1], { "party": "_Test Supplier 1"})
# Create SO with partial outstanding # Create SO with partial outstanding
@ -31,9 +31,10 @@ class TestPaymentTool(unittest.TestCase):
"customer": "_Test Customer 3" "customer": "_Test Customer 3"
}) })
jv_against_so1 = self.create_against_jv(jv_test_records[0], { self.create_against_jv(jv_test_records[0], {
"account": "_Test Customer 3 - _TC", "party": "_Test Customer 3",
"against_sales_order": so1.name "against_sales_order": so1.name,
"is_advance": "Yes"
}) })
@ -42,11 +43,14 @@ class TestPaymentTool(unittest.TestCase):
"customer": "_Test Customer 3" "customer": "_Test Customer 3"
}) })
jv_against_so2 = self.create_against_jv(jv_test_records[0], { self.create_against_jv(jv_test_records[0], {
"account": "_Test Customer 3 - _TC", "party": "_Test Customer 3",
"against_sales_order": so2.name, "against_sales_order": so2.name,
"credit": 1000 "credit": 1000,
"is_advance": "Yes"
}) })
# Purchase order
po = self.create_voucher(po_test_records[1], { po = self.create_voucher(po_test_records[1], {
"supplier": "_Test Supplier 1" "supplier": "_Test Supplier 1"
}) })
@ -54,28 +58,28 @@ class TestPaymentTool(unittest.TestCase):
#Create SI with partial outstanding #Create SI with partial outstanding
si1 = self.create_voucher(si_test_records[0], { si1 = self.create_voucher(si_test_records[0], {
"customer": "_Test Customer 3", "customer": "_Test Customer 3",
"debit_to": "_Test Customer 3 - _TC" "debit_to": "_Test Receivable - _TC"
}) })
jv_against_si1 = self.create_against_jv(jv_test_records[0], { self.create_against_jv(jv_test_records[0], {
"account": "_Test Customer 3 - _TC", "party": "_Test Customer 3",
"against_invoice": si1.name "against_invoice": si1.name
}) })
#Create SI with no outstanding #Create SI with no outstanding
si2 = self.create_voucher(si_test_records[0], { si2 = self.create_voucher(si_test_records[0], {
"customer": "_Test Customer 3", "customer": "_Test Customer 3",
"debit_to": "_Test Customer 3 - _TC" "debit_to": "_Test Receivable - _TC"
}) })
jv_against_si2 = self.create_against_jv(jv_test_records[0], { self.create_against_jv(jv_test_records[0], {
"account": "_Test Customer 3 - _TC", "party": "_Test Customer 3",
"against_invoice": si2.name, "against_invoice": si2.name,
"credit": 561.80 "credit": 561.80
}) })
pi = self.create_voucher(pi_test_records[0], { pi = self.create_voucher(pi_test_records[0], {
"supplier": "_Test Supplier 1", "supplier": "_Test Supplier 1",
"credit_to": "_Test Supplier 1 - _TC" "credit_to": "_Test Payable - _TC"
}) })
#Create a dict containing properties and expected values #Create a dict containing properties and expected values
@ -91,8 +95,8 @@ class TestPaymentTool(unittest.TestCase):
"company": "_Test Company", "company": "_Test Company",
"party_type": "Customer", "party_type": "Customer",
"received_or_paid": "Received", "received_or_paid": "Received",
"customer": "_Test Customer", "party": "_Test Customer 3",
"party_account": "_Test Customer 3 - _TC", "party_account": "_Test Receivable - _TC",
"payment_mode": "Cheque", "payment_mode": "Cheque",
"payment_account": "_Test Account Bank Account - _TC", "payment_account": "_Test Account Bank Account - _TC",
"reference_no": "123456", "reference_no": "123456",
@ -104,8 +108,8 @@ class TestPaymentTool(unittest.TestCase):
args.update({ args.update({
"party_type": "Supplier", "party_type": "Supplier",
"received_or_paid": "Paid", "received_or_paid": "Paid",
"supplier": "_Test Supplier 1", "party": "_Test Supplier 1",
"party_account": "_Test Supplier 1 - _TC" "party_account": "_Test Payable - _TC"
}) })
expected_outstanding["Journal Voucher"] = [base_supplier_jv.name, 400.00] expected_outstanding["Journal Voucher"] = [base_supplier_jv.name, 400.00]
self.make_voucher_for_party(args, expected_outstanding) self.make_voucher_for_party(args, expected_outstanding)
@ -141,7 +145,6 @@ class TestPaymentTool(unittest.TestCase):
def check_outstanding_vouchers(self, doc, args, expected_outstanding): def check_outstanding_vouchers(self, doc, args, expected_outstanding):
from erpnext.accounts.doctype.payment_tool.payment_tool import get_outstanding_vouchers from erpnext.accounts.doctype.payment_tool.payment_tool import get_outstanding_vouchers
outstanding_entries = get_outstanding_vouchers(json.dumps(args)) outstanding_entries = get_outstanding_vouchers(json.dumps(args))
for d in outstanding_entries: for d in outstanding_entries:
@ -164,17 +167,18 @@ class TestPaymentTool(unittest.TestCase):
#Create a list of expected values as [party account, payment against, against_jv, against_invoice, #Create a list of expected values as [party account, payment against, against_jv, against_invoice,
#against_voucher, against_sales_order, against_purchase_order] #against_voucher, against_sales_order, against_purchase_order]
expected_values = [ expected_values = [
[paytool.party_account, 100.00, expected_outstanding.get("Journal Voucher")[0], None, None, None, None], [paytool.party_account, paytool.party, 100.00, expected_outstanding.get("Journal Voucher")[0], None, None, None, None],
[paytool.party_account, 100.00, None, expected_outstanding.get("Sales Invoice")[0], None, None, None], [paytool.party_account, paytool.party, 100.00, None, expected_outstanding.get("Sales Invoice")[0], None, None, None],
[paytool.party_account, 100.00, None, None, expected_outstanding.get("Purchase Invoice")[0], None, None], [paytool.party_account, paytool.party, 100.00, None, None, expected_outstanding.get("Purchase Invoice")[0], None, None],
[paytool.party_account, 100.00, None, None, None, expected_outstanding.get("Sales Order")[0], None], [paytool.party_account, paytool.party, 100.00, None, None, None, expected_outstanding.get("Sales Order")[0], None],
[paytool.party_account, 100.00, None, None, None, None, expected_outstanding.get("Purchase Order")[0]] [paytool.party_account, paytool.party, 100.00, None, None, None, None, expected_outstanding.get("Purchase Order")[0]]
] ]
for jv_entry in new_jv.get("entries"): for jv_entry in new_jv.get("entries"):
if paytool.party_account == jv_entry.get("account"): if paytool.party_account == jv_entry.get("account") and paytool.party == jv_entry.get("party"):
row = [ row = [
jv_entry.get("account"), jv_entry.get("account"),
jv_entry.get("party"),
jv_entry.get("debit" if paytool.party_type=="Supplier" else "credit"), jv_entry.get("debit" if paytool.party_type=="Supplier" else "credit"),
jv_entry.get("against_jv"), jv_entry.get("against_jv"),
jv_entry.get("against_invoice"), jv_entry.get("against_invoice"),
@ -188,6 +192,6 @@ class TestPaymentTool(unittest.TestCase):
self.assertEquals(new_jv.get("cheque_date"), paytool.reference_date) self.assertEquals(new_jv.get("cheque_date"), paytool.reference_date)
def clear_table_entries(self): def clear_table_entries(self):
frappe.db.sql("""delete from `tabGL Entry` where (account = "_Test Customer 3 - _TC" or account = "_Test Supplier 1 - _TC")""") frappe.db.sql("""delete from `tabGL Entry` where party in ("_Test Customer 3", "_Test Supplier 1")""")
frappe.db.sql("""delete from `tabSales Order` where customer_name = "_Test Customer 3" """) frappe.db.sql("""delete from `tabSales Order` where customer = "_Test Customer 3" """)
frappe.db.sql("""delete from `tabPurchase Order` where supplier_name = "_Test Supplier 1" """) frappe.db.sql("""delete from `tabPurchase Order` where supplier = "_Test Supplier 1" """)