';
print '| '.$langs->trans("Product").' | ';
print '';
@@ -333,10 +397,6 @@ if ($resql)
print '';
}
- /*
- * Transfer of units
- */
- /*
if ($action == "transfert")
{
print_titre($langs->trans("Transfer"));
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 50b43c4cab6..2a4acf54ff7 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -124,7 +124,7 @@ if ($action == "correct_stock" && ! $cancel)
if (! $error)
{
- $priceunit=price2num(GETPOST("price"));
+ $priceunit=price2num(GETPOST("unitprice"));
if (is_numeric(GETPOST("nbpiece")) && $id)
{
if (empty($product)) {
@@ -598,83 +598,8 @@ if ($id > 0 || $ref)
*/
if ($action == "correction")
{
- print '';
-
- print_titre($langs->trans("StockCorrection"));
- print '';
+ include DOL_DOCUMENT_ROOT.'/product/stock/tpl/stockcorrection.tpl.php';
+ print '
';
}
/*
@@ -682,89 +607,8 @@ if ($id > 0 || $ref)
*/
if ($action == "transfert")
{
- $pdluoid=GETPOST('pdluoid','int');
-
- $pdluo = new Productbatch($db);
-
- if ($pdluoid > 0)
- {
- $result=$pdluo->fetch($pdluoid);
-
- if ($result > 0)
- {
- $pdluoid=$pdluo->id;
- }
- else
- {
- dol_print_error($db);
- }
- }
-
- print_titre($langs->trans("StockTransfer"));
- print '';
+ include DOL_DOCUMENT_ROOT.'/product/stock/tpl/stocktransfer.tpl.php';
+ print '
';
}
/*
diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php
new file mode 100644
index 00000000000..8f656045ee3
--- /dev/null
+++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php
@@ -0,0 +1,119 @@
+
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ * $object must be defined
+ * $product can be defined
+ */
+?>
+
+
+load("productbatch");
+
+ if (empty($id)) $id = $object->id;
+
+ print '';
+
+ print_titre($langs->trans("StockCorrection"));
+ print '';
+
+?>
+
\ No newline at end of file
diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php
new file mode 100644
index 00000000000..6325939a01e
--- /dev/null
+++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php
@@ -0,0 +1,107 @@
+
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ * $product must be defined
+ * $backtopage
+ */
+?>
+
+
+ 0)
+ {
+ $result=$pdluo->fetch($pdluoid);
+ if ($result > 0)
+ {
+ $pdluoid=$pdluo->id;
+ }
+ else
+ {
+ dol_print_error($db,$pdluo->error,$pdluo->errors);
+ }
+ }
+
+ print_titre($langs->trans("StockTransfer"));
+ print '';
+?>
+
\ No newline at end of file
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 7ce537bd149..ab52249166a 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -95,8 +95,8 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
if (empty($reshook))
{
- if ($action == 'confirm_merge' && $confirm == 'yes') {
-
+ if ($action == 'confirm_merge' && $confirm == 'yes')
+ {
$errors = 0;
$soc_origin_id = GETPOST('soc_origin', 'int');
$soc_origin = new Societe($db);
@@ -2291,7 +2291,11 @@ else
$formmail->fromid = $user->id;
$formmail->fromname = $user->getFullName($langs);
$formmail->frommail = $user->email;
- if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID))
+ if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1)) // If bit 1 is set
+ {
+ $formmail->trackid='thi'.$object->id;
+ }
+ if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) // If bit 2 is set
{
include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'thi'.$object->id);
|