diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php index 3b5fa5d3189..f09a526b327 100644 --- a/htdocs/categories/card.php +++ b/htdocs/categories/card.php @@ -1,9 +1,9 @@ - * Copyright (C) 2006-2011 Laurent Destailleur - * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2007 Patrick Raguin - * Copyright (C) 2013 Florian Henry +/* Copyright (C) 2005 Matthieu Valleton + * Copyright (C) 2006-2011 Laurent Destailleur + * Copyright (C) 2005-2014 Regis Houssin + * Copyright (C) 2007 Patrick Raguin + * Copyright (C) 2013 Florian Henry * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -116,7 +116,7 @@ if ($action == 'add' && $user->rights->categorie->creer) } } - + $object->label = $label; $object->description = dol_htmlcleanlastbr($description); @@ -125,7 +125,7 @@ if ($action == 'add' && $user->rights->categorie->creer) $object->type = $type; if ($parent != "-1") $object->fk_parent = $parent; - + $ret = $extrafields->setOptionalsFromPost($extralabels,$object); if (! $object->label) @@ -243,6 +243,7 @@ if ($user->rights->categorie->creer) print $form->select_all_categories($type, $catorigin); print ''; + $parameters=array(); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook if (empty($reshook)) { diff --git a/htdocs/product/card.php b/htdocs/product/card.php index 28b0db5efe9..856d4a477fb 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -1,16 +1,16 @@ - * Copyright (C) 2004-2014 Laurent Destailleur - * Copyright (C) 2005 Eric Seigne - * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2006 Andre Cianfarani - * Copyright (C) 2006 Auguria SARL - * Copyright (C) 2010-2014 Juanjo Menent - * Copyright (C) 2013-2014 Marcos García - * Copyright (C) 2013 Cédric Salvador - * Copyright (C) 2011-2014 Alexandre Spangaro - * Copyright (C) 2014 Cédric Gross - * Copyright (C) 2014 Ferran Marcet +/* Copyright (C) 2001-2007 Rodolphe Quiedeville + * Copyright (C) 2004-2014 Laurent Destailleur + * Copyright (C) 2005 Eric Seigne + * Copyright (C) 2005-2014 Regis Houssin + * Copyright (C) 2006 Andre Cianfarani + * Copyright (C) 2006 Auguria SARL + * Copyright (C) 2010-2014 Juanjo Menent + * Copyright (C) 2013-2014 Marcos García + * Copyright (C) 2013 Cédric Salvador + * Copyright (C) 2011-2014 Alexandre Spangaro + * Copyright (C) 2014 Cédric Gross + * Copyright (C) 2014 Ferran Marcet * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -48,7 +48,7 @@ $langs->load("products"); $langs->load("other"); if (! empty($conf->stock->enabled)) $langs->load("stocks"); if (! empty($conf->facture->enabled)) $langs->load("bills"); -if ($conf->productbatch->enabled) $langs->load("productbatch"); +if (! empty($conf->productbatch->enabled)) $langs->load("productbatch"); $mesg=''; $error=0; $errors=array(); $_error=0; @@ -863,7 +863,7 @@ else print ''; // Batch number management - if ($conf->productbatch->enabled) + if (! empty($conf->productbatch->enabled)) { print ''.$langs->trans("Status").' ('.$langs->trans("Batch").')'; $statutarray=array('0' => $langs->trans("ProductStatusNotOnBatch"), '1' => $langs->trans("ProductStatusOnBatch")); diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 13a6d1dfa41..e78daeba631 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -1,15 +1,15 @@ - * Copyright (C) 2004-2014 Laurent Destailleur - * Copyright (C) 2005-2013 Regis Houssin - * Copyright (C) 2006 Andre Cianfarani - * Copyright (C) 2007-2011 Jean Heimburger - * Copyright (C) 2010-2013 Juanjo Menent - * Copyright (C) 2013-2014 Cedric GROSS - * Copyright (C) 2013-2014 Marcos García - * Copyright (C) 2011-2014 Alexandre Spangaro - * Copyright (C) 2014 Henry Florian - * Copyright (C) 2014 Philippe Grand +/* Copyright (C) 2001-2007 Rodolphe Quiedeville + * Copyright (C) 2004-2014 Laurent Destailleur + * Copyright (C) 2005-2014 Regis Houssin + * Copyright (C) 2006 Andre Cianfarani + * Copyright (C) 2007-2011 Jean Heimburger + * Copyright (C) 2010-2013 Juanjo Menent + * Copyright (C) 2013-2014 Cedric GROSS + * Copyright (C) 2013-2014 Marcos García + * Copyright (C) 2011-2014 Alexandre Spangaro + * Copyright (C) 2014 Henry Florian + * Copyright (C) 2014 Philippe Grand * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -2856,7 +2856,7 @@ class Product extends CommonObject { global $langs; $langs->load('products'); - if ($conf->productbatch->enabled) $langs->load("productbatch"); + if (!empty($conf->productbatch->enabled)) $langs->load("productbatch"); if ($type == 2) { diff --git a/htdocs/product/index.php b/htdocs/product/index.php index fb2830e9e57..3e18cc5d042 100644 --- a/htdocs/product/index.php +++ b/htdocs/product/index.php @@ -1,8 +1,8 @@ - * Copyright (C) 2004-2011 Laurent Destailleur - * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2014 Charles-Fr BENKE +/* Copyright (C) 2001-2006 Rodolphe Quiedeville + * Copyright (C) 2004-2011 Laurent Destailleur + * Copyright (C) 2005-2014 Regis Houssin + * Copyright (C) 2014 Charles-Fr BENKE * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -367,7 +367,8 @@ function activitytrim($product_type) $result = $db->query($sql); if ($result) { - $tmpyear=$beginyear; + //$tmpyear=$beginyear; // FIXME $beginyear is not defined + $tmpyear=0; $trim1=0; $trim2=0; $trim3=0; diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php index 01d5516a480..b95fe58d752 100644 --- a/htdocs/product/stock/card.php +++ b/htdocs/product/stock/card.php @@ -1,8 +1,8 @@ - * Copyright (C) 2004-2011 Laurent Destailleur - * Copyright (C) 2005 Simon Tosser - * Copyright (C) 2005-2009 Regis Houssin +/* Copyright (C) 2003-2006 Rodolphe Quiedeville + * Copyright (C) 2004-2011 Laurent Destailleur + * Copyright (C) 2005 Simon Tosser + * Copyright (C) 2005-2014 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -36,6 +36,8 @@ $langs->load("stocks"); $langs->load("companies"); $action=GETPOST('action'); +$cancel=GETPOST('cancel'); +$confirm=GETPOST('confirm'); $sortfield = GETPOST("sortfield",'alpha'); $sortorder = GETPOST("sortorder",'alpha'); @@ -59,17 +61,17 @@ if ($action == 'add' && $user->rights->stock->creer) { $object = new Entrepot($db); - $object->ref = $_POST["ref"]; - $object->libelle = $_POST["libelle"]; - $object->description = $_POST["desc"]; - $object->statut = $_POST["statut"]; - $object->lieu = $_POST["lieu"]; - $object->address = $_POST["address"]; - $object->zip = $_POST["zipcode"]; - $object->town = $_POST["town"]; - $object->country_id = $_POST["country_id"]; + $object->ref = GETPOST("ref"); + $object->libelle = GETPOST("libelle"); + $object->description = GETPOST("desc"); + $object->statut = GETPOST("statut"); + $object->lieu = GETPOST("lieu"); + $object->address = GETPOST("address"); + $object->zip = GETPOST("zipcode"); + $object->town = GETPOST("town"); + $object->country_id = GETPOST("country_id"); - if ($object->libelle) { + if (! empty($object->libelle)) { $id = $object->create($user); if ($id > 0) { @@ -87,7 +89,7 @@ if ($action == 'add' && $user->rights->stock->creer) } // Delete warehouse -if ($action == 'confirm_delete' && $_REQUEST["confirm"] == 'yes' && $user->rights->stock->supprimer) +if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->stock->supprimer) { $object = new Entrepot($db); $object->fetch($_REQUEST["id"]); @@ -105,19 +107,19 @@ if ($action == 'confirm_delete' && $_REQUEST["confirm"] == 'yes' && $user->right } // Modification entrepot -if ($action == 'update' && $_POST["cancel"] <> $langs->trans("Cancel")) +if ($action == 'update' && $cancel <> $langs->trans("Cancel")) { $object = new Entrepot($db); if ($object->fetch($id)) { - $object->libelle = $_POST["libelle"]; - $object->description = $_POST["desc"]; - $object->statut = $_POST["statut"]; - $object->lieu = $_POST["lieu"]; - $object->address = $_POST["address"]; - $object->zip = $_POST["zipcode"]; - $object->town = $_POST["town"]; - $object->country_id = $_POST["country_id"]; + $object->libelle = GETPOST("libelle"); + $object->description = GETPOST("desc"); + $object->statut = GETPOST("statut"); + $object->lieu = GETPOST("lieu"); + $object->address = GETPOST("address"); + $object->zip = GETPOST("zipcode"); + $object->town = GETPOST("town"); + $object->country_id = GETPOST("country_id"); if ( $object->update($id, $user) > 0) { @@ -136,7 +138,7 @@ if ($action == 'update' && $_POST["cancel"] <> $langs->trans("Cancel")) } } -if ($_POST["cancel"] == $langs->trans("Cancel")) +if ($cancel == $langs->trans("Cancel")) { $action = ''; } @@ -162,37 +164,36 @@ if ($action == 'create') print "
\n"; print ''; print ''; - print ''."\n"; print ''; // Ref print ''; - print ''; + print ''; // Description print ''; print ''; // Zip / Town print ''; // Country print ''; diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php index 0d7b3c60c23..85fb7c1896d 100644 --- a/htdocs/product/stock/list.php +++ b/htdocs/product/stock/list.php @@ -1,7 +1,7 @@ - * Copyright (C) 2004-2014 Laurent Destailleur - * Copyright (C) 2005-2009 Regis Houssin +/* Copyright (C) 2001-2004 Rodolphe Quiedeville + * Copyright (C) 2004-2014 Laurent Destailleur + * Copyright (C) 2005-2014 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -39,7 +39,7 @@ $sortfield = GETPOST("sortfield"); $sortorder = GETPOST("sortorder"); if (! $sortfield) $sortfield="e.label"; if (! $sortorder) $sortorder="ASC"; -$page = $_GET["page"]; +$page = GETPOST("page"); if ($page < 0) $page = 0; $limit = $conf->liste_limit; $offset = $limit * $page; diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php index 87fec698274..8a0b7297e2f 100644 --- a/htdocs/product/stock/massstockmove.php +++ b/htdocs/product/stock/massstockmove.php @@ -1,5 +1,6 @@ +/* Copyright (C) 2013 Laurent Destaileur + * Copyright (C) 2014 Regis Houssin * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -228,7 +229,7 @@ $warehousestatict = new Entrepot($db); $title = $langs->trans('MassMovement'); -llxHeader('', $title, $helpurl, ''); +llxHeader('', $title); print_fiche_titre($langs->trans("MassStockMovement")).'

'; @@ -249,6 +250,8 @@ print ''; print '
'.$langs->trans("Ref").'
'.$langs->trans("LocationSummary").'
'.$langs->trans("LocationSummary").'
'.$langs->trans("Description").''; // Editeur wysiwyg require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; - $doleditor=new DolEditor('desc',$object->description,'',180,'dolibarr_notes','In',false,true,$conf->fckeditor->enabled,5,70); + $doleditor=new DolEditor('desc',(!empty($object->description)?$object->description:''),'',180,'dolibarr_notes','In',false,true,$conf->fckeditor->enabled,5,70); $doleditor->Create(); print '
'.$langs->trans('Address').'
'.$langs->trans('Zip').''; - print $formcompany->select_ziptown($object->zip,'zipcode',array('town','selectcountry_id','state_id'),6); + print $formcompany->select_ziptown((!empty($object->zip)?$object->zip:''),'zipcode',array('town','selectcountry_id','state_id'),6); print ''.$langs->trans('Town').''; - print $formcompany->select_ziptown($object->town,'town',array('zipcode','selectcountry_id','state_id')); + print $formcompany->select_ziptown((!empty($object->town)?$object->town:''),'town',array('zipcode','selectcountry_id','state_id')); print '
'.$langs->trans('Country').''; - print $form->select_country($object->country_id?$object->country_id:$mysoc->country_code,'country_id'); + print $form->select_country((!empty($object->country_id)?$object->country_id:$mysoc->country_code),'country_id'); if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1); print '
'; //print '
'; +$param=''; + print '
'; print getTitleFieldOfList($langs->trans('ProductRef'),0,$_SERVER["PHP_SELF"],'',$param,'','class="tagtd"',$sortfield,$sortorder); print getTitleFieldOfList($langs->trans('WarehouseSource'),0,$_SERVER["PHP_SELF"],'',$param,'','class="tagtd"',$sortfield,$sortorder); diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index 2feeee7aa2d..50b46c7003f 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -1,7 +1,7 @@ - * Copyright (C) 2004-2013 Laurent Destailleur - * Copyright (C) 2005-2009 Regis Houssin +/* Copyright (C) 2001-2006 Rodolphe Quiedeville + * Copyright (C) 2004-2013 Laurent Destailleur + * Copyright (C) 2005-2014 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -406,8 +406,8 @@ if ($resql) if ($search_product_ref) $param.='&search_product_ref='.urlencode($search_product_ref); if ($search_product) $param.='&search_product='.urlencode($search_product); if ($search_warehouse) $param.='&search_warehouse='.urlencode($search_warehouse); - if ($sref) $param.='&sref='.urlencode($sref); - if ($snom) $param.='&snom='.urlencode($snom); + if (!empty($sref)) $param.='&sref='.urlencode($sref); // FIXME $sref is not defined + if (!empty($snom)) $param.='&snom='.urlencode($snom); // FIXME $snom is not defined if ($search_user) $param.='&search_user='.urlencode($search_user); if ($idproduct > 0) $param.='&idproduct='.$idproduct; if ($id) print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num,0,''); diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php index 04a1cf32e60..6482413a6a7 100644 --- a/htdocs/product/stock/replenish.php +++ b/htdocs/product/stock/replenish.php @@ -1,6 +1,7 @@ - * Copyright (C) 2013-2014 Laurent Destaileur +/* Copyright (C) 2013 Cédric Salvador + * Copyright (C) 2013-2014 Laurent Destaileur + * Copyright (C) 2014 Regis Houssin * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -50,6 +51,9 @@ $tobuy = GETPOST('tobuy', 'int'); $salert = GETPOST('salert', 'alpha'); $mode = GETPOST('mode','alpha'); +$fourn_id = GETPOST('mode','int'); // FIXME $fourn_id is not defined +$texte = ''; // FIXME $texte is not defined + $sortfield = GETPOST('sortfield','alpha'); $sortorder = GETPOST('sortorder','alpha'); $page = GETPOST('page','int'); @@ -197,7 +201,7 @@ if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || ! empty($conf->global $usevirtualstock=-1; if ($virtualdiffersfromphysical) { - $usevirtualstock=($conf->global->STOCK_USE_VIRTUAL_STOCK?1:0); + $usevirtualstock=(! empty($conf->global->STOCK_USE_VIRTUAL_STOCK)?1:0); if ($mode=='virtual') $usevirtualstock=1; if ($mode=='physical') $usevirtualstock=0; } @@ -426,7 +430,7 @@ print ''. if (!empty($conf->service->enabled) && $type == 1) print ''; print ''. ''. - ''. + ''. ''. ''. '
   ' . $langs->trans('AlertOnly') . ' ' . $langs->trans('AlertOnly') . '   '. diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php index d0b0d5d4f53..07aa68a7a98 100644 --- a/htdocs/product/stock/replenishorders.php +++ b/htdocs/product/stock/replenishorders.php @@ -1,6 +1,7 @@ + * Copyright (C) 2013 Cédric Salvador + * Copyright (C) 2014 Regis Houssin * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -44,8 +45,7 @@ $result=restrictedArea($user,'produit|service'); * View */ -$helpurl = 'EN:Module_Stocks_En|FR:Module_Stock|'; -$helpurl .= 'ES:Módulo_Stocks'; +$helpurl = 'EN:Module_Stocks_En|FR:Module_Stock|ES:Módulo_Stocks'; $texte = $langs->trans('ReplenishmentOrders'); llxHeader('', $texte, $helpurl, ''); @@ -132,7 +132,7 @@ if ($sall) { $sql .= ' AND (cf.ref LIKE "%' . $db->escape($sall) . '%" '; $sql .= 'OR cf.note LIKE "%' . $db->escape($sall) . '%")'; } -if ($socid) { +if (!empty($socid)) { $sql .= ' AND s.rowid = ' . $socid; }