Companies, make text1 and text2 fields available in XML

Affects: Sales Invoice and Despatch Note
uzerpllp · Nov 6, 2020 · d3f844d · d3f844d
1 parent cb1cced
commit d3f844d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/lib/classes/standard/printController.php b/lib/classes/standard/printController.php
@@ -2579,6 +2579,8 @@ public function getCompanyDetails()
         $details['website'] = 'Web Site: ' . $company->website;
         $details['vat_number'] = 'VAT Number: ' . $company->vatnumber;
         $details['company_number'] = 'Company Number: ' . $company->companynumber;
+        $details['co_additonal_text1'] = $company->text1;
+        $details['co_additonal_text2'] = $company->text2;
 
         return $details;
     }

diff --git a/modules/public_pages/erp/despatch/controllers/SodespatchlinesController.php b/modules/public_pages/erp/despatch/controllers/SodespatchlinesController.php
@@ -953,6 +953,8 @@ public function printDespatchNote($status = 'generate')
         $extra['company_details']['tel'] = 'Tel  : ' . $this->getContactDetails('T');
         $extra['company_details']['fax'] = 'Fax  : ' . $this->getContactDetails('F');
         $extra['company_details']['email'] = 'email: ' . $this->getContactDetails('E');
+        $extra['company_details']['co_additonal_text1'] = $this->getCompanyDetails()['co_additonal_text1'];
+        $extra['company_details']['co_additonal_text1'] = $this->getCompanyDetails()['co_additonal_text2'];
 
         // get the despatch location
         $extra['despatch_location'] = implode(',', $order->despatch_from->rules_list('from_location'));
@@ -981,6 +983,9 @@ public function printDespatchNote($status = 'generate')
         $delivery_address += $this->formatAddress($customer->getDeliveryAddress($order->del_address_id));
         $extra['delivery_address'] = $delivery_address;
 
+        $extra['additional_text1'] = $customer->customerdetail->companydetail->text1;
+        $extra['additional_text2'] = $customer->customerdetail->companydetail->text2;
+
         // generate the xml and add it to the options array
         $options['xmlSource'] = $this->generate_xml(array(
             'model' => array(

diff --git a/modules/public_pages/erp/invoicing/sales_invoicing/controllers/SinvoicesController.php b/modules/public_pages/erp/invoicing/sales_invoicing/controllers/SinvoicesController.php
@@ -1317,6 +1317,9 @@ public function printInvoice($status = 'generate')
             $extra['tax_description'] = $invoice->customerdetail->companydetail->tax_description;
             $extra['vatnumber'] = $invoice->customerdetail->companydetail->vatnumber;
 
+            $extra['additional_text1'] = $invoice->customerdetail->companydetail->text1;
+            $extra['additional_text2'] = $invoice->customerdetail->companydetail->text2;
+
             // get Sales Invoice Notes for default customer or first in customer
             $note = DataObjectFactory::Factory('PartyNote');
             $party_id = $invoice->customerdetail->companydetail->party_id;