Skip to content

Commit

Permalink
Fix: CRLF
Browse files Browse the repository at this point in the history
  • Loading branch information
rdoursenaud committed May 26, 2014
1 parent 2c4a152 commit 12fed4f
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
Expand Up @@ -176,7 +176,7 @@ function verif($db, &$code, $product, $thirdparty_type, $type)
{
global $conf;

//var_dump($code.' '.$product->ref.' '.$thirdparty_type);exit;
//var_dump($code.' '.$product->ref.' '.$thirdparty_type);exit;

require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';

Expand Down
42 changes: 21 additions & 21 deletions htdocs/product/fiche.php
Expand Up @@ -208,18 +208,18 @@
$object->barcode_type = GETPOST('fk_barcode_type');
$object->barcode = GETPOST('barcode');
// Set barcode_type_xxx from barcode_type id
$stdobject=new GenericObject($db);
$stdobject=new GenericObject($db);
$stdobject->element='product';
$stdobject->barcode_type=GETPOST('fk_barcode_type');
$result=$stdobject->fetch_barcode();
if ($result < 0)
{
$error++;
setEventMessage('Failed to get bar code type information '.$stdobject->error, 'errors');
}
$stdobject->barcode_type=GETPOST('fk_barcode_type');
$result=$stdobject->fetch_barcode();
if ($result < 0)
{
$error++;
setEventMessage('Failed to get bar code type information '.$stdobject->error, 'errors');
}
$object->barcode_type_code = $stdobject->barcode_type_code;
$object->barcode_type_coder = $stdobject->barcode_type_coder;
$object->barcode_type_label = $stdobject->barcode_type_label;
$object->barcode_type_label = $stdobject->barcode_type_label;

$object->description = dol_htmlcleanlastbr(GETPOST('desc'));
$object->url = GETPOST('url');
Expand Down Expand Up @@ -321,19 +321,19 @@

$object->barcode_type = GETPOST('fk_barcode_type');
$object->barcode = GETPOST('barcode');
// Set barcode_type_xxx from barcode_type id
// Set barcode_type_xxx from barcode_type id
$stdobject=new GenericObject($db);
$stdobject->element='product';
$stdobject->barcode_type=GETPOST('fk_barcode_type');
$result=$stdobject->fetch_barcode();
if ($result < 0)
{
$error++;
setEventMessage('Failed to get bar code type information '.$stdobject->error, 'errors');
}
$object->barcode_type_code = $stdobject->barcode_type_code;
$object->barcode_type_coder = $stdobject->barcode_type_coder;
$object->barcode_type_label = $stdobject->barcode_type_label;
$stdobject->element='product';
$stdobject->barcode_type=GETPOST('fk_barcode_type');
$result=$stdobject->fetch_barcode();
if ($result < 0)
{
$error++;
setEventMessage('Failed to get bar code type information '.$stdobject->error, 'errors');
}
$object->barcode_type_code = $stdobject->barcode_type_code;
$object->barcode_type_coder = $stdobject->barcode_type_coder;
$object->barcode_type_label = $stdobject->barcode_type_label;

$object->accountancy_code_sell = GETPOST('accountancy_code_sell');
$object->accountancy_code_buy = GETPOST('accountancy_code_buy');
Expand Down

0 comments on commit 12fed4f

Please sign in to comment.