From dcfcb1bc5356ad13e048f46c09fb51ac2624c038 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Thu, 9 Sep 2010 17:40:25 +0000
Subject: [PATCH] Works on module hook integration
---
htdocs/comm/propal/class/propal.class.php | 28 +++++++++++--------
htdocs/commande/class/commande.class.php | 27 +++++++++---------
htdocs/compta/facture/class/facture.class.php | 20 ++++++-------
3 files changed, 40 insertions(+), 35 deletions(-)
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 7375f7d699b..3cd01bc79ae 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -650,19 +650,24 @@ class Propal extends CommonObject
/*
* Insertion du detail des produits dans la base
*/
- for ($i = 0 ; $i < sizeof($this->products) ; $i++)
+ for ($i = 0 ; $i < sizeof($this->lines) ; $i++)
{
$resql = $this->addline(
$this->id,
- $this->products[$i]->desc,
- $this->products[$i]->subprice,
- $this->products[$i]->qty,
- $this->products[$i]->tva_tx,
- $this->products[$i]->localtax1_tx,
- $this->products[$i]->localtax2_tx,
- $this->products[$i]->fk_product,
- $this->products[$i]->remise_percent,
- 'HT'
+ $this->lines[$i]->desc,
+ $this->lines[$i]->subprice,
+ $this->lines[$i]->qty,
+ $this->lines[$i]->tva_tx,
+ $this->lines[$i]->localtax1_tx,
+ $this->lines[$i]->localtax2_tx,
+ $this->lines[$i]->fk_product,
+ $this->lines[$i]->remise_percent,
+ 'HT',
+ 0,
+ 0,
+ $this->lines[$i]->product_type,
+ $this->lines[$i]->rang,
+ $this->lines[$i]->special_code
);
if ($resql < 0)
@@ -793,10 +798,9 @@ class Propal extends CommonObject
$object->user_author = $user->id;
$object->user_valid = '';
$object->date = '';
- $object->datep = dol_now('gmt');
+ $object->datep = dol_now('gmt');
$object->fin_validite = '';
$object->ref_client = '';
- $object->products = $object->lignes; // Tant que products encore utilise
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/".$conf->global->PROPALE_ADDON.".php");
$obj = $conf->global->PROPALE_ADDON;
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index afce96eb17d..61b795783dd 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -130,19 +130,20 @@ class Commande extends CommonObject
{
$line = new OrderLine($this->db);
- $line->libelle = $propal->lignes[$i]->libelle;
- $line->desc = $propal->lignes[$i]->desc;
- $line->price = $propal->lignes[$i]->price;
- $line->subprice = $propal->lignes[$i]->subprice;
- $line->tva_tx = $propal->lignes[$i]->tva_tx;
- $line->localtax1_tx = $propal->lignes[$i]->localtax1_tx;
- $line->localtax2_tx = $propal->lignes[$i]->localtax2_tx;
- $line->qty = $propal->lignes[$i]->qty;
- $line->fk_remise_except = $propal->lignes[$i]->fk_remise_except;
- $line->remise_percent = $propal->lignes[$i]->remise_percent;
- $line->fk_product = $propal->lignes[$i]->fk_product;
- $line->info_bits = $propal->lignes[$i]->info_bits;
- $line->product_type = $propal->lignes[$i]->product_type;
+ $line->libelle = $propal->lines[$i]->libelle;
+ $line->desc = $propal->lines[$i]->desc;
+ $line->price = $propal->lines[$i]->price;
+ $line->subprice = $propal->lines[$i]->subprice;
+ $line->tva_tx = $propal->lines[$i]->tva_tx;
+ $line->localtax1_tx = $propal->lines[$i]->localtax1_tx;
+ $line->localtax2_tx = $propal->lines[$i]->localtax2_tx;
+ $line->qty = $propal->lines[$i]->qty;
+ $line->fk_remise_except = $propal->lines[$i]->fk_remise_except;
+ $line->remise_percent = $propal->lines[$i]->remise_percent;
+ $line->fk_product = $propal->lines[$i]->fk_product;
+ $line->info_bits = $propal->lines[$i]->info_bits;
+ $line->product_type = $propal->lines[$i]->product_type;
+ $line->special_code = $propal->lines[$i]->special_code;
$this->lines[$i] = $line;
}
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 86bcd77307d..72f87acc149 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -400,21 +400,21 @@ class Facture extends CommonObject
$facture->remise_absolue = $this->remise_absolue;
$facture->remise_percent = $this->remise_percent;
- $facture->lignes = $this->lignes; // Tableau des lignes de factures
- $facture->products = $this->lignes; // Tant que products encore utilise
+ $facture->lines = $this->lines; // Tableau des lignes de factures
+ $facture->products = $this->lines; // Tant que products encore utilise
// Loop on each line of new invoice
- foreach($facture->lignes as $i => $line)
+ foreach($facture->lines as $i => $line)
{
if ($invertdetail)
{
- $facture->lignes[$i]->subprice = -$facture->lignes[$i]->subprice;
- $facture->lignes[$i]->price = -$facture->lignes[$i]->price;
- $facture->lignes[$i]->total_ht = -$facture->lignes[$i]->total_ht;
- $facture->lignes[$i]->total_tva = -$facture->lignes[$i]->total_tva;
- $facture->lignes[$i]->total_localtax1 = -$facture->lignes[$i]->total_localtax1;
- $facture->lignes[$i]->total_localtax2 = -$facture->lignes[$i]->total_localtax2;
- $facture->lignes[$i]->total_ttc = -$facture->lignes[$i]->total_ttc;
+ $facture->lines[$i]->subprice = -$facture->lines[$i]->subprice;
+ $facture->lines[$i]->price = -$facture->lines[$i]->price;
+ $facture->lines[$i]->total_ht = -$facture->lines[$i]->total_ht;
+ $facture->lines[$i]->total_tva = -$facture->lines[$i]->total_tva;
+ $facture->lines[$i]->total_localtax1 = -$facture->lines[$i]->total_localtax1;
+ $facture->lines[$i]->total_localtax2 = -$facture->lines[$i]->total_localtax2;
+ $facture->lines[$i]->total_ttc = -$facture->lines[$i]->total_ttc;
}
}
--
GitLab