Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
74d3fdae
Commit
74d3fdae
authored
11 years ago
by
aspangaro
Browse files
Options
Downloads
Patches
Plain Diff
Update langs & fix period for salaries in tax module
parent
fca29f43
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
htdocs/compta/salaries/fiche.php
+18
-0
18 additions, 0 deletions
htdocs/compta/salaries/fiche.php
htdocs/langs/en_US/compta.lang
+3
-2
3 additions, 2 deletions
htdocs/langs/en_US/compta.lang
htdocs/langs/fr_FR/compta.lang
+3
-0
3 additions, 0 deletions
htdocs/langs/fr_FR/compta.lang
with
24 additions
and
2 deletions
htdocs/compta/salaries/fiche.php
+
18
−
0
View file @
74d3fdae
...
@@ -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">'
;
...
...
This diff is collapsed.
Click to expand it.
htdocs/langs/en_US/compta.lang
+
3
−
2
View file @
74d3fdae
...
@@ -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
Date
sp
=Date start period
Date
StartPeriod
=Date start period
Date
ep
=Date end period
Date
EndPeriod
=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
...
...
This diff is collapsed.
Click to expand it.
htdocs/langs/fr_FR/compta.lang
+
3
−
0
View file @
74d3fdae
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment