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

Fix label of social contribution and button date

Browse Source
This commit is contained in:
Laurent Destailleur 2020-07-09 23:18:19 +02:00
parent a59b37cb72
commit bd63b84f8e
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/compta/paiement_charge.php
View File

@ -41,6 +41,8 @@ if ($user->socid > 0)
$socid = $user->socid;
}
$charge = new ChargeSociales($db);
/*
* Actions
@ -161,7 +163,6 @@ $form = new Form($db);
// Formulaire de creation d'un paiement de charge
if ($action == 'create')
{
$charge = new ChargeSociales($db);
$charge->fetch($chid);
$charge->accountid = $charge->fk_account ? $charge->fk_account : $charge->accountid;
$charge->paiementtype = $charge->mode_reglement_id ? $charge->mode_reglement_id : $charge->paiementtype;
@ -223,7 +224,7 @@ if ($action == 'create')
print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
$datepaye = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
$datepayment = empty($conf->global->MAIN_AUTOFILL_DATE) ? (empty($_POST["remonth"]) ?-1 : $datepaye) : 0;
print $form->selectDate($datepayment, '', '', '', '', "add_payment", 1, 1);
print $form->selectDate($datepayment, '', '', '', 0, "add_payment", 1, 1, 0, '', '', $charge->date_ech, '', 1, $langs->trans("DateOfSocialContribution"));
print "</td>";
print '</tr>';

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

@ -481,6 +481,8 @@ if ($id > 0)
}
$morehtmlref .= '</div>';
$morehtmlright = '';
$linkback = '<a href="'.DOL_URL_ROOT.'/compta/sociales/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status

2
htdocs/core/lib/tax.lib.php
View File

@ -42,7 +42,7 @@ function tax_prepare_head(ChargeSociales $object)
$head = array();
$head[$h][0] = DOL_URL_ROOT.'/compta/sociales/card.php?id='.$object->id;
$head[$h][1] = $langs->trans('Card');
$head[$h][1] = $langs->trans('SocialContribution');
$head[$h][2] = 'card';
$h++;

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

@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
SocialContributions=Social or fiscal taxes
SocialContributionsDeductibles=Deductible social or fiscal taxes
SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
DateOfSocialContribution=Date of social or fiscal tax
LabelContrib=Label contribution
TypeContrib=Type contribution
MenuSpecialExpenses=Special expenses