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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
b1b69336
Commit
b1b69336
authored
10 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
New: Add proposals into referer page of thirdparty
parent
7021f4fb
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ChangeLog
+1
-0
1 addition, 0 deletions
ChangeLog
htdocs/societe/consumption.php
+15
-1
15 additions, 1 deletion
htdocs/societe/consumption.php
with
16 additions
and
1 deletion
ChangeLog
+
1
−
0
View file @
b1b69336
...
@@ -5,6 +5,7 @@ English Dolibarr ChangeLog
...
@@ -5,6 +5,7 @@ English Dolibarr ChangeLog
***** ChangeLog for 3.7 compared to 3.6.* *****
***** ChangeLog for 3.7 compared to 3.6.* *****
For users:
For users:
- New: Add proposals into referer page of thirdparty.
- New: On contact list can set filter on both active and not active (no more exclusive select).
- New: On contact list can set filter on both active and not active (no more exclusive select).
- New: Each user can include its own external ics calendar into dolibarr agenda view.
- New: Each user can include its own external ics calendar into dolibarr agenda view.
- New: Intervention documents are now available in ECM module.
- New: Intervention documents are now available in ECM module.
...
...
This diff is collapsed.
Click to expand it.
htdocs/societe/consumption.php
+
15
−
1
View file @
b1b69336
...
@@ -131,8 +131,9 @@ if ($object->client)
...
@@ -131,8 +131,9 @@ if ($object->client)
$obj
=
$db
->
fetch_object
(
$resql
);
$obj
=
$db
->
fetch_object
(
$resql
);
$nbFactsClient
=
$obj
->
nb
;
$nbFactsClient
=
$obj
->
nb
;
$thirdTypeArray
[
'customer'
]
=
$langs
->
trans
(
"customer"
);
$thirdTypeArray
[
'customer'
]
=
$langs
->
trans
(
"customer"
);
if
(
$conf
->
facture
->
enabled
&&
$user
->
rights
->
facture
->
lire
)
$elementTypeArray
[
'invoice'
]
=
$langs
->
trans
(
'Invoices'
);
if
(
$conf
->
commande
->
enabled
&&
$user
->
rights
->
commande
->
lire
)
$elementTypeArray
[
'order'
]
=
$langs
->
trans
(
'Orders'
);
if
(
$conf
->
commande
->
enabled
&&
$user
->
rights
->
commande
->
lire
)
$elementTypeArray
[
'order'
]
=
$langs
->
trans
(
'Orders'
);
if
(
$conf
->
propal
->
enabled
&&
$user
->
rights
->
propal
->
lire
)
$elementTypeArray
[
'propal'
]
=
$langs
->
trans
(
'Proposals'
);
if
(
$conf
->
facture
->
enabled
&&
$user
->
rights
->
facture
->
lire
)
$elementTypeArray
[
'invoice'
]
=
$langs
->
trans
(
'Invoices'
);
}
}
if
(
$object
->
fournisseur
)
if
(
$object
->
fournisseur
)
...
@@ -177,6 +178,19 @@ if ($type_element == 'invoice')
...
@@ -177,6 +178,19 @@ if ($type_element == 'invoice')
$doc_number
=
'f.facnumber'
;
$doc_number
=
'f.facnumber'
;
$thirdTypeSelect
=
'customer'
;
$thirdTypeSelect
=
'customer'
;
}
}
if
(
$type_element
==
'propal'
)
{
require_once
DOL_DOCUMENT_ROOT
.
'/comm/propal/class/propal.class.php'
;
$documentstatic
=
new
Propal
(
$db
);
$sql_select
=
'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.datep as datePrint, '
;
$tables_from
=
MAIN_DB_PREFIX
.
"propal as c,"
.
MAIN_DB_PREFIX
.
"propaldet as d"
;
$where
=
" WHERE c.fk_soc = s.rowid AND s.rowid = "
.
$socid
;
$where
.
=
" AND d.fk_propal = c.rowid"
;
$where
.
=
" AND c.entity = "
.
$conf
->
entity
;
$datePrint
=
'c.datep'
;
$doc_number
=
'c.ref'
;
$thirdTypeSelect
=
'customer'
;
}
if
(
$type_element
==
'order'
)
if
(
$type_element
==
'order'
)
{
{
require_once
DOL_DOCUMENT_ROOT
.
'/commande/class/commande.class.php'
;
require_once
DOL_DOCUMENT_ROOT
.
'/commande/class/commande.class.php'
;
...
...
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