mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-08-28 22:08:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into permission_rework

Browse source
This commit is contained in:
Jan Böhmer 2022-10-30 17:35:57 +01:00
commit 33f8d2ba9e
109 changed files with 5095 additions and 2860 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Entity/Parts/PartTraits/ManufacturerTrait.php
View file

@ -79,7 +79,7 @@ trait ManufacturerTrait
* @ORM\Column(type="string", length=255, nullable=true)
* @Assert\Choice({"announced", "active", "nrfnd", "eol", "discontinued", ""})
*/
protected string $manufacturing_status = '';
protected ?string $manufacturing_status = '';
/**
* Get the link to the website of the article on the manufacturers website

2
src/Entity/Parts/PartTraits/OrderTrait.php
View file

@ -79,7 +79,7 @@ trait OrderTrait
* @ORM\OneToOne(targetEntity="App\Entity\PriceInformations\Orderdetail")
* @ORM\JoinColumn(name="order_orderdetails_id", referencedColumnName="id")
*/
protected Orderdetail $order_orderdetail;
protected ?Orderdetail $order_orderdetail = null;
/**
* Get the selected order orderdetails of this part.