lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2014-03-01 14:55:11 +01:00
commit 16d759b0d6
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/commondocgenerator.class.php
View File

@ -174,8 +174,8 @@ abstract class CommonDocGenerator
'company_idprof6'=>$object->idprof6, 'company_idprof6'=>$object->idprof6,
'company_note_public'=>$object->note_public, 'company_note_public'=>$object->note_public,
'company_note_private'=>$object->note_private, 'company_note_private'=>$object->note_private,
'company_iban'=>$object->bank_account->iban, 'company_default_bank_iban'=>$object->bank_account->iban,
'company_bic'=>$object->bank_account->bic 'company_default_bank_bic'=>$object->bank_account->bic
); );
// Retrieve extrafields // Retrieve extrafields

1
htdocs/install/mysql/data/llx_00_c_pays.sql
View File

@ -278,3 +278,4 @@ insert into llx_c_pays (rowid,code,libelle) values (243, 'JE', 'Jersey' )
insert into llx_c_pays (rowid,code,libelle) values (244, 'ME', 'Monténégro' ); insert into llx_c_pays (rowid,code,libelle) values (244, 'ME', 'Monténégro' );
insert into llx_c_pays (rowid,code,libelle) values (245, 'BL', 'Saint-Barthélemy'); insert into llx_c_pays (rowid,code,libelle) values (245, 'BL', 'Saint-Barthélemy');
insert into llx_c_pays (rowid,code,libelle) values (246, 'MF', 'Saint-Martin' ); insert into llx_c_pays (rowid,code,libelle) values (246, 'MF', 'Saint-Martin' );
insert into llx_c_pays (rowid,code,libelle) values (247, 'BU', 'Burundi' );

3
htdocs/user/fiche.php
View File

@ -8,7 +8,7 @@
* Copyright (C) 2011 Herve Prot <herve.prot@symeos.com> * Copyright (C) 2011 Herve Prot <herve.prot@symeos.com>
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro> * Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com> * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -1075,6 +1075,7 @@ else
if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER)) $rowspan++; if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER)) $rowspan++;
if (! empty($conf->societe->enabled)) $rowspan++; if (! empty($conf->societe->enabled)) $rowspan++;
if (! empty($conf->adherent->enabled)) $rowspan++; if (! empty($conf->adherent->enabled)) $rowspan++;
if (! empty($conf->skype->enabled)) $rowspan++;
// Lastname // Lastname
print '<tr><td valign="top">'.$langs->trans("Lastname").'</td>'; print '<tr><td valign="top">'.$langs->trans("Lastname").'</td>';