diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 9996337736a..22d3c2ffc59 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -3012,13 +3012,13 @@ abstract class CommonObject print '
| '.$langs->trans('Margins').' | '; - print ''.$langs->trans('SellingPrice').' | '; + print ''.$langs->trans('Margins').' | '; + print ''.$langs->trans('SellingPrice').' | '; if ($conf->global->MARGIN_TYPE == "1") - print ''.$langs->trans('BuyingPrice').' | '; + print ''.$langs->trans('BuyingPrice').' | '; else - print ''.$langs->trans('CostPrice').' | '; - print ''.$langs->trans('Margin').' | '; + print ''.$langs->trans('CostPrice').' | '; + print ''.$langs->trans('Margin').' | '; if (! empty($conf->global->DISPLAY_MARGIN_RATES)) print ''.$langs->trans('MarginRate').' | '; if (! empty($conf->global->DISPLAY_MARK_RATES)) diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql index 9e4db2b604a..e7f9c246834 100644 --- a/htdocs/install/mysql/tables/llx_adherent.sql +++ b/htdocs/install/mysql/tables/llx_adherent.sql @@ -37,7 +37,7 @@ create table llx_adherent pass varchar(50), -- password fk_adherent_type integer NOT NULL, morphy varchar(3) NOT NULL, -- personne morale / personne physique - societe varchar(60), -- company name (should be same lenght than societe.name) + societe varchar(128), -- company name (should be same lenght than societe.name) fk_soc integer NULL, -- Link to third party linked to member address text, zip varchar(30), diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index bfe69b0d5f8..25629424037 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -22,7 +22,7 @@ create table llx_societe ( rowid integer AUTO_INCREMENT PRIMARY KEY, - nom varchar(60), -- company reference name (should be smae length than adherent.societe) + nom varchar(128), -- company reference name (should be same length than adherent.societe) entity integer DEFAULT 1 NOT NULL, -- multi company id ref_ext varchar(128), -- reference into an external system (not used by dolibarr) diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index a0b9bda1c8e..65b1e4783d8 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -805,7 +805,7 @@ else print ''; } print 'global->SOCIETE_USEPREFIX)?' colspan="3"':'').'>'; - print ' | '; + print ''; if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field { print ''.$langs->trans('Prefix').' | '; @@ -816,7 +816,7 @@ else if ($conf->use_javascript_ajax) { print ' |
| '; - print ' | '; + print ' | '; print ' | |||||||||||
| '; print $formcompany->select_civility($object->civility_id).' | '; @@ -1266,7 +1266,7 @@ else // Name print '|||||||||||||
| '; - print ' | '; // Prefix if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field | ||||||||||||