diff --git a/dev/examples/create_product.php b/dev/examples/create_product.php index cdb6cdae9e2..6ecce081d45 100755 --- a/dev/examples/create_product.php +++ b/dev/examples/create_product.php @@ -66,7 +66,7 @@ $myproduct=new Product($db); // Definition of product instance properties $myproduct->ref = '1234'; -$myproduct->libelle = 'libelle'; +$myproduct->label = 'label'; $myproduct->price = '10'; $myproduct->price_base_type = 'HT'; $myproduct->tva_tx = '19.6'; diff --git a/dev/initdata/generate-produit.php b/dev/initdata/generate-produit.php index 38ea93f131b..6e7ea6dd05f 100755 --- a/dev/initdata/generate-produit.php +++ b/dev/initdata/generate-produit.php @@ -88,7 +88,7 @@ for ($s = 0 ; $s < GEN_NUMBER_PRODUIT ; $s++) $produit->type = rand(0,1); $produit->status = 1; $produit->ref = ($produit->type?'S':'P').time().$s; - $produit->libelle = 'Label '.time().$s; + $produit->label = 'Label '.time().$s; $produit->description = 'Description '.time().$s; $produit->price = rand(1,1000); $produit->tva_tx = "19.6"; diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index 1cd605ea9ca..0dc404ac3d1 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -357,7 +357,7 @@ else if ($id || $ref) print ''; // Label - print ''.$langs->trans("Label").''.$product->libelle.''; + print ''.$langs->trans("Label").''.$product->label.''; print ''; // Status (to sell) diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php index 32bc33938f5..c3acb807e01 100644 --- a/htdocs/categories/edit.php +++ b/htdocs/categories/edit.php @@ -37,7 +37,7 @@ $action=GETPOST('action'); $confirm=GETPOST('confirm'); $socid=GETPOST('socid','int'); -$nom=GETPOST('nom'); +$label=GETPOST('label'); $description=GETPOST('description'); $visible=GETPOST('visible'); $parent=GETPOST('parent'); @@ -66,7 +66,7 @@ if ($action == 'update' && $user->rights->categorie->creer) $categorie = new Categorie($db); $result=$categorie->fetch($id); - $categorie->label = $nom; + $categorie->label = $label; $categorie->description = dol_htmlcleanlastbr($description); $categorie->socid = ($socid ? $socid : 'null'); $categorie->visible = $visible; @@ -138,13 +138,13 @@ print ''; // Ref print ''; -print ''; // Description print ''; -print ''; -print ''; +print '\n"; - print '\n"; + print '\n"; // Link to delete from category print ''; print '
'; print $langs->trans("Ref").''; +print ''; print '
'.$langs->trans("Description").''; +print ''.$langs->trans("Description").''; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor('description',$object->description,'',200,'dolibarr_notes','',false,true,$conf->fckeditor->enabled,ROWS_6,50); $doleditor->Create(); diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index 31580e28be8..a1c544f338b 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -327,7 +327,7 @@ if ($object->type == 0) print ''; print $prod->getNomUrl(1,'category'); print "'.$prod->libelle."'.$prod->label."'; $typeid=$object->type; diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index ad26b0c409d..bb0f8353709 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -1402,7 +1402,7 @@ class Commande extends CommonOrder $line->localtax1_tx=$localtax1_tx; $line->localtax2_tx=$localtax2_tx; $line->ref=$prod->ref; - $line->libelle=$prod->libelle; + $line->libelle=$prod->label; $line->product_desc=$prod->description; $line->fk_unit=$prod->fk_unit; diff --git a/htdocs/core/lib/categories.lib.php b/htdocs/core/lib/categories.lib.php index 4d020526e44..f03a313ce2a 100644 --- a/htdocs/core/lib/categories.lib.php +++ b/htdocs/core/lib/categories.lib.php @@ -34,6 +34,7 @@ function categories_prepare_head($object,$type) global $langs, $conf, $user; $langs->load("categories"); + $langs->load("products"); $h = 0; $head = array(); diff --git a/htdocs/core/modules/export/export_excel.modules.php b/htdocs/core/modules/export/export_excel.modules.php index e5281150296..734b38f601a 100644 --- a/htdocs/core/modules/export/export_excel.modules.php +++ b/htdocs/core/modules/export/export_excel.modules.php @@ -190,7 +190,7 @@ class ExportExcel extends ModeleExports return -1; } } - + if (!empty($conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR)) { $cacheMethod = PHPExcel_CachedObjectStorageFactory::cache_to_discISAM; $cacheSettings = array ( @@ -426,7 +426,7 @@ class ExportExcel extends ModeleExports $this->workbook->disconnectWorksheets(); unset($this->workbook); } - return 0; + return 1; } diff --git a/htdocs/core/modules/export/export_excel2007.modules.php b/htdocs/core/modules/export/export_excel2007.modules.php index bf70c30ab1c..4f37a2e323e 100644 --- a/htdocs/core/modules/export/export_excel2007.modules.php +++ b/htdocs/core/modules/export/export_excel2007.modules.php @@ -95,7 +95,7 @@ class ExportExcel2007 extends ExportExcel $this->workbook->disconnectWorksheets(); unset($this->workbook); } - return 0; + return 1; } } diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index 4b565069b5c..c1b0262fd40 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -992,7 +992,7 @@ if ($step == 4 && $datatoexport) if ($step == 5 && $datatoexport) { - asort($array_selected); + asort($array_selected); llxHeader('',$langs->trans("NewExport"),'EN:Module_Exports_En|FR:Module_Exports|ES:Módulo_Exportaciones'); @@ -1142,6 +1142,7 @@ if ($step == 5 && $datatoexport) print ' 
'; + } print '
'; @@ -1150,6 +1151,8 @@ llxFooter(); $db->close(); +exit; // don't know why but apache hangs with php 5.3.10-1ubuntu3.12 and apache 2.2.2 if i remove this exit or replace with return + /** * Return table name of an alias. For this, we look for the "tablename as alias" in sql string. @@ -1172,4 +1175,3 @@ function getablenamefromfield($code,$sqlmaxforexport) } else return ''; } - diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 725cd35a6cb..45670766788 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -317,7 +317,7 @@ if (empty($reshook)) { $res=$productsupplier->fetch($idprod); - $label = $productsupplier->libelle; + $label = $productsupplier->label; $desc = $productsupplier->description; if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc); diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index 01574caa2b2..1794c34a48d 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -690,7 +690,7 @@ if (empty($reshook)) { $result=$productsupplier->fetch($idprod); - $label = $productsupplier->libelle; + $label = $productsupplier->label; $desc = $productsupplier->description; if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc); diff --git a/htdocs/fourn/product/categorie.php b/htdocs/fourn/product/categorie.php index 448cf19e61e..ef07b730a97 100644 --- a/htdocs/fourn/product/categorie.php +++ b/htdocs/fourn/product/categorie.php @@ -115,7 +115,7 @@ if ($_GET["id"]) print ""; print ''.$langs->trans("Ref").''.$product->ref.''; - print ''.$langs->trans("Label").''.$product->libelle.''; + print ''.$langs->trans("Label").''.$product->label.''; print "
\n"; $c = new Categorie($db); diff --git a/htdocs/fourn/product/photos.php b/htdocs/fourn/product/photos.php index f20c360de6c..ba5c396c420 100644 --- a/htdocs/fourn/product/photos.php +++ b/htdocs/fourn/product/photos.php @@ -102,7 +102,7 @@ if ($id) print ''; print $object->getLibStatut(2); print ''; - print ''.$langs->trans("Label").''.$object->libelle.''; + print ''.$langs->trans("Label").''.$object->label.''; print ''.$langs->trans("SellingPrice").''.price($object->price).''; print "
\n"; diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql index 6d03891a8e3..603946c6351 100755 --- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql +++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql @@ -85,7 +85,7 @@ ALTER TABLE llx_projet_task MODIFY COLUMN duration_effective real DEFAULT 0 NULL ALTER TABLE llx_projet_task MODIFY COLUMN planned_workload real DEFAULT 0 NULL; -ALTER TABLE llx_commande_fournisseur MODIFY COLUMN date_livraison datetime; +ALTER TABLE llx_commande_fournisseur MODIFY COLUMN date_livraison datetime; -- Add id commandefourndet in llx_commande_fournisseur_dispatch to correct /fourn/commande/dispatch.php display when several times same product in supplier order ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN fk_commandefourndet INTEGER NOT NULL DEFAULT 0 AFTER fk_product; @@ -112,12 +112,12 @@ ALTER TABLE llx_product_price ADD COLUMN fk_price_expression integer DEFAULT NUL --create table for user conf of printing driver -CREATE TABLE llx_printing +CREATE TABLE llx_printing ( rowid integer AUTO_INCREMENT PRIMARY KEY, tms timestamp, datec datetime, - printer_name text NOT NULL, + printer_name text NOT NULL, printer_location text NOT NULL, printer_id varchar(255) NOT NULL, copy integer NOT NULL DEFAULT '1', @@ -199,7 +199,7 @@ CREATE TABLE llx_expensereport ( total_ht double(24,8) DEFAULT 0, total_tva double(24,8) DEFAULT 0, localtax1 double(24,8) DEFAULT 0, -- amount total localtax1 - localtax2 double(24,8) DEFAULT 0, -- amount total localtax2 + localtax2 double(24,8) DEFAULT 0, -- amount total localtax2 total_ttc double(24,8) DEFAULT 0, date_debut date NOT NULL, date_fin date NOT NULL, @@ -292,11 +292,11 @@ ALTER TABLE llx_commande_fournisseurdet ADD COLUMN special_code integer DEFAULT ALTER TABLE llx_commande_fournisseurdet ADD COLUMN rang integer DEFAULT 0; ALTER TABLE llx_commande_fournisseurdet ADD COLUMN fk_parent_line integer NULL after fk_commande; -ALTER TABLE llx_projet ADD COLUMN date_close datetime DEFAULT NULL; +ALTER TABLE llx_projet ADD COLUMN date_close datetime DEFAULT NULL; ALTER TABLE llx_projet ADD COLUMN fk_user_close integer DEFAULT NULL; - + -- Module AskPriceSupplier -- CREATE TABLE llx_askpricesupplier ( rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -608,4 +608,9 @@ ALTER TABLE llx_user ADD INDEX idx_user_api_key (api_key); +ALTER TABLE llx_actioncomm ADD COLUMN email_msgid varchar(256); +ALTER TABLE llx_actioncomm ADD COLUMN email_from varchar(256); +ALTER TABLE llx_actioncomm ADD COLUMN email_sender varchar(256); +ALTER TABLE llx_actioncomm ADD COLUMN email_to varchar(256); +ALTER TABLE llx_actioncomm ADD COLUMN errors_to varchar(256); diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql index f68d99f6a72..826f4d4c268 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.sql @@ -24,15 +24,12 @@ create table llx_actioncomm ( id integer AUTO_INCREMENT PRIMARY KEY, ref_ext varchar(128), - entity integer DEFAULT 1 NOT NULL, -- multi company id + entity integer DEFAULT 1 NOT NULL, -- multi company id datep datetime, -- date start datep2 datetime, -- date end - datea datetime, -- deprecated - datea2 datetime, -- deprecated - fk_action integer, -- type of action (optional link with llx_c_actioncomm or null) - code varchar(32) NULL, -- code of action for automatic action - label varchar(128) NOT NULL, -- label/title of event + fk_action integer, -- type of action (optional link with id in llx_c_actioncomm or null) + code varchar(32) NULL, -- code of action for automatic action ('AC_OTH_AUTO' for automatic actions, 'AC_EMAILIN_AUTO' for email input, 'AC_xxx' for manual action...) datec datetime, -- date creation tms timestamp, -- date modification @@ -44,7 +41,7 @@ create table llx_actioncomm fk_contact integer, fk_parent integer NOT NULL default 0, - fk_user_action integer, -- user id of owner of action (currently also user id of actor that must do action. In future, actors assigned to action will be an array into table llx_actioncomm_resources) + fk_user_action integer, -- user id of owner of action (note that assigned users to event are store into another table) transparency integer, -- transparency (ical standard). used to say if user assigned to event are busy or not by event (in future version, this field is deprecated and will be stored into table llx_actioncomm_resources) fk_user_done integer, -- user id of user that has made action (deprecated) @@ -55,8 +52,15 @@ create table llx_actioncomm percent smallint NOT NULL default 0, location varchar(128), durationp real, -- planed duration - durationa real, -- deprecated - note text, + + label varchar(256) NOT NULL, -- label/title of event or topic of email + note text, -- note of event or content of email + + email_msgid varchar(256), -- when event was an email, we store here the msgid + email_from varchar(256), -- when event was an email, we store here the from + email_sender varchar(256), -- when event was an email, we store here the sender + email_to varchar(256), -- when event was an email, we store here the email_to + errors_to varchar(256), -- when event was an email, we store here the erros_to fk_element integer DEFAULT NULL, elementtype varchar(32) DEFAULT NULL diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php index b359287d24f..b9bd6e5099d 100644 --- a/htdocs/margin/productMargins.php +++ b/htdocs/margin/productMargins.php @@ -263,7 +263,7 @@ if ($result) $product_static->type=$objp->fk_product_type; $product_static->id=$objp->rowid; $product_static->ref=$objp->ref; - $product_static->libelle=$objp->label; + $product_static->label=$objp->label; $text=$product_static->getNomUrl(1); print $text.= ' - '.$objp->label; print "\n"; diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php index eb3ac32c424..d3c53eb9e2e 100644 --- a/htdocs/margin/tabs/productMargins.php +++ b/htdocs/margin/tabs/productMargins.php @@ -92,7 +92,7 @@ if ($id > 0 || ! empty($ref)) print ''; // Libelle - print ''.$langs->trans("Label").''.$object->libelle.''; + print ''.$langs->trans("Label").''.$object->label.''; print ''; // Status (to sell) diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php index a217f34d939..16423f95359 100644 --- a/htdocs/opensurvey/card.php +++ b/htdocs/opensurvey/card.php @@ -214,7 +214,7 @@ $adresseadmin=$object->mail_admin; print $langs->trans("Title") .''; if ($action == 'edit') { - print ''; + print ''; } else print dol_htmlentities($object->titre); print ''; @@ -310,14 +310,26 @@ $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain //$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current $url=$urlwithouturlroot.dol_buildpath('/public/opensurvey/studs.php',1).'?sondage='.$object->id_sondage; -$urllink=''.$url.''; +$urllink=''; print $urllink; +if ($action != 'edit') +{ + print ''; + print ' '.$langs->trans("Link").''; +} print ''; dol_fiche_end(); -if ($action == 'edit') print '
'; +if ($action == 'edit') +{ + print '
'; +} print ''."\n"; diff --git a/htdocs/opensurvey/css/style.css b/htdocs/opensurvey/css/style.css index 7d7ef088c7e..7e359bd134e 100644 --- a/htdocs/opensurvey/css/style.css +++ b/htdocs/opensurvey/css/style.css @@ -1,4 +1,4 @@ -/* Copyright (C) 2004-2013 Laurent Destailleur +/* Copyright (C) 2004-2015 Laurent Destailleur * Copyright (C) 2006 Rodolphe Quiedeville * Copyright (C) 2007-2012 Regis Houssin * Copyright (C) 2011 Philippe Grand @@ -51,6 +51,8 @@ background: #f78d1d; background: -webkit-gradient(linear, left top, left bottom, from(#faa51a), to(#f47a20)); background: -moz-linear-gradient(top, #faa51a, #f47a20); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#faa51a', endColorstr='#f47a20'); +margin-left: 4px; +margin-right: 4px; } .orange:active { color: #fcd3a5; @@ -73,6 +75,8 @@ background: #0095cd; background: -webkit-gradient(linear, left top, left bottom, from(#00adee), to(#0078a5)); background: -moz-linear-gradient(top, #00adee, #0078a5); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00adee', endColorstr='#0078a5'); +margin-left: 4px; +margin-right: 4px; } .blue:active { color: #80bed6; diff --git a/htdocs/opensurvey/img/date.png b/htdocs/opensurvey/img/date.png index c847011e952..c5e8dbdac8a 100644 Binary files a/htdocs/opensurvey/img/date.png and b/htdocs/opensurvey/img/date.png differ diff --git a/htdocs/opensurvey/img/sondage2.png b/htdocs/opensurvey/img/sondage2.png index 8018ce99860..e027ce9ef37 100644 Binary files a/htdocs/opensurvey/img/sondage2.png and b/htdocs/opensurvey/img/sondage2.png differ diff --git a/htdocs/opensurvey/wizard/index.php b/htdocs/opensurvey/wizard/index.php index 3c10c256742..9566231353f 100644 --- a/htdocs/opensurvey/wizard/index.php +++ b/htdocs/opensurvey/wizard/index.php @@ -48,8 +48,8 @@ print '
'; print '

'.$langs->trans("OrganizeYourMeetingEasily").'

'; print '
'; print '
'; -print '
'; -print '
'; +print '
'; +print '
'; print '
'; print '
'; diff --git a/htdocs/product/card.php b/htdocs/product/card.php index f9452538577..f8b945c2559 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -169,7 +169,7 @@ if (empty($reshook)) { $error=0; - if (! GETPOST('libelle')) + if (! GETPOST('label')) { setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentities('Label')), 'errors'); $action = "create"; @@ -187,7 +187,7 @@ if (empty($reshook)) $units = GETPOST('units', 'int'); $object->ref = $ref; - $object->libelle = GETPOST('libelle'); + $object->label = GETPOST('label'); $object->price_base_type = GETPOST('price_base_type'); if ($object->price_base_type == 'TTC') @@ -315,7 +315,7 @@ if (empty($reshook)) $object->oldcopy=dol_clone($object); $object->ref = $ref; - $object->libelle = GETPOST('libelle'); + $object->label = GETPOST('label'); $object->description = dol_htmlcleanlastbr(GETPOST('desc')); $object->url = GETPOST('url'); $object->note = dol_htmlcleanlastbr(GETPOST('note')); @@ -822,7 +822,7 @@ else print ''; // Label - print ''.$langs->trans("Label").''; + print ''.$langs->trans("Label").''; // On sell print ''.$langs->trans("Status").' ('.$langs->trans("Sell").')'; @@ -1085,7 +1085,7 @@ else print ''.$langs->trans("Ref").''; // Label - print ''.$langs->trans("Label").''; + print ''.$langs->trans("Label").''; // Status To sell print ''.$langs->trans("Status").' ('.$langs->trans("Sell").')'; @@ -1341,7 +1341,7 @@ else print ''; // Label - print ''.$langs->trans("Label").''.$object->libelle.''; + print ''.$langs->trans("Label").''.$object->label.''; $nblignes=7; if (! empty($conf->produit->enabled) && ! empty($conf->service->enabled)) $nblignes++; @@ -1586,7 +1586,7 @@ else // Categories print ''.$langs->trans("Categories").''; - print $form->showCategories($object->id,'product'); + print $form->showCategories($object->id,'product',1); print ""; print "\n"; diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index c1046af1216..fc46435a32a 100755 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -59,8 +59,21 @@ class Product extends CommonObject var $id ; //! Ref var $ref; - var $libelle; // TODO deprecated + /** + * Product label + * @var string + * @deprecated use $label + */ + var $libelle; + /** + * Product label + * @var string + */ var $label; + /** + * Product descripion + * @var string + */ var $description; /** @@ -232,7 +245,7 @@ class Product extends CommonObject if (dol_strlen(trim($this->ref)) == 0) $err++; - if (dol_strlen(trim($this->libelle)) == 0) + if (dol_strlen(trim($this->label)) == 0) $err++; if ($err > 0) @@ -260,7 +273,7 @@ class Product extends CommonObject // Clean parameters $this->ref = dol_string_nospecial(trim($this->ref)); - $this->libelle = trim($this->libelle); + $this->label = trim($this->label); $this->price_ttc=price2num($this->price_ttc); $this->price=price2num($this->price); $this->price_min_ttc=price2num($this->price_min_ttc); @@ -312,7 +325,7 @@ class Product extends CommonObject $this->barcode=trim($this->barcode); // Check parameters - if (empty($this->libelle)) + if (empty($this->label)) { $this->error='ErrorMandatoryParametersNotProvided'; return -1; @@ -397,7 +410,7 @@ class Product extends CommonObject $sql.= ", ".(! empty($this->ref_ext)?"'".$this->db->escape($this->ref_ext)."'":"null"); $sql.= ", ".price2num($price_min_ht); $sql.= ", ".price2num($price_min_ttc); - $sql.= ", ".(! empty($this->libelle)?"'".$this->db->escape($this->libelle)."'":"null"); + $sql.= ", ".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null"); $sql.= ", ".$user->id; $sql.= ", ".$this->type; $sql.= ", ".price2num($price_ht); @@ -588,11 +601,11 @@ class Product extends CommonObject $error=0; // Check parameters - if (! $this->libelle) $this->libelle = 'MISSING LABEL'; + if (! $this->label) $this->label = 'MISSING LABEL'; // Clean parameters $this->ref = dol_string_nospecial(trim($this->ref)); - $this->libelle = trim($this->libelle); + $this->label = trim($this->label); $this->description = trim($this->description); $this->note = (isset($this->note) ? trim($this->note) : null); $this->weight = price2num($this->weight); @@ -667,7 +680,7 @@ class Product extends CommonObject if ($this->barcode == -1) $this->barcode = $this->get_barcode($this,$this->barcode_type_code); $sql = "UPDATE ".MAIN_DB_PREFIX."product"; - $sql.= " SET label = '" . $this->db->escape($this->libelle) ."'"; + $sql.= " SET label = '" . $this->db->escape($this->label) ."'"; $sql.= ", ref = '" . $this->ref ."'"; $sql.= ", ref_ext = ".(! empty($this->ref_ext)?"'".$this->db->escape($this->ref_ext)."'":"null"); $sql.= ", tva_tx = " . $this->tva_tx; @@ -958,7 +971,7 @@ class Product extends CommonObject if ($this->db->num_rows($result)) // if there is already a description line for this language { $sql2 = "UPDATE ".MAIN_DB_PREFIX."product_lang"; - $sql2.= " SET label='".$this->db->escape($this->libelle)."',"; + $sql2.= " SET label='".$this->db->escape($this->label)."',"; $sql2.= " description='".$this->db->escape($this->description)."',"; $sql2.= " note='".$this->db->escape($this->note)."'"; $sql2.= " WHERE fk_product=".$this->id." AND lang='".$key."'"; @@ -966,7 +979,7 @@ class Product extends CommonObject else { $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."product_lang (fk_product, lang, label, description, note)"; - $sql2.= " VALUES(".$this->id.",'".$key."','". $this->db->escape($this->libelle); + $sql2.= " VALUES(".$this->id.",'".$key."','". $this->db->escape($this->label); $sql2.= "','".$this->db->escape($this->description); $sql2.= "','".$this->db->escape($this->note)."')"; } @@ -1535,7 +1548,6 @@ class Product extends CommonObject $this->id = $obj->rowid; $this->ref = $obj->ref; $this->ref_ext = $obj->ref_ext; - $this->libelle = $obj->label; // TODO deprecated $this->label = $obj->label; $this->description = $obj->description; $this->url = $obj->url; @@ -3808,7 +3820,7 @@ class Product extends CommonObject // Initialize parameters $this->id=0; $this->ref = 'PRODUCT_SPEC'; - $this->libelle = 'PRODUCT SPECIMEN'; + $this->label = 'PRODUCT SPECIMEN'; $this->description = 'PRODUCT SPECIMEN '.dol_print_date($now,'dayhourlog'); $this->specimen=1; $this->country_id=1; diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php index 0a427741919..fd6bdc2de0f 100644 --- a/htdocs/product/composition/card.php +++ b/htdocs/product/composition/card.php @@ -524,7 +524,7 @@ if ($id > 0 || ! empty($ref)) print "\n"; $productstatic->id=$objp->rowid; $productstatic->ref=$objp->ref; - $productstatic->libelle=$objp->label; + $productstatic->label=$objp->label; $productstatic->type=$objp->type; print ''.$productstatic->getNomUrl(1,'',24).''; diff --git a/htdocs/product/document.php b/htdocs/product/document.php index 615f4accf70..8f05cb92697 100644 --- a/htdocs/product/document.php +++ b/htdocs/product/document.php @@ -191,7 +191,7 @@ if ($object->id) print ''; // Label - print ''.$langs->trans("Label").''.$object->libelle.''; + print ''.$langs->trans("Label").''.$object->label.''; // Status (to sell) print ''.$langs->trans("Status").' ('.$langs->trans("Sell").')'; diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index abeb8fdf995..750158d4e8d 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -280,7 +280,7 @@ if ($id || $ref) print ''; // Label - print ''.$langs->trans("Label").''.$product->libelle.''; + print ''.$langs->trans("Label").''.$product->label.''; // Minimum Price print ''.$langs->trans("BuyingPriceMin").''; diff --git a/htdocs/product/photos.php b/htdocs/product/photos.php index c6245cf203c..f1fd687890d 100644 --- a/htdocs/product/photos.php +++ b/htdocs/product/photos.php @@ -126,7 +126,7 @@ if ($object->id) print ''; // Libelle - print ''.$langs->trans("Label").''.$object->libelle.''; + print ''.$langs->trans("Label").''.$object->label.''; print ''; // Status (to sell) diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 2c9ab9a7794..ce8ad104a1f 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -368,7 +368,7 @@ print ''; print ''; // Label -print '' . $langs->trans("Label") . '' . $object->libelle . ''; +print '' . $langs->trans("Label") . '' . $object->label . ''; $isphoto = $object->is_photo_available($conf->product->multidir_output [$object->entity]); diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php index ce161a1af60..60e3cba31e3 100644 --- a/htdocs/product/stats/card.php +++ b/htdocs/product/stats/card.php @@ -83,7 +83,7 @@ if (! empty($id) || ! empty($ref)) print ''; // Label - print ''.$langs->trans("Label").''.$object->libelle.''; + print ''.$langs->trans("Label").''.$object->label.''; // Status (to sell) print ''.$langs->trans("Status").' ('.$langs->trans("Sell").')'; diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php index 7dcf6139534..2dd349d3a34 100644 --- a/htdocs/product/stats/commande.php +++ b/htdocs/product/stats/commande.php @@ -107,7 +107,7 @@ if ($id > 0 || ! empty($ref)) print ''; // Libelle - print ''.$langs->trans("Label").''.$product->libelle.''; + print ''.$langs->trans("Label").''.$product->label.''; print ''; // Status (to sell) diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php index e6ced5ad905..e7a803c299c 100644 --- a/htdocs/product/stats/commande_fournisseur.php +++ b/htdocs/product/stats/commande_fournisseur.php @@ -115,7 +115,7 @@ if ($id > 0 || ! empty($ref)) { print ''; // Libelle - print '' . $langs->trans("Label") . '' . $product->libelle . ''; + print '' . $langs->trans("Label") . '' . $product->label . ''; print ''; // Status (to sell) diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php index d098ca3399b..3e897888893 100644 --- a/htdocs/product/stats/contrat.php +++ b/htdocs/product/stats/contrat.php @@ -97,7 +97,7 @@ if ($id > 0 || ! empty($ref)) print ''; // Libelle - print ''.$langs->trans("Label").''.$product->libelle.''; + print ''.$langs->trans("Label").''.$product->label.''; print ''; // Status (to sell) diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index 1f4e9b985e5..22f28cd2303 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -108,7 +108,7 @@ if ($id > 0 || ! empty($ref)) print ''; // Libelle - print ''.$langs->trans("Label").''.$product->libelle.''; + print ''.$langs->trans("Label").''.$product->label.''; print ''; // Status (to sell) diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php index debb0698c44..de9c4cee29a 100644 --- a/htdocs/product/stats/facture_fournisseur.php +++ b/htdocs/product/stats/facture_fournisseur.php @@ -109,7 +109,7 @@ if ($id > 0 || ! empty($ref)) print ''; // Libelle - print '' . $langs->trans("Label") . '' . $product->libelle . ''; + print '' . $langs->trans("Label") . '' . $product->label . ''; print ''; // Status (to sell) diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php index 1776ba571e0..3bb44436d43 100644 --- a/htdocs/product/stats/propal.php +++ b/htdocs/product/stats/propal.php @@ -107,7 +107,7 @@ if ($id > 0 || ! empty($ref)) print ''; // Libelle - print '' . $langs->trans("Label") . '' . $product->libelle . ''; + print '' . $langs->trans("Label") . '' . $product->label . ''; print ''; // Status (to sell) diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index 2a08eb6a7df..82c8ded066f 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -514,7 +514,7 @@ if ($resql) print ''; // Product label print ''; - print ''; + print ''; print ''; // Batch if (! empty($conf->productbatch->enabled)) diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index 2a4acf54ff7..dfa94910625 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -403,7 +403,7 @@ if ($id > 0 || $ref) print ''; // Label - print ''.$langs->trans("Label").''.$product->libelle.''; + print ''.$langs->trans("Label").''.$product->label.''; print ''; // Status (to sell) diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php index 0213ee7f6fa..e7a0b258986 100644 --- a/htdocs/public/paybox/newpayment.php +++ b/htdocs/public/paybox/newpayment.php @@ -558,7 +558,7 @@ if (GETPOST("source") == 'contractline' && $valid) $text=''.$langs->trans("PaymentRenewContractId",$contract->ref,$contractline->ref).''; if ($contractline->fk_product) { - $text.='
'.$product->ref.($product->libelle?' - '.$product->libelle:''); + $text.='
'.$product->ref.($product->label?' - '.$product->label:''); } if ($contractline->description) $text.='
'.dol_htmlentitiesbr($contractline->description); //if ($contractline->date_fin_validite) { diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php index 8c66f6157ba..d1ed853eb5d 100644 --- a/htdocs/public/paypal/newpayment.php +++ b/htdocs/public/paypal/newpayment.php @@ -695,7 +695,7 @@ if (GETPOST("source") == 'contractline' && $valid) $text=''.$langs->trans("PaymentRenewContractId",$contract->ref,$contractline->ref).''; if ($contractline->fk_product) { - $text.='
'.$product->ref.($product->libelle?' - '.$product->libelle:''); + $text.='
'.$product->ref.($product->label?' - '.$product->label:''); } if ($contractline->description) $text.='
'.dol_htmlentitiesbr($contractline->description); //if ($contractline->date_fin_validite) { diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index bcb5acb361b..ad36760b564 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -447,6 +447,7 @@ textarea.centpercent { /* Styles to hide objects */ /* ============================================================================== */ +.clearboth { clear:both; } .hideobject { display: none; } .minwidth100 { min-width: 100px; } .minwidth200 { min-width: 200px; } @@ -1359,8 +1360,6 @@ img.toolbarbutton { /* Onglets */ /* ============================================================================== */ div.tabs { -/* margin: 0px 0px 2px 6px; - padding: 0px 6px 3px 0px; */ text-align: ; margin-left: 6px !important; margin-right: 6px !important; @@ -2974,7 +2973,6 @@ a span.select2-chosen cursor: default; } .select2-container-multi .select2-choices .select2-search-choice { - margin-top: 2px; margin-bottom: 2px; } @@ -3160,5 +3158,17 @@ border-top-right-radius: 6px; padding-left: 54px; } + +/* CSS style used for small screen */ + +.imgopensurveywizard +{ + padding: 0 4px 0 4px; +} +@media only screen and (max-width: 767px) +{ + .imgopensurveywizard { width:95%; height: auto; } +} + close(); diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php index e74a0d815d3..b7af224ff52 100644 --- a/htdocs/webservices/server_productorservice.php +++ b/htdocs/webservices/server_productorservice.php @@ -505,7 +505,7 @@ function createProductOrService($authentication,$product) $newobject->ref=$product['ref']; $newobject->ref_ext=$product['ref_ext']; $newobject->type=$product['type']; - $newobject->libelle=$product['label']; // TODO deprecated + $newobject->libelle=$product['label']; // @deprecated $newobject->label=$product['label']; $newobject->description=$product['description']; $newobject->note=$product['note']; @@ -675,7 +675,7 @@ function updateProductOrService($authentication,$product) if (isset($product['ref'])) $newobject->ref=$product['ref']; if (isset($product['ref_ext'])) $newobject->ref_ext=$product['ref_ext']; $newobject->type=$product['type']; - $newobject->libelle=$product['label']; // TODO deprecated + $newobject->libelle=$product['label']; // @deprecated $newobject->label=$product['label']; $newobject->description=$product['description']; $newobject->note=$product['note'];