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
e4b697fa
Commit
e4b697fa
authored
13 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
New: Show delivery date into proposal template azur.
parent
f241e338
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
ChangeLog
+1
-0
1 addition, 0 deletions
ChangeLog
htdocs/core/modules/propale/doc/pdf_azur.modules.php
+17
-3
17 additions, 3 deletions
htdocs/core/modules/propale/doc/pdf_azur.modules.php
with
18 additions
and
3 deletions
ChangeLog
+
1
−
0
View file @
e4b697fa
...
@@ -58,6 +58,7 @@ For users:
...
@@ -58,6 +58,7 @@ For users:
- New: [ task #176 ] Allow to use ODT templates for proposals and orders like it's done for invoices
- New: [ task #176 ] Allow to use ODT templates for proposals and orders like it's done for invoices
- New: Add hidden option MAIN_ADD_PDF_BACKGROUND to add a PDF as background of invoice/order generated PDF.
- New: Add hidden option MAIN_ADD_PDF_BACKGROUND to add a PDF as background of invoice/order generated PDF.
- New: Can convert a product/service into service/product.
- New: Can convert a product/service into service/product.
- New: Show delivery date into proposal template azur.
- Fix: Can use POS module with several concurrent users.
- Fix: Can use POS module with several concurrent users.
- Fix: Installer don't fails with Mysql version that added a ssl_cypher field.
- Fix: Installer don't fails with Mysql version that added a ssl_cypher field.
- Fix: Sanitize input parameters.
- Fix: Sanitize input parameters.
...
...
This diff is collapsed.
Click to expand it.
htdocs/core/modules/propale/doc/pdf_azur.modules.php
+
17
−
3
View file @
e4b697fa
...
@@ -463,8 +463,22 @@ class pdf_azur extends ModelePDFPropales
...
@@ -463,8 +463,22 @@ class pdf_azur extends ModelePDFPropales
$posy
=
$pdf
->
GetY
()
+
4
;
$posy
=
$pdf
->
GetY
()
+
4
;
}
}
// Show availability conditions
// Show shipping date
if
(
$object
->
type
!=
2
&&
(
$object
->
availability_code
||
$object
->
availability
))
if
(
$object
->
type
!=
2
&&
$object
->
date_livraison
)
{
$outputlangs
->
load
(
"sendings"
);
$pdf
->
SetFont
(
''
,
'B'
,
$default_font_size
-
2
);
$pdf
->
SetXY
(
$this
->
marge_gauche
,
$posy
);
$titre
=
$outputlangs
->
transnoentities
(
"DateDeliveryPlanned"
)
.
':'
;
$pdf
->
MultiCell
(
80
,
4
,
$titre
,
0
,
'L'
);
$pdf
->
SetFont
(
''
,
''
,
$default_font_size
-
2
);
$pdf
->
SetXY
(
82
,
$posy
);
$dlp
=
dol_print_date
(
$object
->
date_livraison
,
"daytext"
,
false
,
$outputlangs
,
true
);
$pdf
->
MultiCell
(
80
,
4
,
$dlp
,
0
,
'L'
);
$posy
=
$pdf
->
GetY
()
+
1
;
}
elseif
(
$object
->
type
!=
2
&&
(
$object
->
availability_code
||
$object
->
availability
))
// Show availability conditions
{
{
$pdf
->
SetFont
(
''
,
'B'
,
$default_font_size
-
2
);
$pdf
->
SetFont
(
''
,
'B'
,
$default_font_size
-
2
);
$pdf
->
SetXY
(
$this
->
marge_gauche
,
$posy
);
$pdf
->
SetXY
(
$this
->
marge_gauche
,
$posy
);
...
...
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