From 316007a1fa9cb1fd6d11460326160d4a60a0d943 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Wed, 30 Sep 2020 19:51:36 +0200 Subject: [PATCH] [0005170] Fixed Assets Purchase: fixed error on items with long description, removed sparse fields edition in Fixed Assets. --- inventory/manage/items.php | 15 +++++++-------- inventory/purchasing_data.php | 2 +- purchasing/includes/purchasing_db.inc | 2 ++ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/inventory/manage/items.php b/inventory/manage/items.php index f99bc474..e76f8b08 100644 --- a/inventory/manage/items.php +++ b/inventory/manage/items.php @@ -213,7 +213,7 @@ if (isset($_POST['addupdate'])) $_POST['depreciation_rate'] = 0; } $move_row = get_fixed_asset_move($_POST['NewStockID'], ST_SUPPRECEIVE); - if (isset($_POST['depreciation_start']) && strtotime($_POST['depreciation_start']) < strtotime($move_row['tran_date'])) { + if ($move_row && isset($_POST['depreciation_start']) && strtotime($_POST['depreciation_start']) < strtotime($move_row['tran_date'])) { display_warning(_('The depracation cannot start before the fixed asset purchase date')); } } @@ -390,14 +390,12 @@ function item_settings(&$stock_id, $new_item) stock_units_list_row(_('Units of Measure:'), 'units', null, $fresh_item); - check_row(_("Editable description:"), 'editable'); - if (get_post('fixed_asset')) - hidden('no_sale', 0); - else + if (!get_post('fixed_asset')) { + check_row(_("Editable description:"), 'editable'); check_row(_("Exclude from sales:"), 'no_sale'); - - check_row(_("Exclude from purchases:"), 'no_purchase'); + check_row(_("Exclude from purchases:"), 'no_purchase'); + } if (get_post('fixed_asset')) { table_section_title(_("Depreciation")); @@ -490,7 +488,8 @@ function item_settings(&$stock_id, $new_item) // Add Image upload for New Item - by Joe $stock_img_link = ""; $check_remove_image = false; - if (isset($_POST['NewStockID']) && file_exists(company_path().'/images/' + + if (@$_POST['NewStockID'] && file_exists(company_path().'/images/' .item_img_name($_POST['NewStockID']).".jpg")) { // 31/08/08 - rand() call is necessary here to avoid caching problems. diff --git a/inventory/purchasing_data.php b/inventory/purchasing_data.php index 43cb467e..84b1603e 100644 --- a/inventory/purchasing_data.php +++ b/inventory/purchasing_data.php @@ -219,7 +219,7 @@ if (!isset($_POST['conversion_factor']) || $_POST['conversion_factor'] == "") $_POST['conversion_factor'] = maxprec_format(1); } amount_row(_("Conversion Factor (to our UOM):"), 'conversion_factor', null, null, null, 'max'); -text_row(_("Supplier's Code or Description:"), 'supplier_description', null, 50, 51); +text_row(_("Supplier's Code or Description:"), 'supplier_description', null, 50, 50); end_table(1); diff --git a/purchasing/includes/purchasing_db.inc b/purchasing/includes/purchasing_db.inc index fe174800..fbef5291 100644 --- a/purchasing/includes/purchasing_db.inc +++ b/purchasing/includes/purchasing_db.inc @@ -95,6 +95,8 @@ function get_purchase_data($supplier_id, $stock_id) function add_or_update_purchase_data($supplier_id, $stock_id, $price, $description="", $uom="") { $data = get_purchase_data($supplier_id, $stock_id); + + $description = substr($description, 0, 50); // FIXME: temporary constraint to avoid db errors on long descriptions, see [0005170] if ($data === false) { $sql = "INSERT INTO ".TB_PREF."purch_data (supplier_id, stock_id, price, suppliers_uom, -- 2.30.2