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
bc5b9bd8
Commit
bc5b9bd8
authored
8 years ago
by
Philippe Grand
Browse files
Options
Downloads
Patches
Plain Diff
internationalization of code comment
parent
d8d938e8
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/comm/propal/class/propal.class.php
+10
-10
10 additions, 10 deletions
htdocs/comm/propal/class/propal.class.php
with
10 additions
and
10 deletions
htdocs/comm/propal/class/propal.class.php
+
10
−
10
View file @
bc5b9bd8
...
...
@@ -7,7 +7,7 @@
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
* Copyright (C) 2008 Raphael Bertrand <raphael.bertrand@resultic.fr>
* Copyright (C) 2010-2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2010-201
1
Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2010-201
6
Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2012-2014 Christophe Battarel <christophe.battarel@altairis.fr>
* Copyright (C) 2012 Cedric Salvador <csalvador@gpcsolutions.fr>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
...
...
@@ -223,15 +223,15 @@ class Propal extends CommonObject
/**
* Add line into array products
* $this->
client doit etre charge
* $this->
thirdparty should be loaded
*
* @param int $idproduct Product Id to add
* @param int $qty Quantity
* @param int $remise_percent Discount effected on Product
* @return int <0 if KO, >0 if OK
*
* TODO Re
m
place
r les appels a cette
f
o
nction
par
generation objet Ligne
* inser
e dans
table
au
$this->products
* TODO Replace
calls to this
f
u
nction
by
generation objet Ligne
* inser
ted into
table $this->products
*/
function
add_product
(
$idproduct
,
$qty
,
$remise_percent
=
0
)
{
...
...
@@ -253,7 +253,7 @@ class Propal extends CommonObject
$localtax1_tx
=
get_localtax
(
$tva_tx
,
1
,
$mysoc
,
$this
->
thirdparty
,
$tva_npr
);
$localtax2_tx
=
get_localtax
(
$tva_tx
,
2
,
$mysoc
,
$this
->
thirdparty
,
$tva_npr
);
// multipri
x
// multipri
ces
if
(
$conf
->
global
->
PRODUIT_MULTIPRICES
&&
$this
->
thirdparty
->
price_level
)
{
$price
=
$prod
->
multiprices
[
$this
->
thirdparty
->
price_level
];
...
...
@@ -314,7 +314,7 @@ class Propal extends CommonObject
$line
->
desc
=
$remise
->
description
;
// Description ligne
$line
->
tva_tx
=
$remise
->
tva_tx
;
$line
->
subprice
=-
$remise
->
amount_ht
;
$line
->
fk_product
=
0
;
// Id produit predefin
i
$line
->
fk_product
=
0
;
// Id produit predefin
ed
$line
->
qty
=
1
;
$line
->
remise
=
0
;
$line
->
remise_percent
=
0
;
...
...
@@ -359,10 +359,10 @@ class Propal extends CommonObject
/**
* Add a proposal line into database (linked to product/service or not)
*
Les parametres sont deja cense etre juste et avec valeurs finales a l'appe
l
*
de cette
method
e
. A
ussi, pour le taux tva, il doit deja avoir ete
defin
i
*
par l'appelant par la
method
e
get_default_tva(societe_vendeuse,societe_acheteuse,''
,
produ
i
t)
*
et le desc doit deja avoir la bonne valeur (a l'appelant de gerer l
e multilangue)
*
The parameters are already supposed to be appropriate and with final values to the cal
l
*
of this
method. A
lso, for the VAT rate, it must have already been
defin
ed
*
by whose calling the
method get_default_tva
(societe_vendeuse,
societe_acheteuse,
''
produ
c
t)
*
and desc must already have the right value (it's up to the caller to manag
e multilangu
ag
e)
*
* @param string $desc Description de la ligne
* @param float $pu_ht Prix unitaire
...
...
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