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
93db5103
Commit
93db5103
authored
17 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
New: Go back to caller page if cancel
parent
d3861356
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
htdocs/comm/action/fiche.php
+7
-8
7 additions, 8 deletions
htdocs/comm/action/fiche.php
htdocs/comm/fiche.php
+4
-4
4 additions, 4 deletions
htdocs/comm/fiche.php
htdocs/contact/index.php
+5
-4
5 additions, 4 deletions
htdocs/contact/index.php
with
16 additions
and
16 deletions
htdocs/comm/action/fiche.php
+
7
−
8
View file @
93db5103
...
@@ -65,14 +65,14 @@ if ($_POST["action"] == 'add_action')
...
@@ -65,14 +65,14 @@ if ($_POST["action"] == 'add_action')
if
(
$_POST
[
'cancel'
])
if
(
$_POST
[
'cancel'
])
{
{
$back
=
''
;
$back
topage
=
''
;
if
(
!
empty
(
$_POST
[
"back"
]))
$back
=
$_POST
[
"back"
];
if
(
!
empty
(
$_POST
[
"back
topage
"
]))
$back
topage
=
$_POST
[
"back
topage
"
];
if
(
!
$back
)
if
(
!
$back
topage
)
{
{
if
(
$_POST
[
'socid'
]
>
0
)
$back
=
DOL_URL_ROOT
.
'/comm/fiche.php?socid='
.
$_POST
[
'socid'
];
if
(
$_POST
[
'socid'
]
>
0
)
$back
topage
=
DOL_URL_ROOT
.
'/comm/fiche.php?socid='
.
$_POST
[
'socid'
];
else
$back
=
DOL_URL_ROOT
.
'/comm/action/indexactions.php'
;
else
$back
topage
=
DOL_URL_ROOT
.
'/comm/action/indexactions.php'
;
}
}
header
(
"Location: "
.
$back
);
header
(
"Location: "
.
$back
topage
);
exit
;
exit
;
}
}
...
@@ -411,9 +411,8 @@ if ($_GET["action"] == 'create')
...
@@ -411,9 +411,8 @@ if ($_GET["action"] == 'create')
}
}
print
'<form name="action" action="fiche.php" method="post">'
;
print
'<form name="action" action="fiche.php" method="post">'
;
if
(
!
empty
(
$_REQUEST
[
"backtopage"
]))
print
'<input type="hidden" name="from" value="'
.
(
$_REQUEST
[
"from"
]
?
$_REQUEST
[
"from"
]
:
$_SERVER
[
"HTTP_REFERER"
])
.
'">'
;
print
'<input type="hidden" name="action" value="add_action">'
;
print
'<input type="hidden" name="action" value="add_action">'
;
print
'<input type="hidden" name="back" value="'
.
$_SERVER
[
'
HTTP_REFERER
'
]
.
'">'
;
if
(
!
empty
(
$_REQUEST
[
"backtopage"
]))
print
'<input type="hidden" name="back
topage
" value="'
.
(
$_REQUEST
[
"backtopage"
]
!=
1
?
$_REQUEST
[
"backtopage"
]
:
$_SERVER
[
"
HTTP_REFERER
"
])
.
'">'
;
if
(
$_GET
[
"actioncode"
]
==
'AC_RDV'
)
print_titre
(
$langs
->
trans
(
"AddActionRendezVous"
));
if
(
$_GET
[
"actioncode"
]
==
'AC_RDV'
)
print_titre
(
$langs
->
trans
(
"AddActionRendezVous"
));
else
print_titre
(
$langs
->
trans
(
"AddAnAction"
));
else
print_titre
(
$langs
->
trans
(
"AddAnAction"
));
...
...
This diff is collapsed.
Click to expand it.
htdocs/comm/fiche.php
+
4
−
4
View file @
93db5103
...
@@ -676,7 +676,7 @@ if ($socid > 0)
...
@@ -676,7 +676,7 @@ if ($socid > 0)
// Lien click to dial
// Lien click to dial
print
'<td>'
;
print
'<td>'
;
if
(
$conf
->
agenda
->
enabled
&&
$user
->
rights
->
agenda
->
myactions
->
create
)
if
(
$conf
->
agenda
->
enabled
&&
$user
->
rights
->
agenda
->
myactions
->
create
)
print
'<a href="action/fiche.php?action=create&actioncode=AC_TEL&contactid='
.
$obj
->
rowid
.
'&socid='
.
$objsoc
->
id
.
'">'
;
print
'<a href="action/fiche.php?action=create&
backtopage=1&
actioncode=AC_TEL&contactid='
.
$obj
->
rowid
.
'&socid='
.
$objsoc
->
id
.
'">'
;
print
dolibarr_print_phone
(
$obj
->
phone
);
print
dolibarr_print_phone
(
$obj
->
phone
);
if
(
$conf
->
agenda
->
enabled
&&
$user
->
rights
->
agenda
->
myactions
->
create
)
if
(
$conf
->
agenda
->
enabled
&&
$user
->
rights
->
agenda
->
myactions
->
create
)
print
'</a>'
;
print
'</a>'
;
...
@@ -684,14 +684,14 @@ if ($socid > 0)
...
@@ -684,14 +684,14 @@ if ($socid > 0)
print
'</td>'
;
print
'</td>'
;
print
'<td>'
;
print
'<td>'
;
if
(
$conf
->
agenda
->
enabled
&&
$user
->
rights
->
agenda
->
myactions
->
create
)
if
(
$conf
->
agenda
->
enabled
&&
$user
->
rights
->
agenda
->
myactions
->
create
)
print
'<a href="action/fiche.php?action=create&actioncode=AC_FAX&contactid='
.
$obj
->
rowid
.
'&socid='
.
$objsoc
->
id
.
'">'
;
print
'<a href="action/fiche.php?action=create&
backtopage=1&
actioncode=AC_FAX&contactid='
.
$obj
->
rowid
.
'&socid='
.
$objsoc
->
id
.
'">'
;
print
dolibarr_print_phone
(
$obj
->
fax
);
print
dolibarr_print_phone
(
$obj
->
fax
);
if
(
$conf
->
agenda
->
enabled
&&
$user
->
rights
->
agenda
->
myactions
->
create
)
if
(
$conf
->
agenda
->
enabled
&&
$user
->
rights
->
agenda
->
myactions
->
create
)
print
'</a>'
;
print
'</a>'
;
print
' </td>'
;
print
' </td>'
;
print
'<td>'
;
print
'<td>'
;
if
(
$conf
->
agenda
->
enabled
&&
$user
->
rights
->
agenda
->
myactions
->
create
)
if
(
$conf
->
agenda
->
enabled
&&
$user
->
rights
->
agenda
->
myactions
->
create
)
print
'<a href="action/fiche.php?action=create&actioncode=AC_EMAIL&contactid='
.
$obj
->
rowid
.
'&socid='
.
$objsoc
->
id
.
'">'
;
print
'<a href="action/fiche.php?action=create&
backtopage=1&
actioncode=AC_EMAIL&contactid='
.
$obj
->
rowid
.
'&socid='
.
$objsoc
->
id
.
'">'
;
print
$obj
->
email
;
print
$obj
->
email
;
if
(
$conf
->
agenda
->
enabled
&&
$user
->
rights
->
agenda
->
myactions
->
create
)
if
(
$conf
->
agenda
->
enabled
&&
$user
->
rights
->
agenda
->
myactions
->
create
)
print
'</a>'
;
print
'</a>'
;
...
@@ -704,7 +704,7 @@ if ($socid > 0)
...
@@ -704,7 +704,7 @@ if ($socid > 0)
if
(
$conf
->
agenda
->
enabled
&&
$user
->
rights
->
agenda
->
myactions
->
create
)
if
(
$conf
->
agenda
->
enabled
&&
$user
->
rights
->
agenda
->
myactions
->
create
)
{
{
print
'<td align="center"><a href="action/fiche.php?action=create&actioncode=AC_RDV&contactid='
.
$obj
->
rowid
.
'&socid='
.
$objsoc
->
id
.
'">'
;
print
'<td align="center"><a href="action/fiche.php?action=create&
backtopage=1&
actioncode=AC_RDV&contactid='
.
$obj
->
rowid
.
'&socid='
.
$objsoc
->
id
.
'">'
;
print
img_object
(
$langs
->
trans
(
"Rendez-Vous"
),
"action"
);
print
img_object
(
$langs
->
trans
(
"Rendez-Vous"
),
"action"
);
print
'</a></td>'
;
print
'</a></td>'
;
}
}
...
...
This diff is collapsed.
Click to expand it.
htdocs/contact/index.php
+
5
−
4
View file @
93db5103
...
@@ -104,8 +104,9 @@ llxHeader();
...
@@ -104,8 +104,9 @@ llxHeader();
$form
=
new
Form
(
$db
);
$form
=
new
Form
(
$db
);
$sql
=
"SELECT s.rowid as socid, s.nom, s.fk_pays,"
;
$sql
=
"SELECT s.rowid as socid, s.nom,"
;
$sql
.
=
" p.rowid as cidp, p.name, p.firstname, p.email, p.phone, p.phone_mobile, p.fax, p.priv,"
;
$sql
.
=
" p.rowid as cidp, p.name, p.firstname, p.email,"
;
$sql
.
=
" p.phone, p.phone_mobile, p.fax, p.fk_pays, p.priv,"
;
$sql
.
=
" "
.
$db
->
pdate
(
"p.tms"
)
.
" as tms"
;
$sql
.
=
" "
.
$db
->
pdate
(
"p.tms"
)
.
" as tms"
;
$sql
.
=
" FROM "
.
MAIN_DB_PREFIX
.
"socpeople as p"
;
$sql
.
=
" FROM "
.
MAIN_DB_PREFIX
.
"socpeople as p"
;
$sql
.
=
" LEFT JOIN "
.
MAIN_DB_PREFIX
.
"societe as s ON s.rowid = p.fk_soc"
;
$sql
.
=
" LEFT JOIN "
.
MAIN_DB_PREFIX
.
"societe as s ON s.rowid = p.fk_soc"
;
...
@@ -312,9 +313,9 @@ if ($result)
...
@@ -312,9 +313,9 @@ if ($result)
// Phone
// Phone
print
'<td>'
;
print
'<td>'
;
if
(
$conf
->
agenda
->
enabled
&&
$user
->
rights
->
agenda
->
myactions
->
create
)
if
(
$conf
->
agenda
->
enabled
&&
$user
->
rights
->
agenda
->
myactions
->
create
)
print
'<a href="'
.
DOL_URL_ROOT
.
'/comm/action/fiche.php?action=create&actioncode=AC_TEL&contactid='
.
$obj
->
cidp
.
'&socid='
.
$obj
->
socid
.
'">'
.
dolibarr_print_phone
(
$obj
->
phone
,
$obj
->
fk_
pays
)
.
'</a>'
;
print
'<a href="'
.
DOL_URL_ROOT
.
'/comm/action/fiche.php?action=create&
backtopage=1&
actioncode=AC_TEL&contactid='
.
$obj
->
cidp
.
'&socid='
.
$obj
->
socid
.
'">'
.
dolibarr_print_phone
(
$obj
->
phone
,
$obj
->
pays
_code
)
.
'</a>'
;
else
else
print
dolibarr_print_phone
(
$obj
->
phone
,
$obj
->
fk_
pays
);
print
dolibarr_print_phone
(
$obj
->
phone
,
$obj
->
pays
_code
);
print
'</td>'
;
print
'</td>'
;
if
(
$_GET
[
"view"
]
==
'phone'
)
if
(
$_GET
[
"view"
]
==
'phone'
)
...
...
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