From 6cec011df6dfd1bbef081ca70cf07256f4fe20b1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 13 Mar 2014 12:22:53 +0100 Subject: [PATCH] New: Add manager name (ceo, director, president...) into main company information page. --- ChangeLog | 13 ++++++------ htdocs/admin/company.php | 20 ++++++++++++------- .../core/class/commondocgenerator.class.php | 3 ++- htdocs/langs/en_US/companies.lang | 3 +-- htdocs/societe/class/societe.class.php | 2 ++ 5 files changed, 25 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index d04f080d368..e64bbc9e6b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ English Dolibarr ChangeLog ***** ChangeLog for 3.6 compared to 3.5.* ***** For users: - New: Update ckeditor to version 4. -- New: Add form search customer order on commercial main page. +- New: Add form "search customer order" on commercial main page. - New: Can input barcode during product creation step. - New: Add autonumbering of barcode value for products. - New: Can create contract from an order. @@ -13,25 +13,26 @@ For users: - New: Add graph stats for suppliers orders in tab "stats" on products. - New: Add option MAIN_HIDE_INACTIVETAB_ON_PRINT to hide inactive tabs when you use the "print" view on screen. -- New: Add a menu entry to a barcode generation page. +- New: Add a page/tool for mass barcode generation. - New: Add option MAIN_AUTO_TIMESTAMP_IN_PUBLIC_NOTES and MAIN_AUTO_TIMESTAMP_IN_PRIVATE_NOTES to automatically add timestamp and user line into edition field when editing a note. - New: Add button cancel into edition of notes. - New: Improved Opensurvey module and added options to disable comments and disable public votes. - New: The box "balance of bank accounts" show all opened accounts. -- New: Add option MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE. +- New: Add option MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE to add sale represnative into public + note of generated documents. - New: Add warning if supplier payment is higher that due amount. - New: Increase length of url into bookmark module. -- New: Add an admin page to make a mass init of barcode values for all products. -- New: Automatic events for sending mails showing info about mail linked objects. +- New: Automatic events sending mails add info about linked objects into email content. - New: Price management enhancement (multiprice level, price by customer, if MAIN_FEATURES_LEVEL=2 Price by qty). -- New: Add filter on text and status into survey list. Can also sorter on id, text and date end. +- New: Add filter on text and status into survey list. Can also sort on id, text and date end. - New: Add option MAIN_FAVICON_URL. - New: Created {line_price_ht_locale}, {line_price_vat_locale} and {line_price_ttc_locale} ODT tags. - New: Add filter on project status into task list. By default, only "opened" project are visible. - New: Status "validated" for project are renamed into "opened". - New: Add barcode fields into user database. +- New: Add manager name (ceo, director, president...) into main company information page. - Fix: Project Task numbering customs rule works. TODO diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index d6c750c63a3..699a797f751 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -139,7 +139,7 @@ if ( ($action == 'update' && empty($_POST["cancel"])) } } } - + dolibarr_set_const($db, "MAIN_INFO_SOCIETE_MANAGERS",$_POST["MAIN_INFO_SOCIETE_MANAGERS"],'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_INFO_CAPITAL",$_POST["capital"],'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_INFO_SOCIETE_FORME_JURIDIQUE",$_POST["forme_juridique_code"],'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_INFO_SIREN",$_POST["siren"],'chaine',0,'',$conf->entity); @@ -377,6 +377,11 @@ if ($action == 'edit' || $action == 'updateedit') $langs->load("companies"); + // Managing Director(s) + $var=!$var; + print ''.$langs->trans("ManagingDirectors").''; + print ''; + // Capital $var=!$var; print ''.$langs->trans("Capital").''; @@ -500,9 +505,7 @@ if ($action == 'edit' || $action == 'updateedit') print ''; - /* - * Debut d'annee fiscale - */ + // Fiscal year start print '
'; print ''; print ''; @@ -517,9 +520,7 @@ if ($action == 'edit' || $action == 'updateedit') print "
"; - /* - * Options fiscale - */ + // Fiscal options print '
'; print ''; print ''; @@ -741,6 +742,11 @@ else print ''; $var=true; + // Managing Director(s) + $var=!$var; + print ''; + // Capital $var=!$var; print '
'.$langs->trans("CompanyIds").''.$langs->trans("Value").'
'.$langs->trans("ManagingDirectors").''; + print $conf->global->MAIN_INFO_SOCIETE_MANAGERS . '
'.$langs->trans("Capital").''; diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index 40a62663e55..af39da58cf7 100644 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -109,7 +109,8 @@ abstract class CommonDocGenerator 'mycompany_state_code'=>$mysoc->state_code, 'mycompany_web'=>$mysoc->url, 'mycompany_juridicalstatus'=>$mysoc->forme_juridique, - 'mycompany_capital'=>$mysoc->capital, + 'mycompany_managers'=>$mysoc->managers, + 'mycompany_capital'=>$mysoc->capital, 'mycompany_barcode'=>$mysoc->barcode, 'mycompany_idprof1'=>$mysoc->idprof1, 'mycompany_idprof2'=>$mysoc->idprof2, diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index b5c2a7339f8..0762a40939c 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -403,7 +403,6 @@ ProductsIntoElements=List of products into CurrentOutstandingBill=Current outstanding bill OutstandingBill=Max. for outstanding bill OutstandingBillReached=Reached max. for outstanding bill -# Monkey MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0. -# Leopard LeopardNumRefModelDesc=The code is free. This code can be modified at any time. +ManagingDirectors=Manager(s) name (CEO, director, president...) \ No newline at end of file diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index a3847060fdb..19bb0bd4de9 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -97,6 +97,7 @@ class Societe extends CommonObject var $localtax1_assuj; var $localtax2_assuj; + var $managers; var $capital; var $typent_id; var $typent_code; @@ -2566,6 +2567,7 @@ class Societe extends CommonObject $this->idprof5=empty($conf->global->MAIN_INFO_PROFID5)?'':$conf->global->MAIN_INFO_PROFID5; $this->idprof6=empty($conf->global->MAIN_INFO_PROFID6)?'':$conf->global->MAIN_INFO_PROFID6; $this->tva_intra=empty($conf->global->MAIN_INFO_TVAINTRA)?'':$conf->global->MAIN_INFO_TVAINTRA; // VAT number, not necessarly INTRA. + $this->managers=empty($conf->global->MAIN_INFO_SOCIETE_MANAGERS)?'':$conf->global->MAIN_INFO_SOCIETE_MANAGERS; $this->capital=empty($conf->global->MAIN_INFO_CAPITAL)?'':$conf->global->MAIN_INFO_CAPITAL; $this->forme_juridique_code=empty($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE)?'':$conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE; $this->email=empty($conf->global->MAIN_INFO_SOCIETE_MAIL)?'':$conf->global->MAIN_INFO_SOCIETE_MAIL;