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
2fd3aa54
Commit
2fd3aa54
authored
Dec 18, 2016
by
Laurent Destailleur
Committed by
GitHub
Dec 18, 2016
Browse files
Options
Downloads
Plain Diff
Merge pull request #6173 from defrance/patch-62
Cleaning code
parents
4ece7464
8b4aa701
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
htdocs/commande/info.php
+1
-5
1 addition, 5 deletions
htdocs/commande/info.php
htdocs/commande/note.php
+4
-5
4 additions, 5 deletions
htdocs/commande/note.php
htdocs/contact/note.php
+4
-9
4 additions, 9 deletions
htdocs/contact/note.php
with
9 additions
and
19 deletions
htdocs/commande/info.php
+
1
−
5
View file @
2fd3aa54
...
@@ -58,9 +58,6 @@ llxHeader('',$langs->trans('Order'),'EN:Customers_Orders|FR:Commandes_Clients|ES
...
@@ -58,9 +58,6 @@ llxHeader('',$langs->trans('Order'),'EN:Customers_Orders|FR:Commandes_Clients|ES
$object
->
fetch_thirdparty
();
$object
->
fetch_thirdparty
();
$object
->
info
(
$object
->
id
);
$object
->
info
(
$object
->
id
);
$soc
=
new
Societe
(
$db
);
$soc
->
fetch
(
$object
->
thirdparty
->
id
);
$head
=
commande_prepare_head
(
$object
);
$head
=
commande_prepare_head
(
$object
);
dol_fiche_head
(
$head
,
'info'
,
$langs
->
trans
(
"CustomerOrder"
),
0
,
'order'
);
dol_fiche_head
(
$head
,
'info'
,
$langs
->
trans
(
"CustomerOrder"
),
0
,
'order'
);
...
@@ -68,13 +65,12 @@ dol_fiche_head($head, 'info', $langs->trans("CustomerOrder"), 0, 'order');
...
@@ -68,13 +65,12 @@ dol_fiche_head($head, 'info', $langs->trans("CustomerOrder"), 0, 'order');
$linkback
=
'<a href="'
.
DOL_URL_ROOT
.
'/commande/list.php'
.
(
!
empty
(
$socid
)
?
'?socid='
.
$socid
:
''
)
.
'">'
.
$langs
->
trans
(
"BackToList"
)
.
'</a>'
;
$linkback
=
'<a href="'
.
DOL_URL_ROOT
.
'/commande/list.php'
.
(
!
empty
(
$socid
)
?
'?socid='
.
$socid
:
''
)
.
'">'
.
$langs
->
trans
(
"BackToList"
)
.
'</a>'
;
$morehtmlref
=
'<div class="refidno">'
;
$morehtmlref
=
'<div class="refidno">'
;
// Ref customer
// Ref customer
$morehtmlref
.
=
$form
->
editfieldkey
(
"RefCustomer"
,
'ref_client'
,
$object
->
ref_client
,
$object
,
0
,
'string'
,
''
,
0
,
1
);
$morehtmlref
.
=
$form
->
editfieldkey
(
"RefCustomer"
,
'ref_client'
,
$object
->
ref_client
,
$object
,
0
,
'string'
,
''
,
0
,
1
);
$morehtmlref
.
=
$form
->
editfieldval
(
"RefCustomer"
,
'ref_client'
,
$object
->
ref_client
,
$object
,
0
,
'string'
,
''
,
null
,
null
,
''
,
1
);
$morehtmlref
.
=
$form
->
editfieldval
(
"RefCustomer"
,
'ref_client'
,
$object
->
ref_client
,
$object
,
0
,
'string'
,
''
,
null
,
null
,
''
,
1
);
// Thirdparty
// Thirdparty
$morehtmlref
.
=
'<br>'
.
$langs
->
trans
(
'ThirdParty'
)
.
' : '
.
$
soc
->
getNomUrl
(
1
);
$morehtmlref
.
=
'<br>'
.
$langs
->
trans
(
'ThirdParty'
)
.
' : '
.
$
object
->
thirdparty
->
getNomUrl
(
1
);
// Project
// Project
if
(
!
empty
(
$conf
->
projet
->
enabled
))
if
(
!
empty
(
$conf
->
projet
->
enabled
))
{
{
...
...
This diff is collapsed.
Click to expand it.
htdocs/commande/note.php
+
4
−
5
View file @
2fd3aa54
...
@@ -71,8 +71,7 @@ $form = new Form($db);
...
@@ -71,8 +71,7 @@ $form = new Form($db);
if
(
$id
>
0
||
!
empty
(
$ref
))
if
(
$id
>
0
||
!
empty
(
$ref
))
{
{
$soc
=
new
Societe
(
$db
);
$object
->
fetch_thirdparty
();
$soc
->
fetch
(
$object
->
socid
);
$head
=
commande_prepare_head
(
$object
);
$head
=
commande_prepare_head
(
$object
);
...
@@ -88,7 +87,7 @@ if ($id > 0 || ! empty($ref))
...
@@ -88,7 +87,7 @@ if ($id > 0 || ! empty($ref))
$morehtmlref
.
=
$form
->
editfieldkey
(
"RefCustomer"
,
'ref_client'
,
$object
->
ref_client
,
$object
,
0
,
'string'
,
''
,
0
,
1
);
$morehtmlref
.
=
$form
->
editfieldkey
(
"RefCustomer"
,
'ref_client'
,
$object
->
ref_client
,
$object
,
0
,
'string'
,
''
,
0
,
1
);
$morehtmlref
.
=
$form
->
editfieldval
(
"RefCustomer"
,
'ref_client'
,
$object
->
ref_client
,
$object
,
0
,
'string'
,
''
,
null
,
null
,
''
,
1
);
$morehtmlref
.
=
$form
->
editfieldval
(
"RefCustomer"
,
'ref_client'
,
$object
->
ref_client
,
$object
,
0
,
'string'
,
''
,
null
,
null
,
''
,
1
);
// Thirdparty
// Thirdparty
$morehtmlref
.
=
'<br>'
.
$langs
->
trans
(
'ThirdParty'
)
.
' : '
.
$
soc
->
getNomUrl
(
1
);
$morehtmlref
.
=
'<br>'
.
$langs
->
trans
(
'ThirdParty'
)
.
' : '
.
$
object
->
thirdparty
->
getNomUrl
(
1
);
// Project
// Project
if
(
!
empty
(
$conf
->
projet
->
enabled
))
if
(
!
empty
(
$conf
->
projet
->
enabled
))
{
{
...
...
This diff is collapsed.
Click to expand it.
htdocs/contact/note.php
+
4
−
9
View file @
2fd3aa54
...
@@ -75,11 +75,6 @@ if ($id > 0)
...
@@ -75,11 +75,6 @@ if ($id > 0)
dol_fiche_head
(
$head
,
'note'
,
$title
,
0
,
'contact'
);
dol_fiche_head
(
$head
,
'note'
,
$title
,
0
,
'contact'
);
print
'<form method="POST" action="'
.
$_SERVER
[
'PHP_SELF'
]
.
'">'
;
print
'<input type="hidden" name="token" value="'
.
$_SESSION
[
'newtoken'
]
.
'">'
;
$linkback
=
'<a href="'
.
DOL_URL_ROOT
.
'/contact/list.php">'
.
$langs
->
trans
(
"BackToList"
)
.
'</a>'
;
$linkback
=
'<a href="'
.
DOL_URL_ROOT
.
'/contact/list.php">'
.
$langs
->
trans
(
"BackToList"
)
.
'</a>'
;
dol_banner_tab
(
$object
,
'id'
,
$linkback
,
1
,
'rowid'
,
'ref'
,
''
);
dol_banner_tab
(
$object
,
'id'
,
$linkback
,
1
,
'rowid'
,
'ref'
,
''
);
...
@@ -88,11 +83,12 @@ if ($id > 0)
...
@@ -88,11 +83,12 @@ if ($id > 0)
//if ($action == 'editnote_private') $cssclass='titlefieldcreate';
//if ($action == 'editnote_private') $cssclass='titlefieldcreate';
print
'<div class="fichecenter">'
;
print
'<div class="fichecenter">'
;
print
'<div class="underbanner clearboth"></div>'
;
print
'<div class="underbanner clearboth"></div>'
;
print
'<table class="border centpercent">'
;
$linkback
=
'<a href="'
.
DOL_URL_ROOT
.
'/contact/list.php">'
.
$langs
->
trans
(
"BackToList"
)
.
'</a>'
;
print
'<form method="POST" action="'
.
$_SERVER
[
'PHP_SELF'
]
.
'">'
;
print
'<input type="hidden" name="token" value="'
.
$_SESSION
[
'newtoken'
]
.
'">'
;
print
'<table class="border centpercent">'
;
// Company
// Company
if
(
empty
(
$conf
->
global
->
SOCIETE_DISABLE_CONTACTS
))
if
(
empty
(
$conf
->
global
->
SOCIETE_DISABLE_CONTACTS
))
...
@@ -154,7 +150,6 @@ if ($id > 0)
...
@@ -154,7 +150,6 @@ if ($id > 0)
include
DOL_DOCUMENT_ROOT
.
'/core/tpl/notes.tpl.php'
;
include
DOL_DOCUMENT_ROOT
.
'/core/tpl/notes.tpl.php'
;
dol_fiche_end
();
dol_fiche_end
();
}
}
...
...
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