added project importer and grandtotal converter (#1468)

2020-10-11 22:08:00 +02:00
parent 0ce02b4f06
commit 996f05c73a
68 changed files with 2827 additions and 384 deletions
--- a/src/Entity/MetaTableTypeTrait.php
+++ b/src/Entity/MetaTableTypeTrait.php
@@ -214,15 +214,21 @@ trait MetaTableTypeTrait
    public function merge(MetaTableTypeInterface $meta): MetaTableTypeInterface
    {
        $this
-            ->setType($meta->getType())
            ->setConstraints($meta->getConstraints())
            ->setIsRequired($meta->isRequired())
            ->setIsVisible($meta->isVisible())
-            ->setLabel($meta->getLabel())
            ->setOptions($meta->getOptions())
            ->setOrder($meta->getOrder())
        ;

+        if ($meta->getLabel() !== null) {
+            $this->setLabel($meta->getLabel());
+        }
+
+        if ($meta->getType() !== null) {
+            $this->setType($meta->getType());
+        }
+
        return $this;
    }