From 984ff2ddcf3ee0af7590879fce751f60ad7107c3 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Tue, 22 Jun 2010 08:07:23 +0000 Subject: [PATCH] Local Taxes: Comments on function parameters --- htdocs/comm/propal/class/propal.class.php | 4 ++++ htdocs/commande/class/commande.class.php | 4 ++++ htdocs/compta/facture/class/facture.class.php | 12 ++++++++---- htdocs/lib/order.lib.php | 1 + 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 44460c915b0..e06dc2b2654 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -272,6 +272,8 @@ class Propal extends CommonObject * \param pu_ht Prix unitaire * \param qty Quantite * \param txtva Taux de tva force, sinon -1 + * \param txlocaltax1 Local tax 1 rate + * \param txlocaltax2 Local tax 2 rate * \param fk_product Id du produit/service predefini * \param remise_percent Pourcentage de remise de la ligne * \param price_base_type HT or TTC @@ -399,6 +401,8 @@ class Propal extends CommonObject * \param qty Quantity * \param remise_percent Remise effectuee sur le produit * \param txtva Taux de TVA + * \param txlocaltax1 Local tax 1 rate + * \param txlocaltax2 Local tax 2 rate * \param desc Description * \param price_base_type HT ou TTC * \param info_bits Miscellanous informations diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index c557aa4c7b4..43d193d40f6 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -808,6 +808,8 @@ class Commande extends CommonObject * \param pu_ht Prix unitaire HT * \param qty Quantite * \param txtva Taux de tva force, sinon -1 + * \param txlocaltax1 Local tax 1 rate + * \param txlocaltax2 Local tax 2 rate * \param fk_product Id du produit/service predefini * \param remise_percent Pourcentage de remise de la ligne * \param info_bits Bits de type de lignes @@ -1847,6 +1849,8 @@ class Commande extends CommonObject * \param qty Quantity * \param remise_percent Pourcentage de remise de la ligne * \param tva_tx Taux TVA + * \param txlocaltax1 Local tax 1 rate + * \param txlocaltax2 Local tax 2 rate * \param price_base_type HT or TTC * \param info_bits Miscellanous informations on line * \param date_start Start date of the line diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 3e5088be203..2046b785b52 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1570,6 +1570,8 @@ class Facture extends CommonObject * \param pu_ht Prix unitaire HT * \param qty Quantite * \param txtva Taux de tva force, sinon -1 + * \param txlocaltax1 Local tax 1 rate + * \param txlocaltax2 Local tax 2 rate * \param fk_product Id du produit/service predefini * \param remise_percent Pourcentage de remise de la ligne * \param date_start Date de debut de validite du service @@ -1714,16 +1716,18 @@ class Facture extends CommonObject * \param date_start Date de debut de validite du service * \param date_end Date de fin de validite du service * \param tva_tx VAT Rate + * \param txlocaltax1 Local tax 1 rate + * \param txlocaltax2 Local tax 2 rate * \param price_base_type HT or TTC * \param info_bits Miscellanous informations * \param type Type of line (0=product, 1=service) * \return int < 0 si erreur, > 0 si ok */ - function updateline($rowid, $desc, $pu, $qty, $remise_percent=0, $date_start, $date_end, $txtva, $txlocaltax1, $txlocaltax2,$price_base_type='HT', $info_bits=0, $type=0) + function updateline($rowid, $desc, $pu, $qty, $remise_percent=0, $date_start, $date_end, $txtva, $txlocaltax1=0, $txlocaltax2=0,$price_base_type='HT', $info_bits=0, $type=0) { include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); - dol_syslog("Facture::UpdateLine $rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $price_base_type, $info_bits, $type", LOG_DEBUG); + dol_syslog("Facture::UpdateLine $rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $type", LOG_DEBUG); if ($this->brouillon) { @@ -1744,12 +1748,12 @@ class Facture extends CommonObject // qty, pu, remise_percent et txtva // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva. - $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $localtax1, $localtax2, 0, $price_base_type, $info_bits); + $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits); $total_ht = $tabprice[0]; $total_tva = $tabprice[1]; $total_ttc = $tabprice[2]; $total_localtax1=$tabprice[9]; - $total_localtax1=$tabprice[10]; + $total_localtax2=$tabprice[10]; $pu_ht = $tabprice[3]; $pu_tva = $tabprice[4]; $pu_ttc = $tabprice[5]; diff --git a/htdocs/lib/order.lib.php b/htdocs/lib/order.lib.php index 107d22f272f..a2424da7c1c 100644 --- a/htdocs/lib/order.lib.php +++ b/htdocs/lib/order.lib.php @@ -2,6 +2,7 @@ /* Copyright (C) 2006-2009 Laurent Destailleur * Copyright (C) 2007 Rodolphe Quiedeville * Copyright (C) 2010 Regis Houssin + * Copyright (C) 2010 Juanjo Menent * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by