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
37a2d269
Commit
37a2d269
authored
9 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Plain Diff
Merge pull request #4660 from grandoc/3.9
enhance code help translation
parents
7def330f
6f6f2a05
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
htdocs/fourn/class/fournisseur.commande.class.php
+9
-9
9 additions, 9 deletions
htdocs/fourn/class/fournisseur.commande.class.php
with
9 additions
and
9 deletions
htdocs/fourn/class/fournisseur.commande.class.php
+
9
−
9
View file @
37a2d269
...
...
@@ -141,7 +141,7 @@ class CommandeFournisseur extends CommonOrder
$this
->
statuts
[
5
]
=
'StatusOrderReceivedAll'
;
$this
->
statuts
[
6
]
=
'StatusOrderCanceled'
;
// Approved->Canceled
$this
->
statuts
[
7
]
=
'StatusOrderCanceled'
;
// Process running->canceled
//$this->statuts[8] = 'StatusOrderBilled'; // Everything is finish, order received totally and bill received
//$this->statuts[8] = 'StatusOrderBilled'; // Everything is finish
ed
, order received totally and bill received
$this
->
statuts
[
9
]
=
'StatusOrderRefused'
;
}
...
...
@@ -585,8 +585,8 @@ class CommandeFournisseur extends CommonOrder
* Return clicable name (with picto eventually)
*
* @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
* @param string $option
Sur quoi pointe le lien
* @return string Chain
e avec
URL
* @param string $option
On what the link points
* @return string Chain
with
URL
*/
function
getNomUrl
(
$withpicto
=
0
,
$option
=
''
)
{
...
...
@@ -621,8 +621,8 @@ class CommandeFournisseur extends CommonOrder
* Returns the following order reference not used depending on the numbering model activated
* defined within COMMANDE_SUPPLIER_ADDON_NUMBER
*
* @param
Societe
$soc
objet societe
* @return string reference
libre pour la factur
e
* @param
Company
$soc
company object
* @return string
free
reference
for the invoic
e
*/
function
getNextNumRef
(
$soc
)
{
...
...
@@ -716,7 +716,7 @@ class CommandeFournisseur extends CommonOrder
$this
->
db
->
begin
();
// Definition
du nom de modele de
numer
otation de command
e
// Definition
of order
num
b
er
ing model nam
e
$soc
=
new
Societe
(
$this
->
db
);
$soc
->
fetch
(
$this
->
fourn_id
);
...
...
@@ -904,7 +904,7 @@ class CommandeFournisseur extends CommonOrder
/**
* Cancel an approved order.
*
L'annulation se fait apres l'approbation
*
The cancellation is done after approval
*
* @param User $user User making action
* @param int $idwarehouse Id warehouse to use for stock change (not used for supplier orders).
...
...
@@ -1028,7 +1028,7 @@ class CommandeFournisseur extends CommonOrder
// Clean parameters
if
(
empty
(
$this
->
source
))
$this
->
source
=
0
;
/* On position
ne en mode brouillon la commande
*/
/* On
e
position
s in draft mode the order
*/
$this
->
brouillon
=
1
;
$sql
=
"INSERT INTO "
.
MAIN_DB_PREFIX
.
"commande_fournisseur ("
;
...
...
@@ -1078,7 +1078,7 @@ class CommandeFournisseur extends CommonOrder
$num
=
count
(
$this
->
lines
);
/*
*
Insertion du detail des produits dans la
base
*
integration of products detail in the data
base
*/
for
(
$i
=
0
;
$i
<
$num
;
$i
++
)
{
...
...
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