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

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

Browse Source 
Conflicts:
	htdocs/compta/facture/card.php
This commit is contained in:
Laurent Destailleur 2019-01-28 16:29:34 +01:00
commit 0827929ede
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/facture/card.php
View File

@ -4560,7 +4560,7 @@ elseif ($id > 0 || ! empty($ref))
} }
else else
{ {
print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="' . $langs->trans("DisabledBecauseDispatchedInAccounting") . '">' . $langs->trans('Modify') . '</span></div>'; print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="' . $langs->trans("DisabledBecauseDispatchedInBookkeeping") . '">' . $langs->trans('Modify') . '</span></div>';
} }
} }

5
htdocs/societe/checkvat/checkVatPopup.php
View File

@ -40,8 +40,7 @@ $conf->dol_hide_leftmenu=1;
llxHeader('', $langs->trans("VATIntraCheckableOnEUSite")); llxHeader('', $langs->trans("VATIntraCheckableOnEUSite"));
print '<div>'; print '<div class="vatcheckarea" style="margin-bottom: 10px">';
print '<div>';
print load_fiche_titre($langs->trans("VATIntraCheckableOnEUSite"),'','title_setup'); print load_fiche_titre($langs->trans("VATIntraCheckableOnEUSite"),'','title_setup');
@ -174,6 +173,8 @@ if ($messagetoshow)
print nl2br($messagetoshow); print nl2br($messagetoshow);
} }
print '</div>';
// End of page // End of page
llxFooter(); llxFooter();
$db->close(); $db->close();