Merge branch '2024.11'

tine-groupware · Dec 11, 2024 · 8bf6d79 · 8bf6d79
2 parents 9c98ff8 + 92a9504
commit 8bf6d79
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tests/tine20/Sales/InvoiceJsonTests.php b/tests/tine20/Sales/InvoiceJsonTests.php
@@ -291,7 +291,7 @@ public function testClearing()
             $tsController->update($timesheets[0]);
             self::fail('should throw Tinebase_Exception_Confirmation!');
         } catch (Tinebase_Exception_Confirmation $seiace) {
-            self::assertEquals('The Invoice you tried to edit is cleared already, change date will rebill the invoice, do you still want to execute this action?', $seiace->getMessage());
+            self::assertEquals(Tinebase_Translation::getTranslation(Timetracker_Config::APP_NAME)->_('The Invoice you tried to edit is cleared already, change date will rebill the invoice, do you still want to execute this action?'), $seiace->getMessage());
         }
     }
 

diff --git a/tine20/Sales/Controller/Invoice.php b/tine20/Sales/Controller/Invoice.php
@@ -222,7 +222,7 @@ protected function _findCurrentCustomer()
         foreach ($this->_currentBillingContract->relations as $relation) {
             if ($relation->type == 'CUSTOMER' && $relation->related_model == 'Sales_Model_Customer') {
                 $this->_currentBillingCustomer = $relation->related_record;
-                Tinebase_Record_Expander::expandRecord($this->_currentBillingContract);
+                Tinebase_Record_Expander::expandRecord($this->_currentBillingCustomer);
                 break;
             }
         }
@@ -1146,7 +1146,7 @@ protected function _createAutoInvoicesForContract(Sales_Model_Contract $contract
                     }
                 }
 
-                $debitor = $this->_currentBillingContract->{Sales_Model_Customer::FLD_DEBITORS}->getFirstRecord();
+                $debitor = $this->_currentBillingCustomer->{Sales_Model_Customer::FLD_DEBITORS}->getFirstRecord();
 
                 // prepare invoice
                 $invoice = new Sales_Model_Invoice(array(