";
}
else
{
-
// Show deprecated optional form to add product line here
if ($conf->global->PRODUCT_SHOW_WHEN_CREATE)
{
@@ -2652,288 +2651,6 @@ else
print '
';
- /*
-
- $sql = 'SELECT l.fk_product, l.product_type, l.description, l.qty, l.rowid, l.tva_tx,';
- $sql.= ' l.fk_remise_except,';
- $sql.= ' l.remise_percent, l.subprice, l.info_bits,';
- $sql.= ' l.total_ht, l.total_tva, l.total_ttc,';
- $sql.= ' l.date_start,';
- $sql.= ' l.date_end,';
- $sql.= ' l.product_type,';
- $sql.= ' p.ref as product_ref, p.fk_product_type, p.label as product_label,';
- $sql.= ' p.description as product_desc';
- $sql.= ' FROM '.MAIN_DB_PREFIX.'facturedet as l';
- $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON l.fk_product=p.rowid';
- $sql.= ' WHERE l.fk_facture = '.$object->id;
- $sql.= ' ORDER BY l.rang ASC, l.rowid';
-
- $resql = $db->query($sql);
- if ($resql)
- {
- $num_lignes = $db->num_rows($resql);
- $i = 0; $total = 0;
-
- $product_static=new Product($db);
-
- print '
';
-
- if ($num_lignes)
- {
- print '
';
- print '
'.$langs->trans('Description').'
';
- print '
'.$langs->trans('VAT').'
';
- print '
'.$langs->trans('PriceUHT').'
';
- print '
'.$langs->trans('Qty').'
';
- print '
'.$langs->trans('ReductionShort').'
';
- print '
'.$langs->trans('TotalHTShort').'
';
- print '
';
- print "
\n";
- }
- $var=true;
- while ($i < $num_lignes)
- {
- $objp = $db->fetch_object($resql);
- $var=!$var;
-
- // Show product and description
- $type=$objp->product_type?$objp->product_type:$objp->fk_product_type;
- // Try to enhance type detection using date_start and date_end for free lines where type
- // was not saved.
- if (! empty($objp->date_start)) $type=1;
- if (! empty($objp->date_end)) $type=1;
-
- // Show line
- if ($_GET['action'] != 'editline' || $_GET['rowid'] != $objp->rowid)
- {
- print '
';
- if ($objp->fk_product > 0)
- {
- print '
';
- print ''; // ancre pour retourner sur la ligne
-
- // Show product and description
- $product_static->type=$objp->fk_product_type;
- $product_static->id=$objp->fk_product;
- $product_static->ref=$objp->product_ref;
- $product_static->libelle=$objp->product_label;
- $text=$product_static->getNomUrl(1);
- $text.= ' - '.$objp->product_label;
- $description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($objp->description));
- print $html->textwithtooltip($text,$description,3,'','',$i);
-
- // Show range
- print_date_range($db->jdate($objp->date_start),$db->jdate($objp->date_end));
-
- // Add description in form
- if ($conf->global->PRODUIT_DESC_IN_FORM) print ($objp->description && $objp->description!=$objp->product_label)?' '.dol_htmlentitiesbr($objp->description):'';
-
- print '
';
- }
-
- // Ligne en mode update
- if ($_GET['action'] == 'editline' && $user->rights->facture->creer && $_GET['rowid'] == $objp->rowid)
- {
- print '\n";
- }
-
- $total = $total + ($objp->qty * $objp->price);
- $i++;
- }
-
- $db->free($resql);
- }
- else
- {
- dol_print_error($db);
- }
-
- */
-
$result = $object->getLinesArray();
if (!empty($object->lines))
@@ -2949,13 +2666,13 @@ else
{
$var=true;
- $object->showAddFreeProductForm(1);
+ $object->showAddFreeProductForm(1,$mysoc,$soc);
// Add predefined products/services
if ($conf->product->enabled || $conf->service->enabled)
{
$var=!$var;
- $object->showAddPredefinedProductForm(1);
+ $object->showAddPredefinedProductForm(1,$mysoc,$soc);
}
// Hook of thirdparty module
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 1096832c27a..75dbd2184a8 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -506,7 +506,7 @@ class CommonObject
// TODO uniformise code
if ($this->origin == 'shipping') $this->origin = 'expedition';
if ($this->origin == 'delivery') $this->origin = 'livraison';
-
+
$object = $this->origin;
$classname = ucfirst($object);
@@ -1285,11 +1285,12 @@ class CommonObject
* But for the moment we don't know if it'st possible as we keep a method available on overloaded objects.
* @param $dateSelector 1=Show also date range input fields
*/
- function showAddPredefinedProductForm($dateSelector=0)
+ function showAddPredefinedProductForm($dateSelector,$seller,$buyer)
{
global $conf,$langs;
global $html,$bcnd,$var;
+ // Use global variables + $dateSelector + $seller and $buyer
include(DOL_DOCUMENT_ROOT.'/core/tpl/predefinedproductline_create.tpl.php');
}
@@ -1299,11 +1300,12 @@ class CommonObject
* But for the moment we don't know if it'st possible as we keep a method available on overloaded objects.
* @param $dateSelector 1=Show also date range input fields
*/
- function showAddFreeProductForm($dateSelector=0)
+ function showAddFreeProductForm($dateSelector,$seller,$buyer)
{
global $conf,$langs;
global $html,$bcnd,$var;
+ // Use global variables + $dateSelector + $seller and $buyer
include(DOL_DOCUMENT_ROOT.'/core/tpl/freeproductline_create.tpl.php');
}
@@ -1360,7 +1362,7 @@ class CommonObject
* Return HTML with object lines list
* FIXME This must be moved into a html.class file instead of a business class.
*/
- function printLinesList($dateSelector=0)
+ function printLinesList($dateSelector=0,$seller,$buyer)
{
$num = count($this->lines);
$var = true;
@@ -1376,7 +1378,7 @@ class CommonObject
}
else
{
- $this->printLine($line,$var,$num,$i,$dateSelector);
+ $this->printLine($line,$var,$num,$i,$dateSelector,$seller,$buyer);
}
$i++;
@@ -1390,10 +1392,12 @@ class CommonObject
* @param $num Number of line
* @param $i
* @param $dateSelector 1=Show also date range input fields
+ * @param $seller Object of seller third party
+ * @param $buyer Object of buyer third party
* TODO This must be moved into a html.class file instead of a business class.
* But for the moment we don't know if it'st possible as we keep a method available on overloaded objects.
*/
- function printLine($line,$var=true,$num=0,$i=0,$dateSelector=0)
+ function printLine($line,$var=true,$num=0,$i=0,$dateSelector=0,$seller,$buyer)
{
global $conf,$langs,$user;
global $html,$bc;
@@ -1425,11 +1429,13 @@ class CommonObject
$text.= ' - '.$line->product_label;
$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($line->description));
+ // Use global variables + $seller and $buyer
include(DOL_DOCUMENT_ROOT.'/core/tpl/predefinedproductline_view.tpl.php');
}
else
{
- include(DOL_DOCUMENT_ROOT.'/core/tpl/freeproductline_view.tpl.php');
+ // Use global variables + $dateSelector + $seller and $buyer
+ include(DOL_DOCUMENT_ROOT.'/core/tpl/freeproductline_view.tpl.php');
}
}
@@ -1438,11 +1444,13 @@ class CommonObject
{
if ($line->fk_product > 0)
{
- include(DOL_DOCUMENT_ROOT.'/core/tpl/predefinedproductline_edit.tpl.php');
+ // Use global variables + $dateSelector + $seller and $buyer
+ include(DOL_DOCUMENT_ROOT.'/core/tpl/predefinedproductline_edit.tpl.php');
}
else
{
- include(DOL_DOCUMENT_ROOT.'/core/tpl/freeproductline_edit.tpl.php');
+ // Use global variables + $dateSelector + $seller and $buyer
+ include(DOL_DOCUMENT_ROOT.'/core/tpl/freeproductline_edit.tpl.php');
}
}
}
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index e610453276f..dd3c855a450 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -357,7 +357,7 @@ class Conf
$this->defaulttx='0'; // Taux par defaut des factures clients
}
else {
- $this->defaulttx=''; // Pas de taux par defaut des factures clients, le premier sera pris
+ $this->defaulttx=''; // Pas de taux par defaut des factures clients, le plus élevé sera pris
}
// $this->liste_limit = constante de taille maximale des listes
@@ -409,7 +409,7 @@ class Conf
$this->format_date_hour_short="%d/%m/%Y %H:%M";
$this->format_date_hour_text_short="%d %b %Y %H:%M";
$this->format_date_hour_text="%d %B %Y %H:%M";
-
+
// Limites decimales si non definie (peuvent etre egale a 0)
if (! isset($this->global->MAIN_MAX_DECIMALS_UNIT)) $this->global->MAIN_MAX_DECIMALS_UNIT=5;
if (! isset($this->global->MAIN_MAX_DECIMALS_TOT)) $this->global->MAIN_MAX_DECIMALS_TOT=2;
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index dd908c0ff85..f2acb217843 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2405,7 +2405,6 @@ class Form
global $langs,$conf,$mysoc;
$return='';
-
$txtva=array();
$libtva=array();
$nprtva=array();
@@ -2415,7 +2414,7 @@ class Form
$defaultnpr=(preg_match('/\*/',$selectedrate) ? 1 : $defaultnpr);
$defaulttx=str_replace('*','',$selectedrate);
- //print $societe_vendeuse."-".$societe_acheteuse;
+ // Check parameters
if (is_object($societe_vendeuse) && ! $societe_vendeuse->pays_code)
{
if ($societe_vendeuse->id == $mysoc->id)
@@ -2429,29 +2428,44 @@ class Form
return $return;
}
+ //var_dump($societe_acheteuse);
+ //print "name=$name, selectedrate=$selectedrate, seller=".$societe_vendeuse->pays_code." buyer=".$societe_acheteuse->pays_code." idprod=$idprod, info_bits=$info_bits";
+ //exit;
+
+ // Get list of all VAT rates to show
+ // First we defined code_pays to use to find list
if (is_object($societe_vendeuse))
{
- if ($societe_vendeuse->isInEEC() && (! empty($societe_vendeuse->tva_intra))
- && preg_match('/^([A-Z][A-Z])/',$societe_vendeuse->tva_intra,$reg))
- {
- $code_pays=$reg[1];
- }
- else
- {
- $code_pays=$societe_vendeuse->pays_code;
- }
+ $code_pays="'".$societe_vendeuse->pays_code."'";
}
else
{
- $code_pays=$mysoc->pays_code; // Pour compatibilite ascendente
+ $code_pays="'".$mysoc->pays_code."'"; // Pour compatibilite ascendente
}
-
- // Recherche liste des codes TVA du pays vendeur
- $sql = "SELECT t.taux,t.recuperableonly";
- $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
- $sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$code_pays."'";
- $sql .= " AND t.active = 1";
- $sql .= " ORDER BY t.taux ASC, t.recuperableonly ASC";
+ if (! empty($conf->global->SERVICES_ARE_ECOMMERCE_200238EC))
+ {
+ // We also add the buyer
+ if (! $idprod) // We don't know type of product
+ {
+ $code_pays.=",'".$societe_acheteuse->pays_code."'";
+ }
+ else
+ {
+ $prodstatic=new Product($this->db);
+ $prodstatic->fetch($idprod);
+ if ($prodstatic->type == 1) // We know product is a service
+ {
+ $code_pays.=",'".$societe_acheteuse->pays_code."'";
+ }
+ }
+ }
+ // Now we get list
+ $sql = "SELECT DISTINCT t.taux, t.recuperableonly";
+ $sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
+ $sql.= " WHERE t.fk_pays = p.rowid";
+ $sql.= " AND t.active = 1";
+ $sql.= " AND p.code in (".$code_pays.")";
+ $sql.= " ORDER BY t.taux ASC, t.recuperableonly ASC";
$resql=$this->db->query($sql);
if ($resql)
@@ -2491,8 +2505,7 @@ class Form
}
$nbdetaux = sizeof($txtva);
-
- if (sizeof($txtva))
+ if ($nbdetaux > 0)
{
$return.= '