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
13cb2e47
Commit
13cb2e47
authored
11 years ago
by
Raphaël Doursenaud
Browse files
Options
Downloads
Patches
Plain Diff
Contracts module configuration: missing translation string
parent
fa1af990
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
htdocs/core/modules/contract/doc/pdf_strato.modules.php
+10
-11
10 additions, 11 deletions
htdocs/core/modules/contract/doc/pdf_strato.modules.php
htdocs/langs/en_US/contracts.lang
+2
-0
2 additions, 0 deletions
htdocs/langs/en_US/contracts.lang
with
12 additions
and
11 deletions
htdocs/core/modules/contract/doc/pdf_strato.modules.php
+
10
−
11
View file @
13cb2e47
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
/**
/**
* \file htdocs/core/modules/contract/doc/pdf_strato.modules.php
* \file htdocs/core/modules/contract/doc/pdf_strato.modules.php
* \ingroup ficheinter
* \ingroup ficheinter
* \brief
Fichier de la classe permettant de generer les fiches d'intervention au modele Strato
* \brief
Strato contracts template class file
*/
*/
require_once
DOL_DOCUMENT_ROOT
.
'/core/modules/contract/modules_contract.php'
;
require_once
DOL_DOCUMENT_ROOT
.
'/core/modules/contract/modules_contract.php'
;
require_once
DOL_DOCUMENT_ROOT
.
'/core/lib/company.lib.php'
;
require_once
DOL_DOCUMENT_ROOT
.
'/core/lib/company.lib.php'
;
...
@@ -64,7 +64,7 @@ class pdf_strato extends ModelePDFContract
...
@@ -64,7 +64,7 @@ class pdf_strato extends ModelePDFContract
$this
->
db
=
$db
;
$this
->
db
=
$db
;
$this
->
name
=
'strato'
;
$this
->
name
=
'strato'
;
$this
->
description
=
$langs
->
trans
(
"
DocumentModelStandard
"
);
$this
->
description
=
$langs
->
trans
(
"
StandardContractsTemplate
"
);
// Dimension page pour format A4
// Dimension page pour format A4
$this
->
type
=
'pdf'
;
$this
->
type
=
'pdf'
;
...
@@ -116,7 +116,6 @@ class pdf_strato extends ModelePDFContract
...
@@ -116,7 +116,6 @@ class pdf_strato extends ModelePDFContract
$outputlangs
->
load
(
"dict"
);
$outputlangs
->
load
(
"dict"
);
$outputlangs
->
load
(
"companies"
);
$outputlangs
->
load
(
"companies"
);
$outputlangs
->
load
(
"contracts"
);
$outputlangs
->
load
(
"contracts"
);
$outputlangs
->
load
(
"interventions"
);
if
(
$conf
->
contrat
->
dir_output
)
if
(
$conf
->
contrat
->
dir_output
)
{
{
...
@@ -171,10 +170,10 @@ class pdf_strato extends ModelePDFContract
...
@@ -171,10 +170,10 @@ class pdf_strato extends ModelePDFContract
$pdf
->
SetDrawColor
(
128
,
128
,
128
);
$pdf
->
SetDrawColor
(
128
,
128
,
128
);
$pdf
->
SetTitle
(
$outputlangs
->
convToOutputCharset
(
$object
->
ref
));
$pdf
->
SetTitle
(
$outputlangs
->
convToOutputCharset
(
$object
->
ref
));
$pdf
->
SetSubject
(
$outputlangs
->
transnoentities
(
"
Intervention
Card"
));
$pdf
->
SetSubject
(
$outputlangs
->
transnoentities
(
"
Contract
Card"
));
$pdf
->
SetCreator
(
"Dolibarr "
.
DOL_VERSION
);
$pdf
->
SetCreator
(
"Dolibarr "
.
DOL_VERSION
);
$pdf
->
SetAuthor
(
$outputlangs
->
convToOutputCharset
(
$user
->
getFullName
(
$outputlangs
)));
$pdf
->
SetAuthor
(
$outputlangs
->
convToOutputCharset
(
$user
->
getFullName
(
$outputlangs
)));
$pdf
->
SetKeyWords
(
$outputlangs
->
convToOutputCharset
(
$object
->
ref
)
.
" "
.
$outputlangs
->
transnoentities
(
"
Intervention
Card"
));
$pdf
->
SetKeyWords
(
$outputlangs
->
convToOutputCharset
(
$object
->
ref
)
.
" "
.
$outputlangs
->
transnoentities
(
"
Contract
Card"
));
if
(
!
empty
(
$conf
->
global
->
MAIN_DISABLE_PDF_COMPRESSION
))
$pdf
->
SetCompression
(
false
);
if
(
!
empty
(
$conf
->
global
->
MAIN_DISABLE_PDF_COMPRESSION
))
$pdf
->
SetCompression
(
false
);
$pdf
->
SetMargins
(
$this
->
marge_gauche
,
$this
->
marge_haute
,
$this
->
marge_droite
);
// Left, Top, Right
$pdf
->
SetMargins
(
$this
->
marge_gauche
,
$this
->
marge_haute
,
$this
->
marge_droite
);
// Left, Top, Right
...
@@ -408,13 +407,13 @@ class pdf_strato extends ModelePDFContract
...
@@ -408,13 +407,13 @@ class pdf_strato extends ModelePDFContract
if
(
empty
(
$hidebottom
))
if
(
empty
(
$hidebottom
))
{
{
$pdf
->
SetXY
(
20
,
230
);
$pdf
->
SetXY
(
20
,
230
);
$pdf
->
MultiCell
(
66
,
5
,
$outputlangs
->
transnoentities
(
"NameAndSignature
OfInternalContact"
),
0
,
'L'
,
0
);
$pdf
->
MultiCell
(
66
,
5
,
$outputlangs
->
transnoentities
(
"
Contact
NameAndSignature
"
,
$this
->
emetteur
->
name
),
0
,
'L'
,
0
);
$pdf
->
SetXY
(
20
,
235
);
$pdf
->
SetXY
(
20
,
235
);
$pdf
->
MultiCell
(
80
,
25
,
''
,
1
);
$pdf
->
MultiCell
(
80
,
25
,
''
,
1
);
$pdf
->
SetXY
(
110
,
230
);
$pdf
->
SetXY
(
110
,
230
);
$pdf
->
MultiCell
(
80
,
5
,
$outputlangs
->
transnoentities
(
"NameAndSignature
OfExternalContact"
),
0
,
'L'
,
0
);
$pdf
->
MultiCell
(
80
,
5
,
$outputlangs
->
transnoentities
(
"
Contact
NameAndSignature
"
,
$this
->
recipient
->
name
),
0
,
'L'
,
0
);
$pdf
->
SetXY
(
110
,
235
);
$pdf
->
SetXY
(
110
,
235
);
$pdf
->
MultiCell
(
80
,
25
,
''
,
1
);
$pdf
->
MultiCell
(
80
,
25
,
''
,
1
);
...
@@ -565,11 +564,11 @@ class pdf_strato extends ModelePDFContract
...
@@ -565,11 +564,11 @@ class pdf_strato extends ModelePDFContract
// On peut utiliser le nom de la societe du contact
// On peut utiliser le nom de la societe du contact
if
(
!
empty
(
$conf
->
global
->
MAIN_USE_COMPANY_NAME_OF_CONTACT
))
$socname
=
$object
->
contact
->
socname
;
if
(
!
empty
(
$conf
->
global
->
MAIN_USE_COMPANY_NAME_OF_CONTACT
))
$socname
=
$object
->
contact
->
socname
;
else
$socname
=
$object
->
client
->
nom
;
else
$socname
=
$object
->
client
->
nom
;
$
carac_cl
ient
_
name
=
$outputlangs
->
convToOutputCharset
(
$socname
);
$
this
->
recip
ient
->
name
=
$outputlangs
->
convToOutputCharset
(
$socname
);
}
}
else
else
{
{
$
carac_cl
ient
_
name
=
$outputlangs
->
convToOutputCharset
(
$object
->
client
->
nom
);
$
this
->
recip
ient
->
name
=
$outputlangs
->
convToOutputCharset
(
$object
->
client
->
nom
);
}
}
$carac_client
=
pdf_build_address
(
$outputlangs
,
$this
->
emetteur
,
$object
->
client
,
(
isset
(
$object
->
contact
)
?
$object
->
contact
:
''
),
$usecontact
,
'target'
);
$carac_client
=
pdf_build_address
(
$outputlangs
,
$this
->
emetteur
,
$object
->
client
,
(
isset
(
$object
->
contact
)
?
$object
->
contact
:
''
),
$usecontact
,
'target'
);
...
@@ -591,11 +590,11 @@ class pdf_strato extends ModelePDFContract
...
@@ -591,11 +590,11 @@ class pdf_strato extends ModelePDFContract
// Show recipient name
// Show recipient name
$pdf
->
SetXY
(
$posx
+
2
,
$posy
+
3
);
$pdf
->
SetXY
(
$posx
+
2
,
$posy
+
3
);
$pdf
->
SetFont
(
''
,
'B'
,
$default_font_size
);
$pdf
->
SetFont
(
''
,
'B'
,
$default_font_size
);
$pdf
->
MultiCell
(
$widthrecbox
,
4
,
$
carac_cl
ient
_
name
,
0
,
'L'
);
$pdf
->
MultiCell
(
$widthrecbox
,
4
,
$
this
->
recip
ient
->
name
,
0
,
'L'
);
// Show recipient information
// Show recipient information
$pdf
->
SetFont
(
''
,
''
,
$default_font_size
-
1
);
$pdf
->
SetFont
(
''
,
''
,
$default_font_size
-
1
);
$pdf
->
SetXY
(
$posx
+
2
,
$posy
+
4
+
(
dol_nboflines_bis
(
$
carac_cl
ient
_
name
,
50
)
*
4
));
$pdf
->
SetXY
(
$posx
+
2
,
$posy
+
4
+
(
dol_nboflines_bis
(
$
this
->
recip
ient
->
name
,
50
)
*
4
));
$pdf
->
MultiCell
(
$widthrecbox
,
4
,
$carac_client
,
0
,
'L'
);
$pdf
->
MultiCell
(
$widthrecbox
,
4
,
$carac_client
,
0
,
'L'
);
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
htdocs/langs/en_US/contracts.lang
+
2
−
0
View file @
13cb2e47
...
@@ -89,6 +89,8 @@ ListOfServicesToExpireWithDuration=List of Services to expire in %s days
...
@@ -89,6 +89,8 @@ ListOfServicesToExpireWithDuration=List of Services to expire in %s days
ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days
ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days
ListOfServicesToExpire=List of Services to expire
ListOfServicesToExpire=List of Services to expire
NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
StandardContractsTemplate=Standard contracts template
ContactNameAndSignature=For %s, name and signature:
##### Types de contacts #####
##### Types de contacts #####
TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
...
...
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