Merge branch '2024.11'

tine-groupware · Nov 14, 2024 · e7ba283 · e7ba283
2 parents a47c5d2 + 33cbe27
commit e7ba283
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/tine20/Sales/Model/DocumentPosition/Abstract.php b/tine20/Sales/Model/DocumentPosition/Abstract.php
@@ -612,9 +612,17 @@ protected function canCreatePartialFollowUp(): void
     {
     }
 
-    public function computePrice()
-    { // AbstractMixin.computePrice Zeile 62ff
-        if (self::POS_TYPE_PRODUCT !== $this->{self::FLD_TYPE}) {
+    /**
+     * AbstractMixin.computePrice Zeile 62ff
+     *
+     * @param bool $onlyProductType
+     * @return void
+     *
+     * TODO not sure if we need the param & the "only product" check ...
+     */
+    public function computePrice(bool $onlyProductType = true): void
+    {
+        if ($onlyProductType && self::POS_TYPE_PRODUCT !== $this->{self::FLD_TYPE}) {
             return;
         }
         $this->{self::FLD_POSITION_PRICE} = is_null($this->{self::FLD_UNIT_PRICE}) || is_null($this->{self::FLD_QUANTITY}) ? null

diff --git a/tine20/Sales/Model/DocumentPosition/Delivery.php b/tine20/Sales/Model/DocumentPosition/Delivery.php
@@ -58,9 +58,13 @@ public static function inheritModelConfigHook(array &$_definition)
      */
     protected static $_configurationObject = NULL;
 
-    // no moneytary fields, no calc to do
-    public function computePrice()
+    /**
+     * no monetary fields, no calc to do
+     *
+     * @param bool $onlyProductType
+     * @return void
+     */
+    public function computePrice(bool $onlyProductType = true): void
     {
     }
 }
-