groove/Part-DB-server
1
0
Fork 0
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2026-01-18 08:09:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/feature/create-assemblies' into feature/all-features

Browse source
This commit is contained in:
Marcel Diegelmann 2025-10-10 14:48:28 +02:00
commit fb07f2a201
4 changed files with 4 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Services/ImportExportSystem/EntityExporter.php
View file

@ -432,7 +432,7 @@ class EntityExporter
//BOM relevant attributes //BOM relevant attributes
'Quantity', 'PartId', 'PartName', 'Ipn', 'Manufacturer', 'Mpn', 'Name', 'Designator', 'Quantity', 'PartId', 'PartName', 'Ipn', 'Manufacturer', 'Mpn', 'Name', 'Designator',
'Mountnames', 'Description', 'ReferencedAssemblyId', 'ReferencedAssemblyIpn', 'Description', 'ReferencedAssemblyId', 'ReferencedAssemblyIpn',
'ReferencedAssemblyFullName', 'ReferencedAssemblyFullName',
], ],
'processEntity' => fn($entity, $depth) => [ 'processEntity' => fn($entity, $depth) => [
@ -453,7 +453,6 @@ class EntityExporter
'Mpn' => '-', 'Mpn' => '-',
'Name' => '-', 'Name' => '-',
'Designator' => '-', 'Designator' => '-',
'Mountnames' => '-',
'Description' => '-', 'Description' => '-',
'ReferencedAssemblyId' => '-', 'ReferencedAssemblyId' => '-',
'ReferencedAssemblyIpn' => '-', 'ReferencedAssemblyIpn' => '-',
@ -591,7 +590,6 @@ class EntityExporter
'Mpn' => $bomEntry->getPart()?->getManufacturerProductNumber() ?? '-', 'Mpn' => $bomEntry->getPart()?->getManufacturerProductNumber() ?? '-',
'Name' => $bomEntry->getName() ?? '-', 'Name' => $bomEntry->getName() ?? '-',
'Designator' => $bomEntry->getDesignator(), 'Designator' => $bomEntry->getDesignator(),
'Mountnames' => $bomEntry->getMountnames(),
'Description' => $bomEntry->getPart()?->getDescription() ?? '-', 'Description' => $bomEntry->getPart()?->getDescription() ?? '-',
'ReferencedAssemblyId' => $bomEntry->getReferencedAssembly()?->getId() ?? '-', 'ReferencedAssemblyId' => $bomEntry->getReferencedAssembly()?->getId() ?? '-',
'ReferencedAssemblyIpn' => $bomEntry->getReferencedAssembly()?->getIpn() ?? '-', 'ReferencedAssemblyIpn' => $bomEntry->getReferencedAssembly()?->getIpn() ?? '-',

12
templates/form/collection_types_layout_assembly.html.twig
View file

@ -67,18 +67,6 @@
<tr class="p-0"> <tr class="p-0">
<td colspan="5" class="accordion-body collapse" id="{{ target_id }}"> <td colspan="5" class="accordion-body collapse" id="{{ target_id }}">
<div class=""> <div class="">
{{ form_row(form.mountnames) }}
<div class="row mb-2">
<label class="col-form-label col-sm-3">{% trans %}assembly.bom.price{% endtrans %}</label>
<div class="col-sm-9">
<div class="input-group">
{{ form_widget(form.price) }}
{{ form_widget(form.priceCurrency) }}
</div>
{{ form_errors(form.price) }}
{{ form_errors(form.priceCurrency) }}
</div>
</div>
{{ form_row(form.comment) }} {{ form_row(form.comment) }}
</div> </div>
</td> </td>

2
translations/messages.de.xlf
View file

@ -13623,7 +13623,7 @@ Bitte beachten Sie, dass Sie sich nicht als deaktivierter Benutzer ausgeben kön
<unit id="jd7dh6G" name="assembly.bom.designator.help"> <unit id="jd7dh6G" name="assembly.bom.designator.help">
<segment> <segment>
<source>assembly.bom.designator.help</source> <source>assembly.bom.designator.help</source>
<target>Freie Bezeichnungskennungen (Designator)</target> <target>Freie Bezeichnungskennung(en)</target>
</segment> </segment>
</unit> </unit>
<unit id="rswC4eS" name="assembly.bom.instockAmount"> <unit id="rswC4eS" name="assembly.bom.instockAmount">

4
translations/messages.en.xlf
View file

@ -13618,13 +13618,13 @@ Please note, that you can not impersonate a disabled user. If you try you will g
<unit id="kd8Db5T" name="assembly.bom.designator"> <unit id="kd8Db5T" name="assembly.bom.designator">
<segment> <segment>
<source>assembly.bom.designator</source> <source>assembly.bom.designator</source>
<target>Free identifiers (designator)</target> <target>Designator</target>
</segment> </segment>
</unit> </unit>
<unit id="jd7dh6G" name="assembly.bom.designator.help"> <unit id="jd7dh6G" name="assembly.bom.designator.help">
<segment> <segment>
<source>assembly.bom.designator.help</source> <source>assembly.bom.designator.help</source>
<target>Free identifiers (designator)</target> <target>Free identifier(s)</target>
</segment> </segment>
</unit> </unit>
<unit id="rswC4eS" name="assembly.bom.instockAmount"> <unit id="rswC4eS" name="assembly.bom.instockAmount">