Skip to content
Snippets Groups Projects
Commit 74d3fdae authored by aspangaro's avatar aspangaro
Browse files

Update langs & fix period for salaries in tax module

parent fca29f43
No related branches found
No related tags found
No related merge requests found
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
*/ */
require '../../main.inc.php'; require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/salaries.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/salaries.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
...@@ -155,6 +156,23 @@ if ($id) ...@@ -155,6 +156,23 @@ if ($id)
// Formulaire saisie salaire // Formulaire saisie salaire
if ($action == 'create') if ($action == 'create')
{ {
$year_current = strftime("%Y",dol_now());
$pastmonth = strftime("%m",dol_now()) - 1;
$pastmonthyear = $year_current;
if ($pastmonth == 0)
{
$pastmonth = 12;
$pastmonthyear--;
}
$datesp=dol_mktime(0, 0, 0, $datespmonth, $datespday, $datespyear);
$dateep=dol_mktime(23, 59, 59, $dateepmonth, $dateepday, $dateepyear);
if (empty($datesp) || empty($dateep)) // We define date_start and date_end
{
$datesp=dol_get_first_day($pastmonthyear,$pastmonth,false); $dateep=dol_get_last_day($pastmonthyear,$pastmonth,false);
}
print "<form name='add' action=\"fiche.php\" method=\"post\">\n"; print "<form name='add' action=\"fiche.php\" method=\"post\">\n";
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="add">'; print '<input type="hidden" name="action" value="add">';
......
...@@ -52,6 +52,7 @@ TaxAndDividendsArea=Tax, social contributions and dividends area ...@@ -52,6 +52,7 @@ TaxAndDividendsArea=Tax, social contributions and dividends area
SocialContribution=Social contribution SocialContribution=Social contribution
SocialContributions=Social contributions SocialContributions=Social contributions
MenuTaxAndDividends=Taxes and dividends MenuTaxAndDividends=Taxes and dividends
MenuSalaries=Salaries
MenuSocialContributions=Social contributions MenuSocialContributions=Social contributions
MenuNewSocialContribution=New contribution MenuNewSocialContribution=New contribution
NewSocialContribution=New social contribution NewSocialContribution=New social contribution
...@@ -70,8 +71,8 @@ ListOfPayments=List of payments ...@@ -70,8 +71,8 @@ ListOfPayments=List of payments
ListOfCustomerPayments=List of customer payments ListOfCustomerPayments=List of customer payments
ListOfSupplierPayments=List of supplier payments ListOfSupplierPayments=List of supplier payments
DatePayment=Payment date DatePayment=Payment date
Datesp=Date start period DateStartPeriod=Date start period
Dateep=Date end period DateEndPeriod=Date end period
NewVATPayment=New VAT payment NewVATPayment=New VAT payment
NewSalPayment=New Salary payment NewSalPayment=New Salary payment
newLT2PaymentES=New IRPF payment newLT2PaymentES=New IRPF payment
......
...@@ -51,6 +51,7 @@ TaxAndDividendsArea=Espace taxes, charges sociales et dividendes ...@@ -51,6 +51,7 @@ TaxAndDividendsArea=Espace taxes, charges sociales et dividendes
SocialContribution=Charge sociale SocialContribution=Charge sociale
SocialContributions=Charges sociales SocialContributions=Charges sociales
MenuTaxAndDividends=Taxes et charges MenuTaxAndDividends=Taxes et charges
MenuSalaries=Salaires
MenuSocialContributions=Charges sociales MenuSocialContributions=Charges sociales
MenuNewSocialContribution=Nouvelle charge MenuNewSocialContribution=Nouvelle charge
NewSocialContribution=Nouvelle charge sociale NewSocialContribution=Nouvelle charge sociale
...@@ -69,6 +70,8 @@ ListOfPayments=Liste des règlements ...@@ -69,6 +70,8 @@ ListOfPayments=Liste des règlements
ListOfCustomerPayments=Liste des règlements clients ListOfCustomerPayments=Liste des règlements clients
ListOfSupplierPayments=Liste des règlements fournisseurs ListOfSupplierPayments=Liste des règlements fournisseurs
DatePayment=Date de règlement DatePayment=Date de règlement
DateStartPeriod=Date de début période
DateEndPeriod=Date de fin période
NewVATPayment=Nouveau règlement de TVA NewVATPayment=Nouveau règlement de TVA
NewSalPayment=Nouveau règlement de salaire NewSalPayment=Nouveau règlement de salaire
newLT2PaymentES=Nouveau règlement de IRPF newLT2PaymentES=Nouveau règlement de IRPF
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment