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

Merge pull request #3046 from aspangaro/develop-patch30

Browse Source 
Typo "cibility"
This commit is contained in:
Laurent Destailleur 2015-06-15 21:23:36 +02:00
commit e8ac52a194
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/contact/class/contact.class.php
View File

@ -918,7 +918,7 @@ class Contact extends CommonObject
$result=''; $result='';
$label = '<u>' . $langs->trans("ShowContact") . '</u>'; $label = '<u>' . $langs->trans("ShowContact") . '</u>';
$label.= '<br><b>' . $langs->trans("Name") . ':</b> '.$this->getFullName($langs); $label.= '<br><b>' . $langs->trans("Name") . ':</b> '.$this->getFullName($langs);
//if ($this->cibility_id) $label.= '<br><b>' . $langs->trans("Civility") . ':</b> '.$this->civility_id; // TODO Translate cibilty_id code //if ($this->civility_id) $label.= '<br><b>' . $langs->trans("Civility") . ':</b> '.$this->civility_id; // TODO Translate cibilty_id code
$label.= '<br><b>' . $langs->trans("Poste") . ':</b> '.$this->poste; $label.= '<br><b>' . $langs->trans("Poste") . ':</b> '.$this->poste;
$label.= '<br><b>' . $langs->trans("EMail") . ':</b> '.$this->email; $label.= '<br><b>' . $langs->trans("EMail") . ':</b> '.$this->email;
$label.= '<br><b>' . $langs->trans("Phone") . ':</b> '.join(', ',array($this->phone_pro,$this->phone_mobile,$this->phone_perso)); $label.= '<br><b>' . $langs->trans("Phone") . ':</b> '.join(', ',array($this->phone_pro,$this->phone_mobile,$this->phone_perso));

6
htdocs/societe/soc.php
View File

@ -243,7 +243,7 @@ if (empty($reshook))
$object->particulier = GETPOST("private"); $object->particulier = GETPOST("private");
$object->name = dolGetFirstLastname(GETPOST('firstname','alpha'),GETPOST('name','alpha')); $object->name = dolGetFirstLastname(GETPOST('firstname','alpha'),GETPOST('name','alpha'));
$object->civility_id = GETPOST('civility_id'); // Note: cibility id is a code, not an int $object->civility_id = GETPOST('civility_id'); // Note: civility id is a code, not an int
// Add non official properties // Add non official properties
$object->name_bis = GETPOST('name','alpha'); $object->name_bis = GETPOST('name','alpha');
$object->firstname = GETPOST('firstname','alpha'); $object->firstname = GETPOST('firstname','alpha');
@ -995,7 +995,7 @@ else
print '<tr class="individualline"><td>'.fieldLabel('FirstName','firstname').'</td>'; print '<tr class="individualline"><td>'.fieldLabel('FirstName','firstname').'</td>';
print '<td><input type="text" size="60" name="firstname" id="firstname" value="'.$object->firstname.'"></td>'; print '<td><input type="text" size="60" name="firstname" id="firstname" value="'.$object->firstname.'"></td>';
print '<td colspan=2>&nbsp;</td></tr>'; print '<td colspan=2>&nbsp;</td></tr>';
print '<tr class="individualline"><td>'.fieldLabel('UserTitle','cibility_id').'</td><td>'; print '<tr class="individualline"><td>'.fieldLabel('UserTitle','civility_id').'</td><td>';
print $formcompany->select_civility($object->civility_id).'</td>'; print $formcompany->select_civility($object->civility_id).'</td>';
print '<td colspan=2>&nbsp;</td></tr>'; print '<td colspan=2>&nbsp;</td></tr>';
} }
@ -1131,7 +1131,7 @@ else
print '<td>'; print '<td>';
print $form->selectyesno('assujtva_value',1,1); // Assujeti par defaut en creation print $form->selectyesno('assujtva_value',1,1); // Assujeti par defaut en creation
print '</td>'; print '</td>';
print '<td class="nowrap">'.fieldLabel('VATIntra','inra_vat').'</td>'; print '<td class="nowrap">'.fieldLabel('VATIntra','intra_vat').'</td>';
print '<td class="nowrap">'; print '<td class="nowrap">';
$s = '<input type="text" class="flat" name="tva_intra" id="intra_vat" size="12" maxlength="20" value="'.$object->tva_intra.'">'; $s = '<input type="text" class="flat" name="tva_intra" id="intra_vat" size="12" maxlength="20" value="'.$object->tva_intra.'">';

2
scripts/accountancy/export-thirdpartyaccount.php
View File

@ -1,6 +1,6 @@
<?PHP <?PHP
/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com> /* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
* Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@fidurex.fr> * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
* Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro> * Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify