2
0
forked from Wavyzz/dolibarr

Update langs & fix period for salaries in tax module

This commit is contained in:
aspangaro
2014-03-07 06:42:48 +01:00
parent fca29f4312
commit 74d3fdae15
3 changed files with 24 additions and 2 deletions

View File

@@ -22,6 +22,7 @@
*/
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/bank/class/account.class.php';
@@ -155,6 +156,23 @@ if ($id)
// Formulaire saisie salaire
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 '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="add">';

View File

@@ -52,6 +52,7 @@ TaxAndDividendsArea=Tax, social contributions and dividends area
SocialContribution=Social contribution
SocialContributions=Social contributions
MenuTaxAndDividends=Taxes and dividends
MenuSalaries=Salaries
MenuSocialContributions=Social contributions
MenuNewSocialContribution=New contribution
NewSocialContribution=New social contribution
@@ -70,8 +71,8 @@ ListOfPayments=List of payments
ListOfCustomerPayments=List of customer payments
ListOfSupplierPayments=List of supplier payments
DatePayment=Payment date
Datesp=Date start period
Dateep=Date end period
DateStartPeriod=Date start period
DateEndPeriod=Date end period
NewVATPayment=New VAT payment
NewSalPayment=New Salary payment
newLT2PaymentES=New IRPF payment

View File

@@ -51,6 +51,7 @@ TaxAndDividendsArea=Espace taxes, charges sociales et dividendes
SocialContribution=Charge sociale
SocialContributions=Charges sociales
MenuTaxAndDividends=Taxes et charges
MenuSalaries=Salaires
MenuSocialContributions=Charges sociales
MenuNewSocialContribution=Nouvelle charge
NewSocialContribution=Nouvelle charge sociale
@@ -69,6 +70,8 @@ ListOfPayments=Liste des règlements
ListOfCustomerPayments=Liste des règlements clients
ListOfSupplierPayments=Liste des règlements fournisseurs
DatePayment=Date de règlement
DateStartPeriod=Date de début période
DateEndPeriod=Date de fin période
NewVATPayment=Nouveau règlement de TVA
NewSalPayment=Nouveau règlement de salaire
newLT2PaymentES=Nouveau règlement de IRPF