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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2019-11-19 18:56:22 +01:00
commit 7dba9ecdf4
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/contact/card.php
View File

@ -927,7 +927,7 @@ else
// Civility // Civility
print '<tr><td><label for="civility_code">'.$langs->trans("UserTitle").'</label></td><td colspan="3">'; print '<tr><td><label for="civility_code">'.$langs->trans("UserTitle").'</label></td><td colspan="3">';
print $formcompany->select_civility(GETPOSTISSET("civility_code")?GETPOST("civility", "aZ09"):$object->civility_code, 'civility_code'); print $formcompany->select_civility(GETPOSTISSET("civility_code")?GETPOST("civility_code", "aZ09"):$object->civility_code, 'civility_code');
print '</td></tr>'; print '</td></tr>';
print '<tr><td><label for="title">'.$langs->trans("PostOrFunction").'</label></td>'; print '<tr><td><label for="title">'.$langs->trans("PostOrFunction").'</label></td>';

1
htdocs/langs/en_US/stocks.lang
View File

@ -210,3 +210,4 @@ StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
StockIncrease=Stock increase StockIncrease=Stock increase
StockDecrease=Stock decrease StockDecrease=Stock decrease
StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to use

3
htdocs/user/document.php
View File

@ -115,8 +115,7 @@ if (empty($reshook)) {
$form = new Form($db); $form = new Form($db);
$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas'; llxHeader('', $langs->trans("UserCard").' - '.$langs->trans("Files"));
llxHeader('', $langs->trans("ThirdParty").' - '.$langs->trans("Files"), $help_url);
if ($object->id) if ($object->id)
{ {