lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: CRLF

Browse Source
This commit is contained in:
Raphaël Doursenaud 2014-05-26 12:32:33 +02:00
parent 2c4a152823
commit 12fed4f4d7
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/modules/barcode/mod_barcode_product_standard.php
View File

@ -176,7 +176,7 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
{ {
global $conf; 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'; require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';

42
htdocs/product/fiche.php
View File

@ -208,18 +208,18 @@ if (empty($reshook))
$object->barcode_type = GETPOST('fk_barcode_type'); $object->barcode_type = GETPOST('fk_barcode_type');
$object->barcode = GETPOST('barcode'); $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=new GenericObject($db);
$stdobject->element='product'; $stdobject->element='product';
$stdobject->barcode_type=GETPOST('fk_barcode_type'); $stdobject->barcode_type=GETPOST('fk_barcode_type');
$result=$stdobject->fetch_barcode(); $result=$stdobject->fetch_barcode();
if ($result < 0) if ($result < 0)
{ {
$error++; $error++;
setEventMessage('Failed to get bar code type information '.$stdobject->error, 'errors'); setEventMessage('Failed to get bar code type information '.$stdobject->error, 'errors');
} }
$object->barcode_type_code = $stdobject->barcode_type_code; $object->barcode_type_code = $stdobject->barcode_type_code;
$object->barcode_type_coder = $stdobject->barcode_type_coder; $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->description = dol_htmlcleanlastbr(GETPOST('desc'));
$object->url = GETPOST('url'); $object->url = GETPOST('url');
@ -321,19 +321,19 @@ if (empty($reshook))
$object->barcode_type = GETPOST('fk_barcode_type'); $object->barcode_type = GETPOST('fk_barcode_type');
$object->barcode = GETPOST('barcode'); $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=new GenericObject($db);
$stdobject->element='product'; $stdobject->element='product';
$stdobject->barcode_type=GETPOST('fk_barcode_type'); $stdobject->barcode_type=GETPOST('fk_barcode_type');
$result=$stdobject->fetch_barcode(); $result=$stdobject->fetch_barcode();
if ($result < 0) if ($result < 0)
{ {
$error++; $error++;
setEventMessage('Failed to get bar code type information '.$stdobject->error, 'errors'); setEventMessage('Failed to get bar code type information '.$stdobject->error, 'errors');
} }
$object->barcode_type_code = $stdobject->barcode_type_code; $object->barcode_type_code = $stdobject->barcode_type_code;
$object->barcode_type_coder = $stdobject->barcode_type_coder; $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->accountancy_code_sell = GETPOST('accountancy_code_sell'); $object->accountancy_code_sell = GETPOST('accountancy_code_sell');
$object->accountancy_code_buy = GETPOST('accountancy_code_buy'); $object->accountancy_code_buy = GETPOST('accountancy_code_buy');