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
7e562c6f
Commit
7e562c6f
authored
15 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Qual: Uniformize tab contents
parent
0c4a0449
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/societe/document.php
+25
-2
25 additions, 2 deletions
htdocs/societe/document.php
htdocs/societe/socnote.php
+26
-19
26 additions, 19 deletions
htdocs/societe/socnote.php
with
51 additions
and
21 deletions
htdocs/societe/document.php
+
25
−
2
View file @
7e562c6f
...
@@ -110,6 +110,8 @@ if ($_REQUEST['action'] == 'confirm_deletefile' && $_REQUEST['confirm'] == 'yes'
...
@@ -110,6 +110,8 @@ if ($_REQUEST['action'] == 'confirm_deletefile' && $_REQUEST['confirm'] == 'yes'
* View
* View
*/
*/
$form
=
new
Form
(
$db
);
llxHeader
();
llxHeader
();
if
(
$socid
>
0
)
if
(
$socid
>
0
)
...
@@ -139,11 +141,32 @@ if ($socid > 0)
...
@@ -139,11 +141,32 @@ if ($socid > 0)
print
'<table class="border"width="100%">'
;
print
'<table class="border"width="100%">'
;
// Ref
// Ref
print
'<tr><td width="30%">'
.
$langs
->
trans
(
"Name"
)
.
'</td><td colspan="3">'
.
$societe
->
nom
.
'</td></tr>'
;
print
'<tr><td width="30%">'
.
$langs
->
trans
(
"Name"
)
.
'</td>'
;
print
'<td colspan="3">'
;
print
$form
->
showrefnav
(
$societe
,
'socid'
,
''
,
1
,
'rowid'
,
'nom'
);
print
'</td></tr>'
;
// Prefix
// Prefix
print
'<tr><td>'
.
$langs
->
trans
(
'Prefix'
)
.
'</td><td colspan="3">'
.
$societe
->
prefix_comm
.
'</td></tr>'
;
print
'<tr><td>'
.
$langs
->
trans
(
'Prefix'
)
.
'</td><td colspan="3">'
.
$societe
->
prefix_comm
.
'</td></tr>'
;
if
(
$societe
->
client
)
{
print
'<tr><td>'
;
print
$langs
->
trans
(
'CustomerCode'
)
.
'</td><td colspan="3">'
;
print
$societe
->
code_client
;
if
(
$societe
->
check_codeclient
()
<>
0
)
print
' '
.
$langs
->
trans
(
"WrongCustomerCode"
);
print
'</td></tr>'
;
}
if
(
$societe
->
fournisseur
)
{
print
'<tr><td>'
;
print
$langs
->
trans
(
'SupplierCode'
)
.
'</td><td colspan="3">'
;
print
$societe
->
code_fournisseur
;
if
(
$societe
->
check_codefournisseur
()
<>
0
)
print
' '
.
$langs
->
trans
(
"WrongSupplierCode"
);
print
'</td></tr>'
;
}
// Nbre fichiers
// Nbre fichiers
print
'<tr><td>'
.
$langs
->
trans
(
"NbOfAttachedFiles"
)
.
'</td><td colspan="3">'
.
sizeof
(
$filearray
)
.
'</td></tr>'
;
print
'<tr><td>'
.
$langs
->
trans
(
"NbOfAttachedFiles"
)
.
'</td><td colspan="3">'
.
sizeof
(
$filearray
)
.
'</td></tr>'
;
...
...
This diff is collapsed.
Click to expand it.
htdocs/societe/socnote.php
+
26
−
19
View file @
7e562c6f
<?php
<?php
/* Copyright (C) 2001-2003,2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
/* Copyright (C) 2001-2003,2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-200
8
Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-200
9
Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2006 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2005-2006 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
...
@@ -19,10 +19,10 @@
...
@@ -19,10 +19,10 @@
*/
*/
/**
/**
\file htdocs/societe/socnote.php
*
\file htdocs/societe/socnote.php
\brief Tab for notes on third party
*
\brief Tab for notes on third party
\ingroup societe
*
\ingroup societe
\version $Id$
*
\version $Id$
*/
*/
require
(
"./pre.inc.php"
);
require
(
"./pre.inc.php"
);
...
@@ -37,6 +37,10 @@ $socid = isset($_GET["socid"])?$_GET["socid"]:$_POST["socid"];
...
@@ -37,6 +37,10 @@ $socid = isset($_GET["socid"])?$_GET["socid"]:$_POST["socid"];
if
(
$user
->
societe_id
)
$socid
=
$user
->
societe_id
;
if
(
$user
->
societe_id
)
$socid
=
$user
->
societe_id
;
$result
=
restrictedArea
(
$user
,
'societe'
,
$socid
);
$result
=
restrictedArea
(
$user
,
'societe'
,
$socid
);
/*
* Actions
*/
if
(
$_POST
[
"action"
]
==
'add'
)
if
(
$_POST
[
"action"
]
==
'add'
)
{
{
$sql
=
"UPDATE "
.
MAIN_DB_PREFIX
.
"societe SET note='"
.
addslashes
(
$_POST
[
"note"
])
.
"' WHERE rowid="
.
$_POST
[
"socid"
];
$sql
=
"UPDATE "
.
MAIN_DB_PREFIX
.
"societe SET note='"
.
addslashes
(
$_POST
[
"note"
])
.
"' WHERE rowid="
.
$_POST
[
"socid"
];
...
@@ -48,12 +52,13 @@ if ($_POST["action"] == 'add')
...
@@ -48,12 +52,13 @@ if ($_POST["action"] == 'add')
/*
/*
*
*
View
*/
*/
llxHeader
();
$form
=
new
Form
(
$db
);
$form
=
new
Form
(
$db
);
llxHeader
();
if
(
$socid
>
0
)
if
(
$socid
>
0
)
{
{
$societe
=
new
Societe
(
$db
,
$socid
);
$societe
=
new
Societe
(
$db
,
$socid
);
...
@@ -79,7 +84,8 @@ if ($socid > 0)
...
@@ -79,7 +84,8 @@ if ($socid > 0)
print
'<tr><td>'
.
$langs
->
trans
(
'Prefix'
)
.
'</td><td colspan="3">'
.
$societe
->
prefix_comm
.
'</td></tr>'
;
print
'<tr><td>'
.
$langs
->
trans
(
'Prefix'
)
.
'</td><td colspan="3">'
.
$societe
->
prefix_comm
.
'</td></tr>'
;
if
(
$societe
->
client
)
{
if
(
$societe
->
client
)
{
print
'<tr><td>'
;
print
'<tr><td>'
;
print
$langs
->
trans
(
'CustomerCode'
)
.
'</td><td colspan="3">'
;
print
$langs
->
trans
(
'CustomerCode'
)
.
'</td><td colspan="3">'
;
print
$societe
->
code_client
;
print
$societe
->
code_client
;
...
@@ -87,7 +93,8 @@ if ($socid > 0)
...
@@ -87,7 +93,8 @@ if ($socid > 0)
print
'</td></tr>'
;
print
'</td></tr>'
;
}
}
if
(
$societe
->
fournisseur
)
{
if
(
$societe
->
fournisseur
)
{
print
'<tr><td>'
;
print
'<tr><td>'
;
print
$langs
->
trans
(
'SupplierCode'
)
.
'</td><td colspan="3">'
;
print
$langs
->
trans
(
'SupplierCode'
)
.
'</td><td colspan="3">'
;
print
$societe
->
code_fournisseur
;
print
$societe
->
code_fournisseur
;
...
...
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