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
79529f3e
Commit
79529f3e
authored
14 years ago
by
Regis Houssin
Browse files
Options
Downloads
Patches
Plain Diff
Fix: missing contactid and socid
Fix: missing contact in event if no company
parent
d3d15e20
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/comm/action/fiche.php
+3
-6
3 additions, 6 deletions
htdocs/comm/action/fiche.php
htdocs/contact/index.php
+3
-4
3 additions, 4 deletions
htdocs/contact/index.php
with
6 additions
and
10 deletions
htdocs/comm/action/fiche.php
+
3
−
6
View file @
79529f3e
<?php
<?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-201
0
Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-201
1
Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Simon TOSSER <simon@kornog-computing.com>
* Copyright (C) 2005 Simon TOSSER <simon@kornog-computing.com>
* Copyright (C) 2005-20
09
Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2005-20
11
Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
*
*
* This program is free software; you can redistribute it and/or modify
* This program is free software; you can redistribute it and/or modify
...
@@ -59,7 +59,6 @@ $actioncomm = new ActionComm($db);
...
@@ -59,7 +59,6 @@ $actioncomm = new ActionComm($db);
$contact
=
new
Contact
(
$db
);
$contact
=
new
Contact
(
$db
);
/*
/*
* Action creation de l'action
* Action creation de l'action
*/
*/
...
@@ -410,8 +409,6 @@ if (GETPOST("action") == 'update')
...
@@ -410,8 +409,6 @@ if (GETPOST("action") == 'update')
}
}
}
}
/*
/*
* View
* View
*/
*/
...
@@ -583,7 +580,7 @@ if (GETPOST('action') == 'create')
...
@@ -583,7 +580,7 @@ if (GETPOST('action') == 'create')
print
'</td></tr>'
;
print
'</td></tr>'
;
// If company is forced, we propose contacts (may be contact is also forced)
// If company is forced, we propose contacts (may be contact is also forced)
if
(
GETPOST
(
"socid"
)
>
0
)
if
(
GETPOST
(
"contactid"
)
>
0
||
GETPOST
(
"socid"
)
>
0
)
{
{
print
'<tr><td nowrap>'
.
$langs
->
trans
(
"ActionOnContact"
)
.
'</td><td>'
;
print
'<tr><td nowrap>'
.
$langs
->
trans
(
"ActionOnContact"
)
.
'</td><td>'
;
$html
->
select_contacts
(
GETPOST
(
"socid"
),
GETPOST
(
'contactid'
),
'contactid'
,
1
,
1
);
$html
->
select_contacts
(
GETPOST
(
"socid"
),
GETPOST
(
'contactid'
),
'contactid'
,
1
,
1
);
...
...
This diff is collapsed.
Click to expand it.
htdocs/contact/index.php
+
3
−
4
View file @
79529f3e
<?php
<?php
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Eric Seigne <erics@rycks.com>
* Copyright (C) 2003 Eric Seigne <erics@rycks.com>
* Copyright (C) 2004-201
0
Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-201
1
Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-20
09
Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2005-20
11
Regis Houssin <regis@dolibarr.fr>
*
*
* This program is free software; you can redistribute it and/or modify
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* it under the terms of the GNU General Public License as published by
...
@@ -346,8 +346,7 @@ if ($result)
...
@@ -346,8 +346,7 @@ if ($result)
// Links Add action and Export vcard
// Links Add action and Export vcard
print
'<td align="right">'
;
print
'<td align="right">'
;
$link
=
'<a href="'
.
DOL_URL_ROOT
.
'/comm/action/fiche.php?action=create&backtopage=1&contactid='
.
$cid
.
'&socid='
.
$socid
.
'">'
.
img_object
(
$langs
->
trans
(
"AddAction"
),
"calendar"
)
.
'</a>'
;
print
'<a href="'
.
DOL_URL_ROOT
.
'/comm/action/fiche.php?action=create&backtopage=1&contactid='
.
$obj
->
cidp
.
'&socid='
.
$obj
->
socid
.
'">'
.
img_object
(
$langs
->
trans
(
"AddAction"
),
"calendar"
)
.
'</a>'
;
print
$link
;
print
' '
;
print
' '
;
print
'<a href="'
.
DOL_URL_ROOT
.
'/contact/vcard.php?id='
.
$obj
->
cidp
.
'">'
;
print
'<a href="'
.
DOL_URL_ROOT
.
'/contact/vcard.php?id='
.
$obj
->
cidp
.
'">'
;
print
img_picto
(
$langs
->
trans
(
"VCard"
),
'vcard.png'
)
.
' '
;
print
img_picto
(
$langs
->
trans
(
"VCard"
),
'vcard.png'
)
.
' '
;
...
...
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