New: Add manager name (ceo, director, president...) into main company

information page.
This commit is contained in:
Laurent Destailleur 2014-03-13 12:22:53 +01:00
parent 813f55e50b
commit 6cec011df6
5 changed files with 25 additions and 16 deletions

View File

@ -5,7 +5,7 @@ English Dolibarr ChangeLog
***** ChangeLog for 3.6 compared to 3.5.* ***** ***** ChangeLog for 3.6 compared to 3.5.* *****
For users: For users:
- New: Update ckeditor to version 4. - 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: Can input barcode during product creation step.
- New: Add autonumbering of barcode value for products. - New: Add autonumbering of barcode value for products.
- New: Can create contract from an order. - 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 graph stats for suppliers orders in tab "stats" on products.
- New: Add option MAIN_HIDE_INACTIVETAB_ON_PRINT to hide inactive tabs when you - New: Add option MAIN_HIDE_INACTIVETAB_ON_PRINT to hide inactive tabs when you
use the "print" view on screen. 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 - 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. to automatically add timestamp and user line into edition field when editing a note.
- New: Add button cancel into edition of notes. - New: Add button cancel into edition of notes.
- New: Improved Opensurvey module and added options to disable comments and disable - New: Improved Opensurvey module and added options to disable comments and disable
public votes. public votes.
- New: The box "balance of bank accounts" show all opened accounts. - 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: Add warning if supplier payment is higher that due amount.
- New: Increase length of url into bookmark module. - 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 sending mails add info about linked objects into email content.
- New: Automatic events for sending mails showing info about mail linked objects.
- New: Price management enhancement (multiprice level, price by customer, if MAIN_FEATURES_LEVEL=2 Price by qty). - 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: Add option MAIN_FAVICON_URL.
- New: Created {line_price_ht_locale}, {line_price_vat_locale} and {line_price_ttc_locale} ODT tags. - 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: 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: Status "validated" for project are renamed into "opened".
- New: Add barcode fields into user database. - 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. - Fix: Project Task numbering customs rule works.
TODO TODO

View File

@ -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_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_SOCIETE_FORME_JURIDIQUE",$_POST["forme_juridique_code"],'chaine',0,'',$conf->entity);
dolibarr_set_const($db, "MAIN_INFO_SIREN",$_POST["siren"],'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"); $langs->load("companies");
// Managing Director(s)
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("ManagingDirectors").'</td><td>';
print '<input name="MAIN_INFO_SOCIETE_MANAGERS" size="80" value="' . $conf->global->MAIN_INFO_SOCIETE_MANAGERS . '"></td></tr>';
// Capital // Capital
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Capital").'</td><td>'; print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Capital").'</td><td>';
@ -500,9 +505,7 @@ if ($action == 'edit' || $action == 'updateedit')
print '</table>'; print '</table>';
/* // Fiscal year start
* Debut d'annee fiscale
*/
print '<br>'; print '<br>';
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
@ -517,9 +520,7 @@ if ($action == 'edit' || $action == 'updateedit')
print "</table>"; print "</table>";
/* // Fiscal options
* Options fiscale
*/
print '<br>'; print '<br>';
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
@ -741,6 +742,11 @@ else
print '<tr class="liste_titre"><td>'.$langs->trans("CompanyIds").'</td><td>'.$langs->trans("Value").'</td></tr>'; print '<tr class="liste_titre"><td>'.$langs->trans("CompanyIds").'</td><td>'.$langs->trans("Value").'</td></tr>';
$var=true; $var=true;
// Managing Director(s)
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("ManagingDirectors").'</td><td>';
print $conf->global->MAIN_INFO_SOCIETE_MANAGERS . '</td></tr>';
// Capital // Capital
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Capital").'</td><td>'; print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Capital").'</td><td>';

View File

@ -109,7 +109,8 @@ abstract class CommonDocGenerator
'mycompany_state_code'=>$mysoc->state_code, 'mycompany_state_code'=>$mysoc->state_code,
'mycompany_web'=>$mysoc->url, 'mycompany_web'=>$mysoc->url,
'mycompany_juridicalstatus'=>$mysoc->forme_juridique, 'mycompany_juridicalstatus'=>$mysoc->forme_juridique,
'mycompany_capital'=>$mysoc->capital, 'mycompany_managers'=>$mysoc->managers,
'mycompany_capital'=>$mysoc->capital,
'mycompany_barcode'=>$mysoc->barcode, 'mycompany_barcode'=>$mysoc->barcode,
'mycompany_idprof1'=>$mysoc->idprof1, 'mycompany_idprof1'=>$mysoc->idprof1,
'mycompany_idprof2'=>$mysoc->idprof2, 'mycompany_idprof2'=>$mysoc->idprof2,

View File

@ -403,7 +403,6 @@ ProductsIntoElements=List of products into
CurrentOutstandingBill=Current outstanding bill CurrentOutstandingBill=Current outstanding bill
OutstandingBill=Max. for outstanding bill OutstandingBill=Max. for outstanding bill
OutstandingBillReached=Reached 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. 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. LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
ManagingDirectors=Manager(s) name (CEO, director, president...)

View File

@ -97,6 +97,7 @@ class Societe extends CommonObject
var $localtax1_assuj; var $localtax1_assuj;
var $localtax2_assuj; var $localtax2_assuj;
var $managers;
var $capital; var $capital;
var $typent_id; var $typent_id;
var $typent_code; 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->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->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->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->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->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; $this->email=empty($conf->global->MAIN_INFO_SOCIETE_MAIL)?'':$conf->global->MAIN_INFO_SOCIETE_MAIL;