diff --git a/kibot/bom/xlsx_writer.py b/kibot/bom/xlsx_writer.py index 70d2bc6a..23b38434 100644 --- a/kibot/bom/xlsx_writer.py +++ b/kibot/bom/xlsx_writer.py @@ -537,7 +537,7 @@ def _create_kicost_sheet(workbook, groups, image_data, fmt_title, fmt_info, fmt_ Spreadsheet.MAX_COL_WIDTH = cfg.xlsx.max_col_width Spreadsheet.PART_NSEQ_SEPRTR = cfg.ref_separator if hasattr(Spreadsheet, 'SUPPRESS_DIST_DESC'): - Spreadsheet.SUPPRESS_DIST_DESC = False + Spreadsheet.SUPPRESS_DIST_DESC = not cfg.xlsx.kicost_dist_desc # Keep our sorting try: Spreadsheet.SORT_GROUPS = False diff --git a/kibot/out_bom.py b/kibot/out_bom.py index fc7e60c9..f5c001f0 100644 --- a/kibot/out_bom.py +++ b/kibot/out_bom.py @@ -167,6 +167,8 @@ class BoMXLSX(BoMLinkable): """ [string|list(string)=''] List of KiCost APIs to enable """ self.kicost_api_disable = Optionable """ [string|list(string)=''] List of KiCost APIs to disable """ + self.kicost_dist_desc = False + """ Used to add a column with the distributor's description. So you can chek this is the right component """ self.specs = False """ Enable Specs worksheet creation. Contains specifications for the components. Works with only some KiCost APIs """ diff --git a/submodules/KiCost b/submodules/KiCost index 3880660d..ee939e13 160000 --- a/submodules/KiCost +++ b/submodules/KiCost @@ -1 +1 @@ -Subproject commit 3880660d03f929a7c02f70d045dd30ea8693e619 +Subproject commit ee939e13e04802d0c69a3be0bcf3fc5ae4b91f7b diff --git a/tests/yaml_samples/int_bom_kicost_merge_xlsx.kibot.yaml b/tests/yaml_samples/int_bom_kicost_merge_xlsx.kibot.yaml index 93121430..454ee120 100644 --- a/tests/yaml_samples/int_bom_kicost_merge_xlsx.kibot.yaml +++ b/tests/yaml_samples/int_bom_kicost_merge_xlsx.kibot.yaml @@ -29,3 +29,4 @@ outputs: name: Manufacturer P/N xlsx: kicost: true + kicost_api_disable: 'Digi-Key' diff --git a/tests/yaml_samples/int_bom_kicost_sel_dist_1_xlsx.kibot.yaml b/tests/yaml_samples/int_bom_kicost_sel_dist_1_xlsx.kibot.yaml index 0ed7fc34..b2fdda33 100644 --- a/tests/yaml_samples/int_bom_kicost_sel_dist_1_xlsx.kibot.yaml +++ b/tests/yaml_samples/int_bom_kicost_sel_dist_1_xlsx.kibot.yaml @@ -39,3 +39,4 @@ outputs: - Digi-Key xlsx: kicost: true + kicost_api_disable: 'Digi-Key' diff --git a/tests/yaml_samples/int_bom_kicost_simple_xlsx.kibot.yaml b/tests/yaml_samples/int_bom_kicost_simple_xlsx.kibot.yaml index d523a6eb..aa2d6f3f 100644 --- a/tests/yaml_samples/int_bom_kicost_simple_xlsx.kibot.yaml +++ b/tests/yaml_samples/int_bom_kicost_simple_xlsx.kibot.yaml @@ -36,3 +36,4 @@ outputs: - 'Voltage' xlsx: kicost: true + kicost_api_disable: 'Digi-Key'