diff --git a/msp/msp/doctype/ip_network/ip_network.js b/msp/msp/doctype/ip_network/ip_network.js index b72534a..c203e09 100644 --- a/msp/msp/doctype/ip_network/ip_network.js +++ b/msp/msp/doctype/ip_network/ip_network.js @@ -30,31 +30,31 @@ function getUsedIpsInNetwork(frm) { tableBody += ` ${(element?.ip_address === '') ? "-" : element?.ip_address} - ${(element?.title === '') ? "-" : element?.title} + ${(element?.title === '') ? __("no object assigned") : element?.title} - ${(element?.type === '') ? "-" : element?.type} + ${(element?.type === '') ? __("no type assigned") : element?.type} `; }); const table = tableBody ? ` - - +
+ - - - + + + diff --git a/msp/msp/doctype/ip_network/ip_network.py b/msp/msp/doctype/ip_network/ip_network.py index aab3951..4da4577 100644 --- a/msp/msp/doctype/ip_network/ip_network.py +++ b/msp/msp/doctype/ip_network/ip_network.py @@ -20,7 +20,7 @@ class IPNetwork(Document): ito.title, ito.type FROM `tabIP Address` ipa - JOIN `tabIT Object` ito + LEFT JOIN `tabIT Object` ito ON ipa.it_object = ito.name WHERE ipa.ip_network = %(ip_network)s AND ito.status != %(status)s
IPNameTypeIPNameType