Merge branch 'develop' into feat-customer-credit-limit
This commit is contained in:
commit
e85c320501
@ -1,7 +1,6 @@
|
||||
cur_frm.add_fetch("payment_gateway", "payment_account", "payment_account")
|
||||
cur_frm.add_fetch("payment_gateway", "payment_gateway", "payment_gateway")
|
||||
cur_frm.add_fetch("payment_gateway", "message", "message")
|
||||
cur_frm.add_fetch("payment_gateway", "payment_url_message", "payment_url_message")
|
||||
cur_frm.add_fetch("payment_gateway_account", "payment_account", "payment_account")
|
||||
cur_frm.add_fetch("payment_gateway_account", "payment_gateway", "payment_gateway")
|
||||
cur_frm.add_fetch("payment_gateway_account", "message", "message")
|
||||
|
||||
frappe.ui.form.on("Payment Request", "onload", function(frm, dt, dn){
|
||||
if (frm.doc.reference_doctype) {
|
||||
|
@ -88,7 +88,7 @@ def get_status(start_date, end_date):
|
||||
end_date = getdate(end_date)
|
||||
now_date = getdate(nowdate())
|
||||
|
||||
return "Active" if start_date < now_date < end_date else "Inactive"
|
||||
return "Active" if start_date <= now_date <= end_date else "Inactive"
|
||||
|
||||
|
||||
def update_status_for_contracts():
|
||||
|
@ -58,7 +58,7 @@ class GlobalDefaults(Document):
|
||||
|
||||
# Make property setters to hide rounded total fields
|
||||
for doctype in ("Quotation", "Sales Order", "Sales Invoice", "Delivery Note",
|
||||
"Supplier Quotation", "Purchase Order"):
|
||||
"Supplier Quotation", "Purchase Order", "Purchase Invoice"):
|
||||
make_property_setter(doctype, "base_rounded_total", "hidden", self.disable_rounded_total, "Check")
|
||||
make_property_setter(doctype, "base_rounded_total", "print_hide", 1, "Check")
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user