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

Look and feel v7

Browse Source
This commit is contained in:
Laurent Destailleur 2018-03-11 21:31:34 +01:00
parent e1654f4215
commit 51c94fadfa
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/admin/taxes.php
View File

@ -113,13 +113,14 @@ if ($action == 'update') {
*/ */
llxHeader(); llxHeader();
$form=new Form($db); $form=new Form($db);
if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db); if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>'; $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
print load_fiche_titre($langs->trans('TaxSetup'),$linkback,'title_setup'); print load_fiche_titre($langs->trans('TaxSetup'),$linkback,'title_setup');
dol_fiche_head(); dol_fiche_head(null, '0', '', -1);
if (empty($mysoc->tva_assuj)) if (empty($mysoc->tva_assuj))
{ {
@ -127,6 +128,8 @@ if (empty($mysoc->tva_assuj))
} }
else else
{ {
print '<br>';
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
// Cas des parametres TAX_MODE_SELL/BUY_SERVICE/PRODUCT // Cas des parametres TAX_MODE_SELL/BUY_SERVICE/PRODUCT
@ -146,7 +149,7 @@ else
print "</table>\n"; print "</table>\n";
print '<br>'; print '<br>';
print load_fiche_titre($langs->trans("SummaryOfVatExigibilityUsedByDefault"),'',''); print ' -> '.$langs->trans("SummaryOfVatExigibilityUsedByDefault");
//print ' ('.$langs->trans("CanBeChangedWhenMakingInvoice").')'; //print ' ('.$langs->trans("CanBeChangedWhenMakingInvoice").')';
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
@ -195,22 +198,27 @@ else
print "<br>\n"; print "<br>\n";
/* /*
* Others params * Others params
*/ */
print load_fiche_titre($langs->trans("OtherOptions"),'','');
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td colspan="3">' . $langs->trans('OtherOptions') . '</td>'; print '<td colspan="3">' . $langs->trans('Parameters') . '</td>';
print "</tr>\n"; print "</tr>\n";
foreach ($list as $key) foreach ($list as $key)
{ {
print '<tr class="oddeven value">'; print '<tr class="oddeven value">';
// Param // Param
$label = $langs->trans($key); $label = $langs->trans($key);
print '<td><label for="'.$key.'">'.$label.'</label></td>'; print '<td><label for="'.$key.'">'.$label.'</label></td>';
// Value // Value

2
htdocs/langs/en_US/compta.lang
View File

@ -31,7 +31,7 @@ Credit=Credit
Piece=Accounting Doc. Piece=Accounting Doc.
AmountHTVATRealReceived=Net collected AmountHTVATRealReceived=Net collected
AmountHTVATRealPaid=Net paid AmountHTVATRealPaid=Net paid
VATToPay=VAT sells VATToPay=Tax sales
VATReceived=Tax received VATReceived=Tax received
VATToCollect=Tax purchases VATToCollect=Tax purchases
VATSummary=Tax Balance VATSummary=Tax Balance