merge with upstream

2017-12-20 20:27:55 +01:00
parent 8beef5faea
commit 2ea9e2e702
12 changed files with 237 additions and 81 deletions
--- a/helix/calculators/ebom_calculator.py
+++ b/helix/calculators/ebom_calculator.py
@@ -88,8 +88,6 @@ class EbomCalculator(object):
        for monitor in monitors:
            if monitor['power_source'][0] == 'Switch Gear/External':
                add_parts_to_list(part_list, {proper_monitor_controller: 1}, 1)
-            if (is_delta):
-                add_parts_to_list(part_list, {ethernet_plug: 2},1)

        if is_delta:
            clips_amount = inverter_count * self.row_count * 1.15