From b5f67d3dffd993ad74f63a04ad33ed2ff4bd61a6 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Sat, 13 Jun 2020 09:19:44 +0200 Subject: [PATCH] Print Long Item Description on Invoice. Feature. Company Setup Flag. --- admin/company_preferences.php | 9 ++++++++- reporting/rep107.php | 5 +++++ sales/includes/db/cust_trans_details_db.inc | 3 ++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/admin/company_preferences.php b/admin/company_preferences.php index 8090d18e..77742403 100644 --- a/admin/company_preferences.php +++ b/admin/company_preferences.php @@ -137,7 +137,7 @@ if (isset($_POST['update']) && $_POST['update'] != "") 'postal_address','phone', 'fax', 'email', 'coy_logo', 'domicile', 'use_dimension', 'curr_default', 'f_year', 'shortname_name_in_list', 'no_item_list' => 0, 'no_customer_list' => 0, 'no_supplier_list' => 0, - 'base_sales', 'ref_no_auto_increase' => 0, 'dim_on_recurrent_invoice' => 0, + 'base_sales', 'ref_no_auto_increase' => 0, 'dim_on_recurrent_invoice' => 0, 'long_description_invoice' => 0, 'time_zone' => 0, 'company_logo_report' => 0, 'barcodes_on_stock' => 0, 'print_dialog_direct' => 0, 'add_pct', 'round_to', 'login_tout', 'auto_curr_reval', 'bcc_email', 'alternative_tax_include_on_docs', 'suppress_tax_rates', 'use_manufacturing', 'use_fixed_assets')) @@ -209,6 +209,12 @@ if (!isset($myrow["dim_on_recurrent_invoice"])) $myrow["dim_on_recurrent_invoice"] = get_company_pref("dim_on_recurrent_invoice"); } $_POST['dim_on_recurrent_invoice'] = $myrow["dim_on_recurrent_invoice"]; +if (!isset($myrow["long_description_invoice"])) +{ + set_company_pref("long_description_invoice", "setup.company", "tinyint", 1, '0'); + $myrow["long_description_invoice"] = get_company_pref("long_description_invoice"); +} +$_POST['long_description_invoice'] = $myrow["long_description_invoice"]; $_POST['version_id'] = $myrow["version_id"]; $_POST['add_pct'] = $myrow['add_pct']; $_POST['login_tout'] = $myrow['login_tout']; @@ -251,6 +257,7 @@ check_row(_("Company Logo on Reports"), 'company_logo_report', $_POST['company_l check_row(_("Use Barcodes on Stocks"), 'barcodes_on_stock', $_POST['barcodes_on_stock']); check_row(_("Auto Increase of Document References"), 'ref_no_auto_increase', $_POST['ref_no_auto_increase']); check_row(_("Use Dimensions on Recurrent Invoices"), 'dim_on_recurrent_invoice', $_POST['dim_on_recurrent_invoice']); +check_row(_("Use Long Descriptions on Invoices"), 'long_description_invoice', $_POST['long_description_invoice']); label_row(_("Database Scheme Version"), $_POST['version_id']); table_section(2); diff --git a/reporting/rep107.php b/reporting/rep107.php index 580e3abe..c1ff7c48 100644 --- a/reporting/rep107.php +++ b/reporting/rep107.php @@ -163,6 +163,11 @@ function print_invoices() $rep->TextCol($c++, $c, $myrow2['stock_id'], -2); $oldrow = $rep->row; $rep->TextColLines($c++, $c, $myrow2['StockDescription'], -2); + if (!empty($SysPrefs->prefs['long_description_invoice']) && !empty($myrow2['StockLongDescription'])) + { + $c--; + $rep->TextColLines($c++, $c, $myrow2['StockLongDescription'], -2); + } $newrow = $rep->row; $rep->row = $oldrow; if ($Net != 0.0 || !is_service($myrow2['mb_flag']) || !$SysPrefs->no_zero_lines_amount()) diff --git a/sales/includes/db/cust_trans_details_db.inc b/sales/includes/db/cust_trans_details_db.inc index b4b93314..f3422624 100644 --- a/sales/includes/db/cust_trans_details_db.inc +++ b/sales/includes/db/cust_trans_details_db.inc @@ -19,7 +19,8 @@ if (!is_array($debtor_trans_no)) $sql = "SELECT line.*, line.unit_price+line.unit_tax AS FullUnitPrice, line.unit_price AS UnitPriceExTax, - line.description As StockDescription, + line.description AS StockDescription, + item.long_description AS StockLongDescription, item.units, item.mb_flag FROM " .TB_PREF."debtor_trans_details line," -- 2.30.2