@@ -173,7 +172,8 @@ $genPriceOptions = function($level) use ($price_options) {
trans('SellingPrice').' '.$i;
// Label of price
- if (! empty($conf->global->{"PRODUIT_MULTIPRICES_LABEL$i"})) {
+ $keyforlabel='PRODUIT_MULTIPRICES_LABEL'.$i;
+ if (! empty($conf->global->$keyforlabel)) {
print ' - '.$langs->trans($conf->global->$keyforlabel);
}
?>
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index afff7d6f1c6..72f7533135a 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -12,7 +12,7 @@
* Copyright (C) 2014 Henry Florian
* Copyright (C) 2014-2016 Philippe Grand
* Copyright (C) 2014 Ion agorria
- * Copyright (C) 2016 Ferran Marcet
+ * Copyright (C) 2016-2017 Ferran Marcet
*
* 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
@@ -803,7 +803,7 @@ class Product extends CommonObject
// End call triggers
}
- if (! $error && (is_object($this->oldcopy) && $this->oldcopy->ref != $this->ref))
+ if (! $error && (is_object($this->oldcopy) && $this->oldcopy->ref !== $this->ref))
{
// We remove directory
if ($conf->product->dir_output)
@@ -908,6 +908,22 @@ class Product extends CommonObject
// End call triggers
}
+ // Delete from product_batch on product delete
+ if (! $error)
+ {
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX.'product_batch';
+ $sql.= " WHERE fk_product_stock IN (";
+ $sql.= "SELECT rowid FROM ".MAIN_DB_PREFIX.'product_stock';
+ $sql.= " WHERE fk_product = ".$id.")";
+ dol_syslog(get_class($this).'::delete', LOG_DEBUG);
+ $result = $this->db->query($sql);
+ if (! $result)
+ {
+ $error++;
+ $this->errors[] = $this->db->lasterror();
+ }
+ }
+
// Delete all child tables
if (! $error)
{
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 8c3ad45c90c..625b6c29631 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -5,7 +5,7 @@
* Copyright (C) 2005-2015 Regis Houssin
* Copyright (C) 2006 Andre Cianfarani
* Copyright (C) 2014 Florian Henry
- * Copyright (C) 2014 Juanjo Menent
+ * Copyright (C) 2014-2016 Juanjo Menent
* Copyright (C) 2014-2015 Philippe Grand
* Copyright (C) 2014 Ion agorria
* Copyright (C) 2015 Alexandre Spangaro
@@ -250,6 +250,13 @@ if (empty($reshook))
$localtax2 = $obj->localtax2;
$localtax1_type = $obj->localtax1_type;
$localtax2_type = $obj->localtax2_type;
+
+ // If spain, we don't use the localtax found into tax record in database with same code, but using the get_localtax rule
+ if (in_array($mysoc->country_code, array('ES')))
+ {
+ $localtax1 = get_localtax($tva_tx,1);
+ $localtax2 = get_localtax($tva_tx,2);
+ }
}
}
$pricestoupdate[0] = array(
@@ -1269,14 +1276,14 @@ if ($result)
}
else
{
- print '| ' . ($objp->price_base_type != 'TTC' ? price($objp->price) : ''). " | ";
- print '' . ($objp->price_base_type == 'TTC' ? price($objp->price_ttc) : '') . " | ";
+ print '' . price($objp->price). " | ";
+ print '' . price($objp->price_ttc) . " | ";
if (! empty($conf->dynamicprices->enabled)) { //Only if module is enabled
print ' | ';
}
}
- print '' . ($objp->price_base_type != 'TTC' ? price($objp->price_min) : '') . ' | ';
- print '' . ($objp->price_base_type == 'TTC' ? price($objp->price_min_ttc) : '') . ' | ';
+ print '' . price($objp->price_min) . ' | ';
+ print '' . price($objp->price_min_ttc) . ' | ';
// User
print '' . img_object($langs->trans("ShowUser"), 'user') . ' ' . $objp->login . ' | ';
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index 48b8d089375..ba257721746 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -115,8 +115,8 @@ if ($action == "correct_stock")
//$eatby=GETPOST('eatby');
//$sellby=GETPOST('sellby');
- $eatby=dol_mktime(12, 0, 0, GETPOST('eatbymonth'), GETPOST('eatbyday'), GETPOST('eatbyyear'));
- $sellby=dol_mktime(12, 0, 0, GETPOST('sellbymonth'), GETPOST('sellbyday'), GETPOST('sellbyyear'));
+ $eatby=dol_mktime(0, 0, 0, GETPOST('eatbymonth'), GETPOST('eatbyday'), GETPOST('eatbyyear'));
+ $sellby=dol_mktime(0, 0, 0, GETPOST('sellbymonth'), GETPOST('sellbyday'), GETPOST('sellbyyear'));
$result=$product->correct_stock_batch(
$user,
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 3170f329ea7..d37219db898 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -54,8 +54,8 @@ $stocklimit = GETPOST('seuil_stock_alerte');
$desiredstock = GETPOST('desiredstock');
$cancel = GETPOST('cancel');
$fieldid = isset($_GET["ref"])?'ref':'rowid';
-$d_eatby=dol_mktime(12, 0, 0, $_POST['eatbymonth'], $_POST['eatbyday'], $_POST['eatbyyear']);
-$d_sellby=dol_mktime(12, 0, 0, $_POST['sellbymonth'], $_POST['sellbyday'], $_POST['sellbyyear']);
+$d_eatby=dol_mktime(0, 0, 0, $_POST['eatbymonth'], $_POST['eatbyday'], $_POST['eatbyyear']);
+$d_sellby=dol_mktime(0, 0, 0, $_POST['sellbymonth'], $_POST['sellbyday'], $_POST['sellbyyear']);
$pdluoid=GETPOST('pdluoid','int');
// Security check
@@ -352,8 +352,8 @@ if ($action == 'updateline' && GETPOST('save') == $langs->trans('Save'))
}
else
{
- $d_eatby=dol_mktime(12, 0, 0, $_POST['eatbymonth'], $_POST['eatbyday'], $_POST['eatbyyear']);
- $d_sellby=dol_mktime(12, 0, 0, $_POST['sellbymonth'], $_POST['sellbyday'], $_POST['sellbyyear']);
+ $d_eatby=dol_mktime(0, 0, 0, $_POST['eatbymonth'], $_POST['eatbyday'], $_POST['eatbyyear']);
+ $d_sellby=dol_mktime(0, 0, 0, $_POST['sellbymonth'], $_POST['sellbyday'], $_POST['sellbyyear']);
$pdluo->batch=GETPOST("batch_number",'san_alpha');
$pdluo->eatby=$d_eatby;
$pdluo->sellby=$d_sellby;
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 91a75f80ce1..6e866057584 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -4,6 +4,7 @@
* Copyright (C) 2005-2010 Regis Houssin
* Copyright (C) 2013 Florian Henry
* Copyright (C) 2014-2015 Marcos García
+ * Copyright (C) 2017 Ferran Marcet
*
* 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
@@ -279,7 +280,7 @@ class Project extends CommonObject
}
}
- if (! $error && (is_object($this->oldcopy) && $this->oldcopy->ref != $this->ref))
+ if (! $error && (is_object($this->oldcopy) && $this->oldcopy->ref !== $this->ref))
{
// We remove directory
if ($conf->projet->dir_output)
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index ea2cb899893..c31b4513ef5 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -250,6 +250,7 @@ if ($type_element == 'supplier_invoice')
$tables_from = MAIN_DB_PREFIX."facture_fourn as f,".MAIN_DB_PREFIX."facture_fourn_det as d";
$where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".$socid;
$where.= " AND d.fk_facture_fourn = f.rowid";
+ $where.= " AND f.entity = ".$conf->entity;
$dateprint = 'f.datef';
$doc_number='f.ref';
$thirdTypeSelect='supplier';
@@ -262,6 +263,7 @@ if ($type_element == 'supplier_order')
$tables_from = MAIN_DB_PREFIX."commande_fournisseur as c,".MAIN_DB_PREFIX."commande_fournisseurdet as d";
$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
$where.= " AND d.fk_commande = c.rowid";
+ $where.= " AND c.entity = ".$conf->entity;
$dateprint = 'c.date_valid';
$doc_number='c.ref';
$thirdTypeSelect='supplier';
@@ -275,6 +277,7 @@ if ($type_element == 'contract')
$tables_from = MAIN_DB_PREFIX."contrat as c,".MAIN_DB_PREFIX."contratdet as d";
$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
$where.= " AND d.fk_contrat = c.rowid";
+ $where.= " AND c.entity = ".$conf->entity;
$dateprint = 'c.date_valid';
$doc_number='c.ref';
$thirdTypeSelect='customer';
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index d14ccc6f8d4..5aeb1072d04 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -36,6 +36,12 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
if (! defined('NOREQUIREHOOK')) define('NOREQUIREHOOK','1'); // Disable "main.inc.php" hooks
// Pour autre que companylogo, on charge environnement + info issus de logon comme le user
if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'companylogo') && ! defined("NOLOGIN")) define("NOLOGIN",'1');
+if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'fckeditor') && ! defined("NOLOGIN")) {
+ define("NOLOGIN",'1');
+ // For multicompany
+ $entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+ if (is_numeric($entity)) define("DOLENTITY", $entity);
+}
/**
* Header empty
diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index 98455b2a233..fb8612977a8 100755
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -61,6 +61,11 @@ $error=0;
@set_time_limit(0);
print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
+if ($conf->global->MAILING_LIMIT_SENDBYCLI == '-1')
+{
+
+}
+
$user = new User($db);
// for signature, we use user send as parameter
if (! empty($login)) $user->fetch('',$login);
@@ -108,7 +113,11 @@ if ($resql)
$sql2 = "SELECT mc.rowid, mc.lastname as lastname, mc.firstname as firstname, mc.email, mc.other, mc.source_url, mc.source_id, mc.source_type, mc.tag";
$sql2.= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
$sql2.= " WHERE mc.statut < 1 AND mc.fk_mailing = ".$id;
-
+ if ($conf->global->MAILING_LIMIT_SENDBYCLI > 0)
+ {
+ $sql2.= " LIMIT ".$conf->global->MAILING_LIMIT_SENDBYCLI;
+ }
+
$resql2=$db->query($sql2);
if ($resql2)
{
|