diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 57d7ece60ad..11d66010363 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -161,7 +161,7 @@ if ($action == 'confirm_deleteline' && $confirm == 'yes')
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($newlang);
}
- propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
exit;
@@ -191,7 +191,7 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->propale
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($newlang);
}
- propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
}
else
{
@@ -343,7 +343,7 @@ if ($_POST['action'] == 'add' && $user->rights->propale->creer)
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($newlang);
}
- propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
exit;
@@ -602,7 +602,7 @@ if ($action == 'modif' && $user->rights->propale->creer)
$outputlangs->setDefaultLang($newlang);
}
- propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
}
if ($_POST['action'] == "setabsolutediscount" && $user->rights->propale->creer)
@@ -726,22 +726,22 @@ if ($_POST['action'] == "addline" && $user->rights->propale->creer)
{
// Insert line
$result=$object->addline(
- $_POST["id"],
- $desc,
- $pu_ht,
- $_POST['qty'],
- $tva_tx,
- $localtax1_tx,
- $localtax2_tx,
- $_POST['idprod'],
- $_POST['remise_percent'],
- $price_base_type,
- $pu_ttc,
- $info_bits,
- $type,
- -1,
- 0,
- $_POST['fk_parent_line']
+ $_POST["id"],
+ $desc,
+ $pu_ht,
+ $_POST['qty'],
+ $tva_tx,
+ $localtax1_tx,
+ $localtax2_tx,
+ $_POST['idprod'],
+ $_POST['remise_percent'],
+ $price_base_type,
+ $pu_ttc,
+ $info_bits,
+ $type,
+ -1,
+ 0,
+ $_POST['fk_parent_line']
);
if ($result > 0)
@@ -756,7 +756,7 @@ if ($_POST['action'] == "addline" && $user->rights->propale->creer)
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($newlang);
}
- propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
unset($_POST['qty']);
unset($_POST['type']);
@@ -814,18 +814,19 @@ if ($_POST['action'] == 'updateligne' && $user->rights->propale->creer && $_POST
}
else
{
- $result = $object->updateline($_POST['lineid'],
- $up_ht,
- $_POST['qty'],
- $_POST['remise_percent'],
- $vat_rate,
- $localtax1_rate,
- $localtax2_rate,
- $_POST['desc'],
- 'HT',
- $info_bits,
- $special_code,
- $_POST['fk_parent_line']
+ $result = $object->updateline(
+ $_POST['lineid'],
+ $up_ht,
+ $_POST['qty'],
+ $_POST['remise_percent'],
+ $vat_rate,
+ $localtax1_rate,
+ $localtax2_rate,
+ $_POST['desc'],
+ 'HT',
+ $info_bits,
+ $special_code,
+ $_POST['fk_parent_line']
);
// Define output language
@@ -838,7 +839,7 @@ if ($_POST['action'] == 'updateligne' && $user->rights->propale->creer && $_POST
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($newlang);
}
- propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
}
}
@@ -951,7 +952,7 @@ if ($action == 'up' && $user->rights->propale->creer)
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($newlang);
}
- propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id.'#'.GETPOST('rowid'));
exit;
@@ -973,7 +974,7 @@ if ($action == 'down' && $user->rights->propale->creer)
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($newlang);
}
- propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id.'#'.GETPOST('rowid'));
exit;
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index ea28156bd48..deb3b0fd568 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -158,7 +158,7 @@ if ($action == 'confirm_deleteline' && $confirm == 'yes')
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($newlang);
}
- commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
}
else
{
@@ -260,25 +260,25 @@ if ($action == 'add' && $user->rights->commande->creer)
}
$result = $object->addline(
- $object_id,
- $desc,
- $lines[$i]->subprice,
- $lines[$i]->qty,
- $lines[$i]->tva_tx,
- $lines[$i]->localtax1_tx,
- $lines[$i]->localtax2_tx,
- $lines[$i]->fk_product,
- $lines[$i]->remise_percent,
- $lines[$i]->info_bits,
- $lines[$i]->fk_remise_except,
- 'HT',
- 0,
- $datestart,
- $dateend,
- $product_type,
- $lines[$i]->rang,
- $lines[$i]->special_code,
- $fk_parent_line
+ $object_id,
+ $desc,
+ $lines[$i]->subprice,
+ $lines[$i]->qty,
+ $lines[$i]->tva_tx,
+ $lines[$i]->localtax1_tx,
+ $lines[$i]->localtax2_tx,
+ $lines[$i]->fk_product,
+ $lines[$i]->remise_percent,
+ $lines[$i]->info_bits,
+ $lines[$i]->fk_remise_except,
+ 'HT',
+ 0,
+ $datestart,
+ $dateend,
+ $product_type,
+ $lines[$i]->rang,
+ $lines[$i]->special_code,
+ $fk_parent_line
);
if ($result < 0)
@@ -579,25 +579,25 @@ if ($action == 'addline' && $user->rights->commande->creer)
{
// Insert line
$result = $object->addline(
- $id,
- $desc,
- $pu_ht,
- $_POST['qty'],
- $tva_tx,
- $localtax1_tx,
- $localtax2_tx,
- $_POST['idprod'],
- $_POST['remise_percent'],
- $info_bits,
- 0,
- $price_base_type,
- $pu_ttc,
- $date_start,
- $date_end,
- $type,
- -1,
- '',
- $_POST['fk_parent_line']
+ $id,
+ $desc,
+ $pu_ht,
+ $_POST['qty'],
+ $tva_tx,
+ $localtax1_tx,
+ $localtax2_tx,
+ $_POST['idprod'],
+ $_POST['remise_percent'],
+ $info_bits,
+ 0,
+ $price_base_type,
+ $pu_ttc,
+ $date_start,
+ $date_end,
+ $type,
+ -1,
+ '',
+ $_POST['fk_parent_line']
);
if ($result > 0)
@@ -612,7 +612,7 @@ if ($action == 'addline' && $user->rights->commande->creer)
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($newlang);
}
- commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
unset($_POST['qty']);
unset($_POST['type']);
@@ -692,20 +692,21 @@ if ($action == 'updateligne' && $user->rights->commande->creer && $_POST['save']
if ($result >= 0)
{
- $result = $object->updateline($_POST['lineid'],
- $description,
- $up_ht,
- $_POST['qty'],
- $_POST['remise_percent'],
- $vat_rate,
- $localtax1_rate,
- $localtax2_rate,
- 'HT',
- $info_bits,
- $date_start,
- $date_end,
- $type,
- $_POST['fk_parent_line']
+ $result = $object->updateline(
+ $_POST['lineid'],
+ $description,
+ $up_ht,
+ $_POST['qty'],
+ $_POST['remise_percent'],
+ $vat_rate,
+ $localtax1_rate,
+ $localtax2_rate,
+ 'HT',
+ $info_bits,
+ $date_start,
+ $date_end,
+ $type,
+ $_POST['fk_parent_line']
);
if ($result >= 0)
@@ -720,7 +721,7 @@ if ($action == 'updateligne' && $user->rights->commande->creer && $_POST['save']
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($newlang);
}
- commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
}
else
{
@@ -754,7 +755,7 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->command
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($newlang);
}
- commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
}
}
@@ -794,7 +795,7 @@ if ($action == 'modif' && $user->rights->commande->creer)
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($newlang);
}
- commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
}
}
@@ -819,7 +820,7 @@ if ($action == 'up' && $user->rights->commande->creer)
$outputlangs->setDefaultLang($newlang);
}
- commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id.'#'.$_GET['rowid']);
exit;
@@ -841,7 +842,7 @@ if ($action == 'down' && $user->rights->commande->creer)
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($newlang);
}
- commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id.'#'.$_GET['rowid']);
exit;
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index cc4d8b5c441..369fe03290f 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -169,8 +169,8 @@ if ($action == 'confirm_deleteline' && $confirm == 'yes')
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($newlang);
}
- $result=facture_pdf_create($db, $object, '', $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
- if ($result > 0)
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) $result=facture_pdf_create($db, $object, '', $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
+ if ($result >= 0)
{
Header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id);
exit;
@@ -330,7 +330,7 @@ if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->facture->v
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($newlang);
}
- facture_pdf_create($db, $object, '', $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) facture_pdf_create($db, $object, '', $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
}
else
{
@@ -387,7 +387,7 @@ if ($action == 'modif' && ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $us
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($newlang);
}
- facture_pdf_create($db, $object, '', $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) facture_pdf_create($db, $object, '', $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
}
}
@@ -759,28 +759,28 @@ if ($action == 'add' && $user->rights->facture->creer)
}
$result = $object->addline(
- $id,
- $desc,
- $lines[$i]->subprice,
- $lines[$i]->qty,
- $lines[$i]->tva_tx,
- $lines[$i]->localtax1_tx,
- $lines[$i]->localtax2_tx,
- $lines[$i]->fk_product,
- $lines[$i]->remise_percent,
- $date_start,
- $date_end,
- 0,
- $lines[$i]->info_bits,
- $lines[$i]->fk_remise_except,
- 'HT',
- 0,
- $product_type,
- $lines[$i]->rang,
- $lines[$i]->special_code,
- $object->origin,
- $lines[$i]->rowid,
- $fk_parent_line
+ $id,
+ $desc,
+ $lines[$i]->subprice,
+ $lines[$i]->qty,
+ $lines[$i]->tva_tx,
+ $lines[$i]->localtax1_tx,
+ $lines[$i]->localtax2_tx,
+ $lines[$i]->fk_product,
+ $lines[$i]->remise_percent,
+ $date_start,
+ $date_end,
+ 0,
+ $lines[$i]->info_bits,
+ $lines[$i]->fk_remise_except,
+ 'HT',
+ 0,
+ $product_type,
+ $lines[$i]->rang,
+ $lines[$i]->special_code,
+ $object->origin,
+ $lines[$i]->rowid,
+ $fk_parent_line
);
if ($result > 0)
@@ -978,28 +978,28 @@ if (($action == 'addline' || $action == 'addline_predef') && $user->rights->fact
{
// Insert line
$result = $object->addline(
- $id,
- $desc,
- $pu_ht,
- $_POST['qty'],
- $tva_tx,
- $localtax1_tx,
- $localtax2_tx,
- $_POST['idprod'],
- $_POST['remise_percent'],
- $date_start,
- $date_end,
- 0,
- $info_bits,
- '',
- $price_base_type,
- $pu_ttc,
- $type,
- -1,
- 0,
- '',
- 0,
- GETPOST('fk_parent_line')
+ $id,
+ $desc,
+ $pu_ht,
+ $_POST['qty'],
+ $tva_tx,
+ $localtax1_tx,
+ $localtax2_tx,
+ $_POST['idprod'],
+ $_POST['remise_percent'],
+ $date_start,
+ $date_end,
+ 0,
+ $info_bits,
+ '',
+ $price_base_type,
+ $pu_ttc,
+ $type,
+ -1,
+ 0,
+ '',
+ 0,
+ GETPOST('fk_parent_line')
);
}
}
@@ -1017,7 +1017,7 @@ if (($action == 'addline' || $action == 'addline_predef') && $user->rights->fact
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($newlang);
}
- facture_pdf_create($db, $object, '', $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) facture_pdf_create($db, $object, '', $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
unset($_POST['qty']);
unset($_POST['type']);
@@ -1089,20 +1089,21 @@ if ($action == 'updateligne' && $user->rights->facture->creer && $_POST['save']
// Update line
if ($result >= 0)
{
- $result = $object->updateline(GETPOST('lineid'),
- $description,
- $up_ht,
- GETPOST('qty'),
- GETPOST('remise_percent'),
- $date_start,
- $date_end,
- $vat_rate,
- $localtax1_rate,
- $localtax2_rate,
- 'HT',
- $info_bits,
- $type,
- GETPOST('fk_parent_line')
+ $result = $object->updateline(
+ GETPOST('lineid'),
+ $description,
+ $up_ht,
+ GETPOST('qty'),
+ GETPOST('remise_percent'),
+ $date_start,
+ $date_end,
+ $vat_rate,
+ $localtax1_rate,
+ $localtax2_rate,
+ 'HT',
+ $info_bits,
+ $type,
+ GETPOST('fk_parent_line')
);
// Define output language
@@ -1115,7 +1116,7 @@ if ($action == 'updateligne' && $user->rights->facture->creer && $_POST['save']
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($newlang);
}
- facture_pdf_create($db, $object, '', $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) facture_pdf_create($db, $object, '', $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
}
}
@@ -1143,7 +1144,7 @@ if ($action == 'up' && $user->rights->facture->creer)
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($newlang);
}
- facture_pdf_create($db, $object, '', $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) facture_pdf_create($db, $object, '', $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
Header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$object->id.'#'.$_GET['rowid']);
exit;
@@ -1165,7 +1166,7 @@ if ($action == 'down' && $user->rights->facture->creer)
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($newlang);
}
- facture_pdf_create($db, $object, '', $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) facture_pdf_create($db, $object, '', $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
Header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$object->id.'#'.$_GET['rowid']);
exit;
diff --git a/htdocs/compta/paiement/fiche.php b/htdocs/compta/paiement/fiche.php
index 26707aeb6fa..ae1223a1e01 100644
--- a/htdocs/compta/paiement/fiche.php
+++ b/htdocs/compta/paiement/fiche.php
@@ -112,7 +112,7 @@ if ($action == 'confirm_valide' && GETPOST('confirm') == 'yes' && $user->rights-
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
}
- facture_pdf_create($db, $fac, '', $fac->modelpdf, $outputlangs);
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) facture_pdf_create($db, $fac, '', $fac->modelpdf, $outputlangs, $hookmanager);
}
Header('Location: fiche.php?id='.$paiement->id);
diff --git a/htdocs/compta/payment_sc/fiche.php b/htdocs/compta/payment_sc/fiche.php
index 90f5f5530c5..d69efe561ab 100644
--- a/htdocs/compta/payment_sc/fiche.php
+++ b/htdocs/compta/payment_sc/fiche.php
@@ -94,7 +94,7 @@ if ($_REQUEST['action'] == 'confirm_valide' && $_REQUEST['confirm'] == 'yes' &&
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
}
- facture_pdf_create($db, $fac, '', $fac->modelpdf, $outputlangs);
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) facture_pdf_create($db, $fac, '', $fac->modelpdf, $outputlangs, $hookmanager);
}
Header('Location: fiche.php?id='.$paiement->id);
diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php
index a8029264aa7..6710aa0f0bf 100644
--- a/htdocs/contrat/fiche.php
+++ b/htdocs/contrat/fiche.php
@@ -297,19 +297,19 @@ if ($action == 'addline' && $user->rights->contrat->creer)
{
// Insert line
$result = $object->addline(
- $desc,
- $pu_ht,
- $_POST["pqty"],
- $tva_tx,
- $localtax1_tx,
- $localtax2_tx,
- $_POST["idprod"],
- $_POST["premise"],
- $date_start,
- $date_end,
- $price_base_type,
- $pu_ttc,
- $info_bits
+ $desc,
+ $pu_ht,
+ $_POST["pqty"],
+ $tva_tx,
+ $localtax1_tx,
+ $localtax2_tx,
+ $_POST["idprod"],
+ $_POST["premise"],
+ $date_start,
+ $date_end,
+ $price_base_type,
+ $pu_ttc,
+ $info_bits
);
}
@@ -326,7 +326,7 @@ if ($action == 'addline' && $user->rights->contrat->creer)
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($newlang);
}
- contrat_pdf_create($db, $object->id, $object->modelpdf, $outputlangs);
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) contrat_pdf_create($db, $object->id, $object->modelpdf, $outputlangs);
*/
}
else
@@ -1044,7 +1044,7 @@ else
{
$product=new Product($db);
$product->fetch($objp->fk_product);
- $dateactend = dol_time_plus_duree (time(), $product->duration_value, $product->duration_unit);
+ $dateactend = dol_time_plus_duree(time(), $product->duration_value, $product->duration_unit);
}
}
@@ -1093,7 +1093,7 @@ else
{
$product=new Product($db);
$product->fetch($objp->fk_product);
- $dateactend = dol_time_plus_duree (time(), $product->duration_value, $product->duration_unit);
+ $dateactend = dol_time_plus_duree(time(), $product->duration_value, $product->duration_unit);
}
}
$now=mktime();
diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index ebaaf5e6129..75a697ec93a 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -164,8 +164,8 @@ if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->expedition
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($newlang);
}
- $result=expedition_pdf_create($db,$object,$object->modelpdf,$outputlangs);
- if ($result <= 0)
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) $result=expedition_pdf_create($db,$object,$object->modelpdf,$outputlangs);
+ if ($result < 0)
{
dol_print_error($db,$result);
exit;
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index f34716bfc03..d8cc040b2e6 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -68,55 +68,55 @@ $object = new CommandeFournisseur($db);
* Actions
*/
- // conditions de reglement
+// conditions de reglement
if ($action == 'setconditions' && $user->rights->fournisseur->commande->creer)
{
- $object->fetch($id);
+ $object->fetch($id);
$result=$object->cond_reglement($_POST['cond_reglement_id']);
}
// mode de reglement
if ($action == 'setmode' && $user->rights->fournisseur->commande->creer)
{
- $object->fetch($id);
+ $object->fetch($id);
$result=$object->mode_reglement($_POST['mode_reglement_id']);
}
// Set project
if ($action == 'classin')
{
- $object->fetch($id);
- $object->setProject($projectid);
+ $object->fetch($id);
+ $object->setProject($projectid);
}
if ($action == 'setremisepercent' && $user->rights->fournisseur->commande->creer)
{
- $object->fetch($id);
- $result = $object->set_remise($user, $_POST['remise_percent']);
+ $object->fetch($id);
+ $result = $object->set_remise($user, $_POST['remise_percent']);
}
if ($action == 'reopen' && $user->rights->fournisseur->commande->approuver)
{
- $order = new CommandeFournisseur($db);
- $result = $order->fetch($id);
- if ($order->statut == 5 || $order->statut == 6 || $order->statut == 7 || $order->statut == 9)
- {
- if ($order->statut == 5) $newstatus=4; // Received->Received partially
- if ($order->statut == 6) $newstatus=2; // Canceled->Approved
- if ($order->statut == 7) $newstatus=3; // Canceled->Process running
- if ($order->statut == 9) $newstatus=1; // Refused->Validated
+ $order = new CommandeFournisseur($db);
+ $result = $order->fetch($id);
+ if ($order->statut == 5 || $order->statut == 6 || $order->statut == 7 || $order->statut == 9)
+ {
+ if ($order->statut == 5) $newstatus=4; // Received->Received partially
+ if ($order->statut == 6) $newstatus=2; // Canceled->Approved
+ if ($order->statut == 7) $newstatus=3; // Canceled->Process running
+ if ($order->statut == 9) $newstatus=1; // Refused->Validated
- $result = $order->setStatus($user,$newstatus);
- if ($result > 0)
- {
- Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$_REQUEST['id']);
- exit;
- }
- else
- {
- $mesg='
'.$order->error.'
';
- }
- }
+ $result = $order->setStatus($user,$newstatus);
+ if ($result > 0)
+ {
+ Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$_REQUEST['id']);
+ exit;
+ }
+ else
+ {
+ $mesg=''.$order->error.'
';
+ }
+ }
}
/*
@@ -124,134 +124,134 @@ if ($action == 'reopen' && $user->rights->fournisseur->commande->approuver)
*/
if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
{
- if (($_POST['qty'] || $_POST['pqty']) && (($_POST['pu'] && ($_POST['np_desc'] || $_POST['dp_desc'])) || $_POST['idprodfournprice']))
- {
- $ret=$object->fetch($id);
- if ($ret < 0)
- {
- dol_print_error($db,$object->error);
- exit;
- }
+ if (($_POST['qty'] || $_POST['pqty']) && (($_POST['pu'] && ($_POST['np_desc'] || $_POST['dp_desc'])) || $_POST['idprodfournprice']))
+ {
+ $ret=$object->fetch($id);
+ if ($ret < 0)
+ {
+ dol_print_error($db,$object->error);
+ exit;
+ }
- // Ecrase $pu par celui du produit
- // Ecrase $desc par celui du produit
- // Ecrase $txtva par celui du produit
- if ($_POST["idprodfournprice"]) // >0 or -1
- {
- $qty = $_POST['qty'] ? $_POST['qty'] : $_POST['pqty'];
+ // Ecrase $pu par celui du produit
+ // Ecrase $desc par celui du produit
+ // Ecrase $txtva par celui du produit
+ if ($_POST["idprodfournprice"]) // >0 or -1
+ {
+ $qty = $_POST['qty'] ? $_POST['qty'] : $_POST['pqty'];
- $productsupplier = new ProductFournisseur($db);
- $idprod=$productsupplier->get_buyprice($_POST['idprodfournprice'], $qty);
+ $productsupplier = new ProductFournisseur($db);
+ $idprod=$productsupplier->get_buyprice($_POST['idprodfournprice'], $qty);
- //$societe='';
- if ($object->socid)
- {
- $societe=new Societe($db);
- $societe->fetch($object->socid);
- }
+ //$societe='';
+ if ($object->socid)
+ {
+ $societe=new Societe($db);
+ $societe->fetch($object->socid);
+ }
- if ($idprod > 0)
- {
- $res=$productsupplier->fetch($idprod);
+ if ($idprod > 0)
+ {
+ $res=$productsupplier->fetch($idprod);
- // cas special pour lequel on a les meme reference que le fournisseur
- // $label = '['.$nv_prod->ref.'] - '. $nv_prod->libelle;
- $label = $productsupplier->libelle;
+ // cas special pour lequel on a les meme reference que le fournisseur
+ // $label = '['.$nv_prod->ref.'] - '. $nv_prod->libelle;
+ $label = $productsupplier->libelle;
- $desc = $productsupplier->description;
- $desc.= $productsupplier->description && $_POST['np_desc'] ? "\n" : "";
- $desc.= $_POST['np_desc'];
+ $desc = $productsupplier->description;
+ $desc.= $productsupplier->description && $_POST['np_desc'] ? "\n" : "";
+ $desc.= $_POST['np_desc'];
- $remise_percent = $_POST["remise_percent"] ? $_POST["remise_percent"] : $_POST["p_remise_percent"];
+ $remise_percent = $_POST["remise_percent"] ? $_POST["remise_percent"] : $_POST["p_remise_percent"];
- $tva_tx = get_default_tva($societe,$mysoc,$productsupplier->id);
- $type = $productsupplier->type;
+ $tva_tx = get_default_tva($societe,$mysoc,$productsupplier->id);
+ $type = $productsupplier->type;
- // Local Taxes
- $localtax1_tx= get_localtax($tva_tx, 1, $societe);
- $localtax2_tx= get_localtax($tva_tx, 2, $societe);
+ // Local Taxes
+ $localtax1_tx= get_localtax($tva_tx, 1, $societe);
+ $localtax2_tx= get_localtax($tva_tx, 2, $societe);
- $result=$object->addline(
- $desc,
- $pu,
- $qty,
- $tva_tx,
- $localtax1_tx,
- $localtax2_tx,
- $productsupplier->id,
- $_POST['idprodfournprice'],
- $productsupplier->fourn_ref,
- $remise_percent,
- 'HT',
- $type
- );
- }
- if ($idprod == -1)
- {
- // Quantity too low
- $langs->load("errors");
- $mesg=''.$langs->trans("ErrorQtyTooLowForThisSupplier").'
';
- }
- }
- else
- {
- $type=$_POST["type"];
- $desc=$_POST['dp_desc'];
- $tva_tx = price2num($_POST['tva_tx']);
+ $result=$object->addline(
+ $desc,
+ $pu,
+ $qty,
+ $tva_tx,
+ $localtax1_tx,
+ $localtax2_tx,
+ $productsupplier->id,
+ $_POST['idprodfournprice'],
+ $productsupplier->fourn_ref,
+ $remise_percent,
+ 'HT',
+ $type
+ );
+ }
+ if ($idprod == -1)
+ {
+ // Quantity too low
+ $langs->load("errors");
+ $mesg=''.$langs->trans("ErrorQtyTooLowForThisSupplier").'
';
+ }
+ }
+ else
+ {
+ $type=$_POST["type"];
+ $desc=$_POST['dp_desc'];
+ $tva_tx = price2num($_POST['tva_tx']);
- // Local Taxes
- $localtax1_tx= get_localtax($tva_tx, 1, $societe);
- $localtax2_tx= get_localtax($tva_tx, 2, $societe);
+ // Local Taxes
+ $localtax1_tx= get_localtax($tva_tx, 1, $societe);
+ $localtax2_tx= get_localtax($tva_tx, 2, $societe);
- if (! $_POST['dp_desc'])
- {
- $mesg=''.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Label")).'
';
- }
- else
- {
- if (!empty($_POST['pu']))
- {
- $price_base_type = 'HT';
- $ht = price2num($_POST['pu']);
- $result=$object->addline($desc, $ht, $_POST['qty'], $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', $_POST['remise_percent'], $price_base_type, 0, $type);
- }
- else
- {
- $ttc = price2num($_POST['amountttc']);
- $ht = $ttc / (1 + ($tauxtva / 100));
- $price_base_type = 'HT';
- $result=$object->addline($desc, $ht, $_POST['qty'], $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', $_POST['remise_percent'], $price_base_type, $ttc, $type);
- }
- }
- }
+ if (! $_POST['dp_desc'])
+ {
+ $mesg=''.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Label")).'
';
+ }
+ else
+ {
+ if (!empty($_POST['pu']))
+ {
+ $price_base_type = 'HT';
+ $ht = price2num($_POST['pu']);
+ $result=$object->addline($desc, $ht, $_POST['qty'], $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', $_POST['remise_percent'], $price_base_type, 0, $type);
+ }
+ else
+ {
+ $ttc = price2num($_POST['amountttc']);
+ $ht = $ttc / (1 + ($tauxtva / 100));
+ $price_base_type = 'HT';
+ $result=$object->addline($desc, $ht, $_POST['qty'], $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', $_POST['remise_percent'], $price_base_type, $ttc, $type);
+ }
+ }
+ }
- //print "xx".$tva_tx; exit;
- if ($result > 0)
- {
- $outputlangs = $langs;
- if (! empty($_REQUEST['lang_id']))
- {
- $outputlangs = new Translate("",$conf);
- $outputlangs->setDefaultLang($_REQUEST['lang_id']);
- }
- supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'));
+ //print "xx".$tva_tx; exit;
+ if ($result > 0)
+ {
+ $outputlangs = $langs;
+ if (! empty($_REQUEST['lang_id']))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+ }
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'));
- unset($_POST['qty']);
- unset($_POST['type']);
- unset($_POST['idprodfournprice']);
- unset($_POST['remmise_percent']);
- unset($_POST['dp_desc']);
- unset($_POST['np_desc']);
- unset($_POST['pu']);
- unset($_POST['tva_tx']);
- unset($localtax1_tx);
- unset($localtax2_tx);
- }
- else if (empty($mesg))
- {
- $mesg=''.$object->error.'
';
- }
- }
+ unset($_POST['qty']);
+ unset($_POST['type']);
+ unset($_POST['idprodfournprice']);
+ unset($_POST['remmise_percent']);
+ unset($_POST['dp_desc']);
+ unset($_POST['np_desc']);
+ unset($_POST['pu']);
+ unset($_POST['tva_tx']);
+ unset($localtax1_tx);
+ unset($localtax2_tx);
+ }
+ else if (empty($mesg))
+ {
+ $mesg=''.$object->error.'
';
+ }
+ }
}
/*
@@ -259,265 +259,266 @@ if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
*/
if ($action == 'updateligne' && $user->rights->fournisseur->commande->creer && $_POST['save'] == $langs->trans('Save'))
{
- $product=new Product($db);
- if ($_POST["elrowid"])
- {
- if ($product->fetch($_POST["elrowid"]) < 0) dol_print_error($db);
- }
+ $product=new Product($db);
+ if ($_POST["elrowid"])
+ {
+ if ($product->fetch($_POST["elrowid"]) < 0) dol_print_error($db);
+ }
- if ($object->fetch($id) < 0) dol_print_error($db);
+ if ($object->fetch($id) < 0) dol_print_error($db);
- $societe=new Societe($db);
- $societe->fetch($object->socid);
+ $societe=new Societe($db);
+ $societe->fetch($object->socid);
- $localtax1_tx=get_localtax($_POST['tva_tx'],1,$societe);
- $localtax2_tx=get_localtax($_POST['tva_tx'],2,$societe);
+ $localtax1_tx=get_localtax($_POST['tva_tx'],1,$societe);
+ $localtax2_tx=get_localtax($_POST['tva_tx'],2,$societe);
- $result = $object->updateline($_POST['elrowid'],
- $_POST['eldesc'],
- $_POST['pu'],
- $_POST['qty'],
- $_POST['remise_percent'],
- $_POST['tva_tx'],
- $localtax1_tx,
- $localtax2_tx,
- 'HT',
- 0,
- isset($_POST["type"])?$_POST["type"]:$product->type
- );
+ $result = $object->updateline(
+ $_POST['elrowid'],
+ $_POST['eldesc'],
+ $_POST['pu'],
+ $_POST['qty'],
+ $_POST['remise_percent'],
+ $_POST['tva_tx'],
+ $localtax1_tx,
+ $localtax2_tx,
+ 'HT',
+ 0,
+ isset($_POST["type"])?$_POST["type"]:$product->type
+ );
- if ($result >= 0)
- {
- $outputlangs = $langs;
- if (! empty($_REQUEST['lang_id']))
- {
- $outputlangs = new Translate("",$conf);
- $outputlangs->setDefaultLang($_REQUEST['lang_id']);
- }
- supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'));
- }
- else
- {
- dol_print_error($db,$object->error);
- exit;
- }
+ if ($result >= 0)
+ {
+ $outputlangs = $langs;
+ if (! empty($_REQUEST['lang_id']))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+ }
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'));
+ }
+ else
+ {
+ dol_print_error($db,$object->error);
+ exit;
+ }
}
if ($action == 'confirm_deleteproductline' && $confirm == 'yes')
{
- if ($user->rights->fournisseur->commande->creer)
- {
- $object->fetch($id);
- $result = $object->deleteline($_GET['lineid']);
+ if ($user->rights->fournisseur->commande->creer)
+ {
+ $object->fetch($id);
+ $result = $object->deleteline($_GET['lineid']);
- $outputlangs = $langs;
- if (! empty($_REQUEST['lang_id']))
- {
- $outputlangs = new Translate("",$conf);
- $outputlangs->setDefaultLang($_REQUEST['lang_id']);
- }
- supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'));
- }
+ $outputlangs = $langs;
+ if (! empty($_REQUEST['lang_id']))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+ }
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'));
+ }
}
if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->fournisseur->commande->valider)
{
- $object->fetch($id);
+ $object->fetch($id);
- $object->date_commande=dol_now();
- $result = $object->valid($user);
- if ($result >= 0)
- {
- $outputlangs = $langs;
- if (! empty($_REQUEST['lang_id']))
- {
- $outputlangs = new Translate("",$conf);
- $outputlangs->setDefaultLang($_REQUEST['lang_id']);
- }
- supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'));
- }
- else
- {
- $mesg=$object->error;
- }
+ $object->date_commande=dol_now();
+ $result = $object->valid($user);
+ if ($result >= 0)
+ {
+ $outputlangs = $langs;
+ if (! empty($_REQUEST['lang_id']))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+ }
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'));
+ }
+ else
+ {
+ $mesg=$object->error;
+ }
- // If we have permission, we go directly on approved step
- if ($user->rights->fournisseur->commande->approuver)
- {
- $action='confirm_approve';
- }
+ // If we have permission, we go directly on approved step
+ if ($user->rights->fournisseur->commande->approuver)
+ {
+ $action='confirm_approve';
+ }
}
if ($action == 'confirm_approve' && $confirm == 'yes' && $user->rights->fournisseur->commande->approuver)
{
- $object->fetch($id);
- $result = $object->approve($user);
- if ($result > 0)
- {
- Header("Location: fiche.php?id=".$id);
- exit;
- }
- else
- {
- $mesg=$object->error;
- }
+ $object->fetch($id);
+ $result = $object->approve($user);
+ if ($result > 0)
+ {
+ Header("Location: fiche.php?id=".$id);
+ exit;
+ }
+ else
+ {
+ $mesg=$object->error;
+ }
}
if ($action == 'confirm_refuse' && $confirm == 'yes' && $user->rights->fournisseur->commande->approuver)
{
- $object->fetch($id);
- $result = $object->refuse($user);
- if ($result > 0)
- {
- Header("Location: fiche.php?id=".$id);
- exit;
- }
- else
- {
- $mesg=$object->error;
- }
+ $object->fetch($id);
+ $result = $object->refuse($user);
+ if ($result > 0)
+ {
+ Header("Location: fiche.php?id=".$id);
+ exit;
+ }
+ else
+ {
+ $mesg=$object->error;
+ }
}
if ($action == 'confirm_commande' && $confirm == 'yes' && $user->rights->fournisseur->commande->commander)
{
- $object->fetch($id);
- $result = $object->commande($user, $_REQUEST["datecommande"], $_REQUEST["methode"], $_REQUEST['comment']);
- if ($result > 0)
- {
- Header("Location: fiche.php?id=".$id);
- exit;
- }
- else
- {
- $mesg=$object->error;
- }
+ $object->fetch($id);
+ $result = $object->commande($user, $_REQUEST["datecommande"], $_REQUEST["methode"], $_REQUEST['comment']);
+ if ($result > 0)
+ {
+ Header("Location: fiche.php?id=".$id);
+ exit;
+ }
+ else
+ {
+ $mesg=$object->error;
+ }
}
if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->fournisseur->commande->supprimer)
{
- $object->fetch($id);
- $result=$object->delete($user);
- if ($result > 0)
- {
- Header("Location: ".DOL_URL_ROOT.'/fourn/commande/liste.php');
- exit;
- }
- else
- {
- $mesg=$object->error;
- }
+ $object->fetch($id);
+ $result=$object->delete($user);
+ if ($result > 0)
+ {
+ Header("Location: ".DOL_URL_ROOT.'/fourn/commande/liste.php');
+ exit;
+ }
+ else
+ {
+ $mesg=$object->error;
+ }
}
// Receive
if ($action == 'livraison' && $user->rights->fournisseur->commande->receptionner)
{
- $object->fetch($id);
+ $object->fetch($id);
- if ($_POST["type"])
- {
- $date_liv = dol_mktime(0,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]);
+ if ($_POST["type"])
+ {
+ $date_liv = dol_mktime(0,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]);
- $result = $object->Livraison($user, $date_liv, $_POST["type"], $_POST["comment"]);
- if ($result > 0)
- {
- Header("Location: fiche.php?id=".$id);
- exit;
- }
- else if($result == -3)
- {
- $mesg=''.$langs->trans("NotAuthorized").'
';
- }
- else
- {
- dol_print_error($db,$object->error);
- exit;
- }
- }
- else
- {
- $mesg=''.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Delivery")).'
';
- }
+ $result = $object->Livraison($user, $date_liv, $_POST["type"], $_POST["comment"]);
+ if ($result > 0)
+ {
+ Header("Location: fiche.php?id=".$id);
+ exit;
+ }
+ else if($result == -3)
+ {
+ $mesg=''.$langs->trans("NotAuthorized").'
';
+ }
+ else
+ {
+ dol_print_error($db,$object->error);
+ exit;
+ }
+ }
+ else
+ {
+ $mesg=''.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Delivery")).'
';
+ }
}
if ($action == 'confirm_cancel' && $confirm == 'yes' && $user->rights->fournisseur->commande->commander)
{
- $object->fetch($id);
- $result = $object->cancel($user);
- if ($result > 0)
- {
- Header("Location: fiche.php?id=".$id);
- exit;
- }
- else
- {
- $mesg=$object->error;
- }
+ $object->fetch($id);
+ $result = $object->cancel($user);
+ if ($result > 0)
+ {
+ Header("Location: fiche.php?id=".$id);
+ exit;
+ }
+ else
+ {
+ $mesg=$object->error;
+ }
}
// Line ordering
if ($action == 'up' && $user->rights->fournisseur->commande->creer)
{
- $object->fetch($id);
- $object->line_up($_GET['rowid']);
+ $object->fetch($id);
+ $object->line_up($_GET['rowid']);
- $outputlangs = $langs;
- if (! empty($_REQUEST['lang_id']))
- {
- $outputlangs = new Translate("",$conf);
- $outputlangs->setDefaultLang($_REQUEST['lang_id']);
- }
- supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'));
- Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#'.$_GET['rowid']));
- exit;
+ $outputlangs = $langs;
+ if (! empty($_REQUEST['lang_id']))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+ }
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'));
+ Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#'.$_GET['rowid']));
+ exit;
}
if ($action == 'down' && $user->rights->fournisseur->commande->creer)
{
- $object->fetch($id);
- $object->line_down($_GET['rowid']);
+ $object->fetch($id);
+ $object->line_down($_GET['rowid']);
- $outputlangs = $langs;
- if (! empty($_REQUEST['lang_id']))
- {
- $outputlangs = new Translate("",$conf);
- $outputlangs->setDefaultLang($_REQUEST['lang_id']);
- }
- supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'));
- Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#'.$_GET['rowid']));
- exit;
+ $outputlangs = $langs;
+ if (! empty($_REQUEST['lang_id']))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+ }
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'));
+ Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#'.$_GET['rowid']));
+ exit;
}
if ($action == 'builddoc') // En get ou en post
{
- // Build document
+ // Build document
- // Sauvegarde le dernier module choisi pour generer un document
- $object->fetch($_REQUEST['id']);
- if ($_REQUEST['model'])
- {
- $object->setDocModel($user, $_REQUEST['model']);
- }
+ // Sauvegarde le dernier module choisi pour generer un document
+ $object->fetch($_REQUEST['id']);
+ if ($_REQUEST['model'])
+ {
+ $object->setDocModel($user, $_REQUEST['model']);
+ }
- $outputlangs = $langs;
- if (! empty($_REQUEST['lang_id']))
- {
- $outputlangs = new Translate("",$conf);
- $outputlangs->setDefaultLang($_REQUEST['lang_id']);
- }
- $result=supplier_order_pdf_create($db, $object,$object->modelpdf,$outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'));
- if ($result <= 0)
- {
- dol_print_error($db,$result);
- exit;
- }
- else
- {
- Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc'));
- exit;
- }
+ $outputlangs = $langs;
+ if (! empty($_REQUEST['lang_id']))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+ }
+ $result=supplier_order_pdf_create($db, $object,$object->modelpdf,$outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'));
+ if ($result <= 0)
+ {
+ dol_print_error($db,$result);
+ exit;
+ }
+ else
+ {
+ Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc'));
+ exit;
+ }
}
// Delete file in doc form
@@ -525,13 +526,13 @@ if ($action=='remove_file')
{
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
- if ($object->fetch($id))
- {
- $upload_dir = $conf->fournisseur->commande->dir_output . "/";
- $file = $upload_dir . '/' . $_GET['file'];
- dol_delete_file($file);
- $mesg = ''.$langs->trans("FileWasRemoved").'
';
- }
+ if ($object->fetch($id))
+ {
+ $upload_dir = $conf->fournisseur->commande->dir_output . "/";
+ $file = $upload_dir . '/' . $_GET['file'];
+ dol_delete_file($file);
+ $mesg = ''.$langs->trans("FileWasRemoved").'
';
+ }
}
@@ -540,32 +541,32 @@ if ($action=='remove_file')
*/
if ($action == 'create')
{
- $fourn = new Fournisseur($db);
- $result=$fourn->fetch($socid);
+ $fourn = new Fournisseur($db);
+ $result=$fourn->fetch($socid);
- $db->begin();
+ $db->begin();
- $orderid=$fourn->create_commande($user);
+ $orderid=$fourn->create_commande($user);
- if ($orderid > 0)
- {
- $idc = $fourn->single_open_commande;
+ if ($orderid > 0)
+ {
+ $idc = $fourn->single_open_commande;
- if ($comclientid != '')
- {
- $fourn->updateFromCommandeClient($user,$idc,$comclientid);
+ if ($comclientid != '')
+ {
+ $fourn->updateFromCommandeClient($user,$idc,$comclientid);
- }
+ }
- $id=$orderid;
+ $id=$orderid;
- $db->commit();
- }
- else
- {
- $db->rollback();
- $mesg=$fourn->error;
- }
+ $db->commit();
+ }
+ else
+ {
+ $db->rollback();
+ $mesg=$fourn->error;
+ }
}
/*
@@ -573,15 +574,15 @@ if ($action == 'create')
*/
if ($_POST['addfile'])
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
- // Set tmp user directory TODO Use a dedicated directory for temp mails files
- $vardir=$conf->user->dir_output."/".$user->id;
- $upload_dir_tmp = $vardir.'/temp';
+ // Set tmp user directory TODO Use a dedicated directory for temp mails files
+ $vardir=$conf->user->dir_output."/".$user->id;
+ $upload_dir_tmp = $vardir.'/temp';
- $mesg=dol_add_file_process($upload_dir_tmp,0,0);
+ $mesg=dol_add_file_process($upload_dir_tmp,0,0);
- $action='presend';
+ $action='presend';
}
/*
@@ -589,15 +590,15 @@ if ($_POST['addfile'])
*/
if (! empty($_POST['removedfile']))
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
- // Set tmp user directory
- $vardir=$conf->user->dir_output."/".$user->id;
- $upload_dir_tmp = $vardir.'/temp';
+ // Set tmp user directory
+ $vardir=$conf->user->dir_output."/".$user->id;
+ $upload_dir_tmp = $vardir.'/temp';
- $mesg=dol_remove_file_process($_POST['removedfile'],0);
+ $mesg=dol_remove_file_process($_POST['removedfile'],0);
- $action='presend';
+ $action='presend';
}
/*
@@ -605,154 +606,154 @@ if (! empty($_POST['removedfile']))
*/
if ($action == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_POST['cancel'])
{
- $langs->load('mails');
+ $langs->load('mails');
- $result=$object->fetch($_POST['orderid']);
- $result=$object->fetch_thirdparty();
+ $result=$object->fetch($_POST['orderid']);
+ $result=$object->fetch_thirdparty();
- if ($result > 0)
- {
- $ref = dol_sanitizeFileName($object->ref);
- $file = $conf->fournisseur->commande->dir_output . '/' . $ref . '/' . $ref . '.pdf';
+ if ($result > 0)
+ {
+ $ref = dol_sanitizeFileName($object->ref);
+ $file = $conf->fournisseur->commande->dir_output . '/' . $ref . '/' . $ref . '.pdf';
- if (is_readable($file))
- {
- if ($_POST['sendto'])
- {
- // Le destinataire a ete fourni via le champ libre
- $sendto = $_POST['sendto'];
- $sendtoid = 0;
- }
+ if (is_readable($file))
+ {
+ if ($_POST['sendto'])
+ {
+ // Le destinataire a ete fourni via le champ libre
+ $sendto = $_POST['sendto'];
+ $sendtoid = 0;
+ }
elseif ($_POST['receiver'] != '-1')
{
// Recipient was provided from combo list
if ($_POST['receiver'] == 'thirdparty') // Id of third party
- {
- $sendto = $object->client->email;
- $sendtoid = 0;
- }
- else // Id du contact
- {
- $sendto = $object->client->contact_get_property($_POST['receiver'],'email');
- $sendtoid = $_POST['receiver'];
- }
- }
+ {
+ $sendto = $object->client->email;
+ $sendtoid = 0;
+ }
+ else // Id du contact
+ {
+ $sendto = $object->client->contact_get_property($_POST['receiver'],'email');
+ $sendtoid = $_POST['receiver'];
+ }
+ }
- if (dol_strlen($sendto))
- {
- $langs->load("commercial");
+ if (dol_strlen($sendto))
+ {
+ $langs->load("commercial");
- $from = $_POST['fromname'] . ' <' . $_POST['frommail'] .'>';
- $replyto = $_POST['replytoname']. ' <' . $_POST['replytomail'].'>';
- $message = $_POST['message'];
- $sendtocc = $_POST['sendtocc'];
- $deliveryreceipt = $_POST['deliveryreceipt'];
+ $from = $_POST['fromname'] . ' <' . $_POST['frommail'] .'>';
+ $replyto = $_POST['replytoname']. ' <' . $_POST['replytomail'].'>';
+ $message = $_POST['message'];
+ $sendtocc = $_POST['sendtocc'];
+ $deliveryreceipt = $_POST['deliveryreceipt'];
- if ($action == 'send')
- {
- if (dol_strlen($_POST['subject'])) $subject=$_POST['subject'];
- else $subject = $langs->transnoentities('CustomerOrder').' '.$object->ref;
- $actiontypecode='AC_SUP_ORD';
- $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n";
- if ($message)
- {
- $actionmsg.=$langs->transnoentities('MailTopic').": ".$subject."\n";
- $actionmsg.=$langs->transnoentities('TextUsedInTheMessageBody').":\n";
- $actionmsg.=$message;
- }
- $actionmsg2=$langs->transnoentities('Action'.$actiontypecode);
- }
+ if ($action == 'send')
+ {
+ if (dol_strlen($_POST['subject'])) $subject=$_POST['subject'];
+ else $subject = $langs->transnoentities('CustomerOrder').' '.$object->ref;
+ $actiontypecode='AC_SUP_ORD';
+ $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n";
+ if ($message)
+ {
+ $actionmsg.=$langs->transnoentities('MailTopic').": ".$subject."\n";
+ $actionmsg.=$langs->transnoentities('TextUsedInTheMessageBody').":\n";
+ $actionmsg.=$message;
+ }
+ $actionmsg2=$langs->transnoentities('Action'.$actiontypecode);
+ }
- // Create form object
- include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php');
- $formmail = new FormMail($db);
+ // Create form object
+ include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php');
+ $formmail = new FormMail($db);
- $attachedfiles=$formmail->get_attached_files();
- $filepath = $attachedfiles['paths'];
- $filename = $attachedfiles['names'];
- $mimetype = $attachedfiles['mimes'];
+ $attachedfiles=$formmail->get_attached_files();
+ $filepath = $attachedfiles['paths'];
+ $filename = $attachedfiles['names'];
+ $mimetype = $attachedfiles['mimes'];
- // Send mail
- require_once(DOL_DOCUMENT_ROOT.'/lib/CMailFile.class.php');
- $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt);
- if ($mailfile->error)
- {
- $mesg=''.$mailfile->error.'
';
- }
- else
- {
- $result=$mailfile->sendfile();
- if ($result)
- {
- $mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2)); // Must not contain "
+ // Send mail
+ require_once(DOL_DOCUMENT_ROOT.'/lib/CMailFile.class.php');
+ $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt);
+ if ($mailfile->error)
+ {
+ $mesg=''.$mailfile->error.'
';
+ }
+ else
+ {
+ $result=$mailfile->sendfile();
+ if ($result)
+ {
+ $mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2)); // Must not contain "
- $error=0;
+ $error=0;
- // Initialisation donnees
- $object->sendtoid = $sendtoid;
- $object->actiontypecode = $actiontypecode;
- $object->actionmsg = $actionmsg;
- $object->actionmsg2 = $actionmsg2;
- $object->fk_element = $object->id;
- $object->elementtype = $object->element;
+ // Initialisation donnees
+ $object->sendtoid = $sendtoid;
+ $object->actiontypecode = $actiontypecode;
+ $object->actionmsg = $actionmsg;
+ $object->actionmsg2 = $actionmsg2;
+ $object->fk_element = $object->id;
+ $object->elementtype = $object->element;
- // Appel des triggers
- include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
- $interface=new Interfaces($db);
- $result=$interface->run_triggers('ORDER_SUPPLIER_SENTBYMAIL',$object,$user,$langs,$conf);
- if ($result < 0) { $error++; $this->errors=$interface->errors; }
- // Fin appel triggers
+ // Appel des triggers
+ include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
+ $interface=new Interfaces($db);
+ $result=$interface->run_triggers('ORDER_SUPPLIER_SENTBYMAIL',$object,$user,$langs,$conf);
+ if ($result < 0) { $error++; $this->errors=$interface->errors; }
+ // Fin appel triggers
- if ($error)
- {
- dol_print_error($db);
- }
- else
- {
- // Redirect here
- // This avoid sending mail twice if going out and then back to page
- Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&mesg='.urlencode($mesg));
- exit;
- }
- }
- else
- {
- $langs->load("other");
- $mesg='';
- if ($mailfile->error)
- {
- $mesg.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
- $mesg.=' '.$mailfile->error;
- }
- else
- {
- $mesg.='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
- }
- $mesg.='
';
- }
- }
- }
- else
- {
- $langs->load("other");
- $mesg=''.$langs->trans('ErrorMailRecipientIsEmpty').' !
';
- $action='presend';
- dol_syslog('Recipient email is empty');
- }
- }
- else
- {
- $langs->load("other");
- $mesg=''.$langs->trans('ErrorCantReadFile',$file).'
';
- dol_syslog('Failed to read file: '.$file);
- }
- }
- else
- {
- $langs->load("other");
- $mesg=''.$langs->trans('ErrorFailedToReadEntity',$langs->trans("Invoice")).'
';
- dol_syslog('Impossible de lire les donnees de la facture. Le fichier facture n\'a peut-etre pas ete genere.');
- }
+ if ($error)
+ {
+ dol_print_error($db);
+ }
+ else
+ {
+ // Redirect here
+ // This avoid sending mail twice if going out and then back to page
+ Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&mesg='.urlencode($mesg));
+ exit;
+ }
+ }
+ else
+ {
+ $langs->load("other");
+ $mesg='';
+ if ($mailfile->error)
+ {
+ $mesg.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
+ $mesg.=' '.$mailfile->error;
+ }
+ else
+ {
+ $mesg.='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
+ }
+ $mesg.='
';
+ }
+ }
+ }
+ else
+ {
+ $langs->load("other");
+ $mesg=''.$langs->trans('ErrorMailRecipientIsEmpty').' !
';
+ $action='presend';
+ dol_syslog('Recipient email is empty');
+ }
+ }
+ else
+ {
+ $langs->load("other");
+ $mesg=''.$langs->trans('ErrorCantReadFile',$file).'
';
+ dol_syslog('Failed to read file: '.$file);
+ }
+ }
+ else
+ {
+ $langs->load("other");
+ $mesg=''.$langs->trans('ErrorFailedToReadEntity',$langs->trans("Invoice")).'
';
+ dol_syslog('Impossible de lire les donnees de la facture. Le fichier facture n\'a peut-etre pas ete genere.');
+ }
}
@@ -778,185 +779,184 @@ $now=dol_now();
if ($id > 0 || ! empty($ref))
{
- //if ($mesg) print $mesg.' ';
+ //if ($mesg) print $mesg.' ';
- $result=$object->fetch($id,$ref);
- if ($result >= 0)
- {
- $soc = new Societe($db);
- $soc->fetch($object->socid);
+ $result=$object->fetch($id,$ref);
+ if ($result >= 0)
+ {
+ $soc = new Societe($db);
+ $soc->fetch($object->socid);
- $author = new User($db);
- $author->fetch($object->user_author_id);
+ $author = new User($db);
+ $author->fetch($object->user_author_id);
- $head = ordersupplier_prepare_head($object);
+ $head = ordersupplier_prepare_head($object);
- $title=$langs->trans("SupplierOrder");
- dol_fiche_head($head, 'card', $title, 0, 'order');
+ $title=$langs->trans("SupplierOrder");
+ dol_fiche_head($head, 'card', $title, 0, 'order');
- /*
- * Confirmation de la suppression de la commande
- */
- if ($action == 'delete')
- {
- $ret=$html->form_confirm($_SERVER["PHP_SELF"].'?id='.$id, $langs->trans('DeleteOrder'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 2);
- if ($ret == 'html') print ' ';
- }
+ /*
+ * Confirmation de la suppression de la commande
+ */
+ if ($action == 'delete')
+ {
+ $ret=$html->form_confirm($_SERVER["PHP_SELF"].'?id='.$id, $langs->trans('DeleteOrder'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 2);
+ if ($ret == 'html') print ' ';
+ }
- /*
- * Confirmation de la validation
- */
- if ($action == 'valid')
- {
- $object->date_commande=gmmktime();
+ /*
+ * Confirmation de la validation
+ */
+ if ($action == 'valid')
+ {
+ $object->date_commande=gmmktime();
- // We check if number is temporary number
- if (preg_match('/^[\(]?PROV/i',$object->ref)) $newref = $object->getNextNumRef($soc);
- else $newref = $object->ref;
+ // We check if number is temporary number
+ if (preg_match('/^[\(]?PROV/i',$object->ref)) $newref = $object->getNextNumRef($soc);
+ else $newref = $object->ref;
- $text=$langs->trans('ConfirmValidateOrder',$newref);
- if ($conf->notification->enabled)
- {
- require_once(DOL_DOCUMENT_ROOT ."/core/class/notify.class.php");
- $notify=new Notify($db);
- $text.=' ';
- $text.=$notify->confirmMessage(3,$object->socid);
- }
+ $text=$langs->trans('ConfirmValidateOrder',$newref);
+ if ($conf->notification->enabled)
+ {
+ require_once(DOL_DOCUMENT_ROOT ."/core/class/notify.class.php");
+ $notify=new Notify($db);
+ $text.=' ';
+ $text.=$notify->confirmMessage(3,$object->socid);
+ }
- $ret=$html->form_confirm($_SERVER["PHP_SELF"].'?id='.$id, $langs->trans('ValidateOrder'), $text, 'confirm_valid', '', 0, 1);
- if ($ret == 'html') print ' ';
- }
- /*
- * Confirmation de l'approbation
- */
- if ($action == 'approve')
- {
- $ret=$html->form_confirm("fiche.php?id=$object->id",$langs->trans("ApproveThisOrder"),$langs->trans("ConfirmApproveThisOrder",$object->ref),"confirm_approve", '', 1, 1);
- if ($ret == 'html') print ' ';
- }
- /*
- * Confirmation de la desapprobation
- */
- if ($action == 'refuse')
- {
- $ret=$html->form_confirm("fiche.php?id=$object->id",$langs->trans("DenyingThisOrder"),$langs->trans("ConfirmDenyingThisOrder",$object->ref),"confirm_refuse", '', 0, 1);
- if ($ret == 'html') print ' ';
- }
- /*
- * Confirmation de l'annulation
- */
- if ($action == 'cancel')
- {
- $ret=$html->form_confirm("fiche.php?id=$object->id",$langs->trans("Cancel"),$langs->trans("ConfirmCancelThisOrder",$object->ref),"confirm_cancel", '', 0, 1);
- if ($ret == 'html') print ' ';
- }
+ $ret=$html->form_confirm($_SERVER["PHP_SELF"].'?id='.$id, $langs->trans('ValidateOrder'), $text, 'confirm_valid', '', 0, 1);
+ if ($ret == 'html') print ' ';
+ }
+ /*
+ * Confirmation de l'approbation
+ */
+ if ($action == 'approve')
+ {
+ $ret=$html->form_confirm("fiche.php?id=$object->id",$langs->trans("ApproveThisOrder"),$langs->trans("ConfirmApproveThisOrder",$object->ref),"confirm_approve", '', 1, 1);
+ if ($ret == 'html') print ' ';
+ }
+ /*
+ * Confirmation de la desapprobation
+ */
+ if ($action == 'refuse')
+ {
+ $ret=$html->form_confirm("fiche.php?id=$object->id",$langs->trans("DenyingThisOrder"),$langs->trans("ConfirmDenyingThisOrder",$object->ref),"confirm_refuse", '', 0, 1);
+ if ($ret == 'html') print ' ';
+ }
+ /*
+ * Confirmation de l'annulation
+ */
+ if ($action == 'cancel')
+ {
+ $ret=$html->form_confirm("fiche.php?id=$object->id",$langs->trans("Cancel"),$langs->trans("ConfirmCancelThisOrder",$object->ref),"confirm_cancel", '', 0, 1);
+ if ($ret == 'html') print ' ';
+ }
- /*
- * Confirmation de l'envoi de la commande
- */
- if ($action == 'commande')
- {
- $date_com = dol_mktime(0,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]);
- $ret=$html->form_confirm("fiche.php?id=".$object->id."&datecommande=".$date_com."&methode=".$_POST["methodecommande"]."&comment=".urlencode($_POST["comment"]),
- $langs->trans("MakeOrder"),$langs->trans("ConfirmMakeOrder",dol_print_date($date_com,'day')),"confirm_commande",'',0,2);
- if ($ret == 'html') print ' ';
- }
+ /*
+ * Confirmation de l'envoi de la commande
+ */
+ if ($action == 'commande')
+ {
+ $date_com = dol_mktime(0,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]);
+ $ret=$html->form_confirm("fiche.php?id=".$object->id."&datecommande=".$date_com."&methode=".$_POST["methodecommande"]."&comment=".urlencode($_POST["comment"]), $langs->trans("MakeOrder"),$langs->trans("ConfirmMakeOrder",dol_print_date($date_com,'day')),"confirm_commande",'',0,2);
+ if ($ret == 'html') print ' ';
+ }
- /*
- * Confirmation de la suppression d'une ligne produit
- */
- if ($action == 'delete_product_line')
- {
- $ret=$html->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$_GET["lineid"], $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteproductline','',0,2);
- if ($ret == 'html') print ' ';
- }
+ /*
+ * Confirmation de la suppression d'une ligne produit
+ */
+ if ($action == 'delete_product_line')
+ {
+ $ret=$html->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$_GET["lineid"], $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteproductline','',0,2);
+ if ($ret == 'html') print ' ';
+ }
- /*
- * Commande
- */
- $nbrow=8;
- if ($conf->projet->enabled) $nbrow++;
+ /*
+ * Commande
+ */
+ $nbrow=8;
+ if ($conf->projet->enabled) $nbrow++;
- //Local taxes
- if ($mysoc->pays_code=='ES')
- {
- if($mysoc->localtax1_assuj=="1") $nbrow++;
- if($mysoc->localtax2_assuj=="1") $nbrow++;
- }
+ //Local taxes
+ if ($mysoc->pays_code=='ES')
+ {
+ if($mysoc->localtax1_assuj=="1") $nbrow++;
+ if($mysoc->localtax2_assuj=="1") $nbrow++;
+ }
- print '';
+ print '';
- // Ref
- print ''.$langs->trans("Ref").' ';
- print '';
- print $html->showrefnav($object,'ref','',1,'ref','ref');
- print ' ';
- print ' ';
+ // Ref
+ print ''.$langs->trans("Ref").' ';
+ print '';
+ print $html->showrefnav($object,'ref','',1,'ref','ref');
+ print ' ';
+ print ' ';
- // Ref supplier
-/* print ''.$langs->trans("RefSupplier")." ";
- print ''.$object->ref_supplier.' ';
- print ' ';
-*/
- // Fournisseur
- print ''.$langs->trans("Supplier")." ";
- print ''.$soc->getNomUrl(1,'supplier').' ';
- print ' ';
+ // Ref supplier
+ /* print ''.$langs->trans("RefSupplier")." ";
+ print ''.$object->ref_supplier.' ';
+ print ' ';
+ */
+ // Fournisseur
+ print ''.$langs->trans("Supplier")." ";
+ print ''.$soc->getNomUrl(1,'supplier').' ';
+ print ' ';
- // Statut
- print '';
- print ''.$langs->trans("Status").' ';
- print '';
- print $object->getLibStatut(4);
- print " ";
+ // Statut
+ print '';
+ print ''.$langs->trans("Status").' ';
+ print '';
+ print $object->getLibStatut(4);
+ print " ";
- // Date
- if ($object->methode_commande_id > 0)
- {
- print ''.$langs->trans("Date").' ';
- if ($object->date_commande)
- {
- print dol_print_date($object->date_commande,"dayhourtext")."\n";
- }
- print " ";
+ // Date
+ if ($object->methode_commande_id > 0)
+ {
+ print ''.$langs->trans("Date").' ';
+ if ($object->date_commande)
+ {
+ print dol_print_date($object->date_commande,"dayhourtext")."\n";
+ }
+ print " ";
- if ($object->methode_commande)
- {
- print ''.$langs->trans("Method").' '.$object->methode_commande.' ';
- }
- }
+ if ($object->methode_commande)
+ {
+ print ''.$langs->trans("Method").' '.$object->methode_commande.' ';
+ }
+ }
- // Author
- print ''.$langs->trans("AuthorRequest").' ';
- print ''.$author->getNomUrl(1).' ';
- print ' ';
+ // Author
+ print ''.$langs->trans("AuthorRequest").' ';
+ print ''.$author->getNomUrl(1).' ';
+ print ' ';
- // Conditions de reglement par defaut
- $langs->load('bills');
- $html = new Form($db);
- print '';
- print '';
- print ' ';
- if ($action == 'editconditions')
- {
- $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id,'cond_reglement_id');
- }
- else
- {
- $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id,'none');
- }
- print " ";
- print ' ';
-
- // Mode of payment
+ // Conditions de reglement par defaut
$langs->load('bills');
- $html = new Form($db);
- print '';
- print '';
+ $html = new Form($db);
+ print ' ';
+ print '';
+ print ' ';
+ if ($action == 'editconditions')
+ {
+ $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id,'cond_reglement_id');
+ }
+ else
+ {
+ $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id,'none');
+ }
+ print " ";
+ print ' ';
+
+ // Mode of payment
+ $langs->load('bills');
+ $html = new Form($db);
+ print '';
+ print '';
print $langs->trans('PaymentMode');
print ' ';
if ($action != 'editmode') print 'id.'">'.img_edit($langs->trans('SetMode'),1).' ';
@@ -972,393 +972,393 @@ if ($id > 0 || ! empty($ref))
}
print ' ';
- // Project
- if ($conf->projet->enabled)
- {
- $langs->load('projects');
- print '';
- print '';
- print ' ';
- //print "$object->id, $object->socid, $object->fk_project";
- if ($action == 'classify')
- {
- $html->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS)?$object->socid:'-1', $object->fk_project, 'projectid');
- }
- else
- {
- $html->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none');
- }
- print ' ';
- print ' ';
- }
+ // Project
+ if ($conf->projet->enabled)
+ {
+ $langs->load('projects');
+ print '';
+ print '';
+ print ' ';
+ //print "$object->id, $object->socid, $object->fk_project";
+ if ($action == 'classify')
+ {
+ $html->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS)?$object->socid:'-1', $object->fk_project, 'projectid');
+ }
+ else
+ {
+ $html->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none');
+ }
+ print ' ';
+ print ' ';
+ }
- // Ligne de 3 colonnes
- print ''.$langs->trans("AmountHT").' ';
- print ''.price($object->total_ht).' ';
- print ''.$langs->trans("Currency".$conf->monnaie).' ';
+ // Ligne de 3 colonnes
+ print ''.$langs->trans("AmountHT").' ';
+ print ''.price($object->total_ht).' ';
+ print ''.$langs->trans("Currency".$conf->monnaie).' ';
- print ''.$langs->trans("AmountVAT").' '.price($object->total_tva).' ';
- print ''.$langs->trans("Currency".$conf->monnaie).' ';
+ print ''.$langs->trans("AmountVAT").' '.price($object->total_tva).' ';
+ print ''.$langs->trans("Currency".$conf->monnaie).' ';
- // Amount Local Taxes
- if ($mysoc->pays_code=='ES')
- {
- if ($mysoc->localtax1_assuj=="1") //Localtax1 RE
- {
- print ''.$langs->transcountry("AmountLT1",$mysoc->pays_code).' ';
- print ''.price($object->total_localtax1).' ';
- print ''.$langs->trans("Currency".$conf->monnaie).' ';
- }
- if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF
- {
- print ''.$langs->transcountry("AmountLT2",$mysoc->pays_code).' ';
- print ''.price($object->total_localtax2).' ';
- print ''.$langs->trans("Currency".$conf->monnaie).' ';
- }
- }
- print ''.$langs->trans("AmountTTC").' '.price($object->total_ttc).' ';
- print ''.$langs->trans("Currency".$conf->monnaie).' ';
+ // Amount Local Taxes
+ if ($mysoc->pays_code=='ES')
+ {
+ if ($mysoc->localtax1_assuj=="1") //Localtax1 RE
+ {
+ print ''.$langs->transcountry("AmountLT1",$mysoc->pays_code).' ';
+ print ''.price($object->total_localtax1).' ';
+ print ''.$langs->trans("Currency".$conf->monnaie).' ';
+ }
+ if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF
+ {
+ print ''.$langs->transcountry("AmountLT2",$mysoc->pays_code).' ';
+ print ''.price($object->total_localtax2).' ';
+ print ''.$langs->trans("Currency".$conf->monnaie).' ';
+ }
+ }
+ print ''.$langs->trans("AmountTTC").' '.price($object->total_ttc).' ';
+ print ''.$langs->trans("Currency".$conf->monnaie).' ';
- print "
";
+ print "
";
- if ($mesg) print $mesg;
- else print ' ';
+ if ($mesg) print $mesg;
+ else print ' ';
- /*
- * Lines
- */
- print '';
+ /*
+ * Lines
+ */
+ print '';
- $num = count($object->lines);
- $i = 0; $total = 0;
+ $num = count($object->lines);
+ $i = 0; $total = 0;
- if ($num)
- {
- print '';
- print ''.$langs->trans('Label').' ';
- 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)
- {
- $line = $object->lines[$i];
- $var=!$var;
+ if ($num)
+ {
+ print '';
+ print ''.$langs->trans('Label').' ';
+ 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)
+ {
+ $line = $object->lines[$i];
+ $var=!$var;
- // Show product and description
- $type=$line->product_type?$line->product_type:$line->fk_product_type;
- // Try to enhance type detection using date_start and date_end for free lines where type
- // was not saved.
- if (! empty($line->date_start)) $type=1;
- if (! empty($line->date_end)) $type=1;
+ // Show product and description
+ $type=$line->product_type?$line->product_type:$line->fk_product_type;
+ // Try to enhance type detection using date_start and date_end for free lines where type
+ // was not saved.
+ if (! empty($line->date_start)) $type=1;
+ if (! empty($line->date_end)) $type=1;
- // Ligne en mode visu
- if ($action != 'editline' || $_GET['rowid'] != $line->id)
- {
- print '';
+ // Ligne en mode visu
+ if ($action != 'editline' || $_GET['rowid'] != $line->id)
+ {
+ print ' ';
- // Show product and description
- print '';
- if ($line->fk_product > 0)
- {
- print ' '; // ancre pour retourner sur la ligne
+ // Show product and description
+ print ' ';
+ if ($line->fk_product > 0)
+ {
+ print ' '; // ancre pour retourner sur la ligne
- $product_static=new ProductFournisseur($db);
- $product_static->fetch($line->fk_product);
- $text=$product_static->getNomUrl(1,'supplier');
- $text.= ' - '.$product_static->libelle;
- $description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($line->description));
- print $html->textwithtooltip($text,$description,3,'','',$i);
+ $product_static=new ProductFournisseur($db);
+ $product_static->fetch($line->fk_product);
+ $text=$product_static->getNomUrl(1,'supplier');
+ $text.= ' - '.$product_static->libelle;
+ $description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($line->description));
+ print $html->textwithtooltip($text,$description,3,'','',$i);
- // Show range
- print_date_range($line->date_start,$line->date_end);
+ // Show range
+ print_date_range($line->date_start,$line->date_end);
- // Add description in form
- if ($conf->global->PRODUIT_DESC_IN_FORM) print ($line->description && $line->description!=$product_static->libelle)?' '.dol_htmlentitiesbr($line->description):'';
- }
+ // Add description in form
+ if ($conf->global->PRODUIT_DESC_IN_FORM) print ($line->description && $line->description!=$product_static->libelle)?' '.dol_htmlentitiesbr($line->description):'';
+ }
- // Description - Editor wysiwyg
- if (! $line->fk_product)
- {
- if ($type==1) $text = img_object($langs->trans('Service'),'service');
- else $text = img_object($langs->trans('Product'),'product');
- print $text.' '.nl2br($line->description);
+ // Description - Editor wysiwyg
+ if (! $line->fk_product)
+ {
+ if ($type==1) $text = img_object($langs->trans('Service'),'service');
+ else $text = img_object($langs->trans('Product'),'product');
+ print $text.' '.nl2br($line->description);
- // Show range
- print_date_range($line->date_start,$line->date_end);
- }
+ // Show range
+ print_date_range($line->date_start,$line->date_end);
+ }
- print ' ';
+ print '';
- print ''.vatrate($line->tva_tx).'% ';
+ print ''.vatrate($line->tva_tx).'% ';
- print ''.price($line->subprice)." \n";
+ print ''.price($line->subprice)." \n";
- print ''.$line->qty.' ';
+ print ''.$line->qty.' ';
- if ($line->remise_percent > 0)
- {
- print ''.dol_print_reduction($line->remise_percent,$langs)." \n";
- }
- else
- {
- print ' ';
- }
+ if ($line->remise_percent > 0)
+ {
+ print ''.dol_print_reduction($line->remise_percent,$langs)." \n";
+ }
+ else
+ {
+ print ' ';
+ }
- print ''.price($line->total_ht).' ';
- if ($object->statut == 0 && $user->rights->fournisseur->commande->creer)
- {
- print 'id.'&action=editline&rowid='.$line->id.'#'.$line->id.'">';
- print img_edit();
- print ' ';
+ print ''.price($line->total_ht).' ';
+ if ($object->statut == 0 && $user->rights->fournisseur->commande->creer)
+ {
+ print 'id.'&action=editline&rowid='.$line->id.'#'.$line->id.'">';
+ print img_edit();
+ print ' ';
- $actiondelete='delete_product_line';
- print 'id.'&action='.$actiondelete.'&lineid='.$line->id.'">';
- print img_delete();
- print ' ';
- }
- else
- {
- print ' ';
- }
- print " ";
- }
+ $actiondelete='delete_product_line';
+ print 'id.'&action='.$actiondelete.'&lineid='.$line->id.'">';
+ print img_delete();
+ print ' ';
+ }
+ else
+ {
+ print ' ';
+ }
+ print "";
+ }
- // Ligne en mode update
- if ($action == 'editline' && $user->rights->fournisseur->commande->creer && ($_GET["rowid"] == $line->id))
- {
- print "\n";
- print '\n";
+ }
+ $i++;
+ }
- /*
- * Form to add new line
- */
- if ($object->statut == 0 && $user->rights->fournisseur->commande->creer && $action <> 'editline')
- {
- print '';
- print '';
- print ' '; // ancre
- print $langs->trans('AddNewLine').' - '.$langs->trans("FreeZone").' ';
- print ''.$langs->trans('VAT').' ';
- print ''.$langs->trans('PriceUHT').' ';
- print ''.$langs->trans('Qty').' ';
- print ''.$langs->trans('ReductionShort').' ';
- print ' ';
- print ' ';
+ /*
+ * Form to add new line
+ */
+ if ($object->statut == 0 && $user->rights->fournisseur->commande->creer && $action <> 'editline')
+ {
+ print '';
+ print '';
+ print ' '; // ancre
+ print $langs->trans('AddNewLine').' - '.$langs->trans("FreeZone").' ';
+ print ''.$langs->trans('VAT').' ';
+ print ''.$langs->trans('PriceUHT').' ';
+ print ''.$langs->trans('Qty').' ';
+ print ''.$langs->trans('ReductionShort').' ';
+ print ' ';
+ print ' ';
- // Add free products/services form
- print 'id.'#add" method="post">';
- print ' ';
- print ' ';
- print ' ';
+ // Add free products/services form
+ print ' id.'#add" method="post">';
+ print ' ';
+ print ' ';
+ print ' ';
- $var=true;
- print '';
- print '';
+ $var=true;
+ print ' ';
+ print '';
- $forceall=1;
- print $html->select_type_of_lines(isset($_POST["type"])?$_POST["type"]:-1,'type',1,0,$forceall);
- if ($forceall || ($conf->product->enabled && $conf->service->enabled)
- || (empty($conf->product->enabled) && empty($conf->service->enabled))) print ' ';
+ $forceall=1;
+ print $html->select_type_of_lines(isset($_POST["type"])?$_POST["type"]:-1,'type',1,0,$forceall);
+ if ($forceall || ($conf->product->enabled && $conf->service->enabled)
+ || (empty($conf->product->enabled) && empty($conf->service->enabled))) print ' ';
- // Editor wysiwyg
- require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
+ // Editor wysiwyg
+ require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
$nbrows=ROWS_2;
if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
- $doleditor=new DolEditor('dp_desc',$_POST["dp_desc"],'',100,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70);
- $doleditor->Create();
+ $doleditor=new DolEditor('dp_desc',$_POST["dp_desc"],'',100,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70);
+ $doleditor->Create();
- print ' ';
- print '';
- print $html->load_tva('tva_tx',($_POST["tva_tx"]?$_POST["tva_tx"]:-1),$soc,$mysoc);
- print ' ';
- print ' ';
- print ' ';
- print ' remise_client).'">% ';
- print ' ';
- print ' ';
+ print '';
+ print '';
+ print $html->load_tva('tva_tx',($_POST["tva_tx"]?$_POST["tva_tx"]:-1),$soc,$mysoc);
+ print ' ';
+ print ' ';
+ print ' ';
+ print ' remise_client).'">% ';
+ print ' ';
+ print '';
- print ' ';
+ print '';
- // Ajout de produits/services predefinis
- if ($conf->product->enabled || $conf->service->enabled)
- {
- print '';
- print '';
- print $langs->trans("AddNewLine").' - ';
- if ($conf->service->enabled)
- {
- print $langs->trans('RecordedProductsAndServices');
- }
- else
- {
- print $langs->trans('RecordedProducts');
- }
- print ' ';
- print ''.$langs->trans('Qty').' ';
- print ''.$langs->trans('ReductionShort').' ';
- print ' ';
- print ' ';
+ // Ajout de produits/services predefinis
+ if ($conf->product->enabled || $conf->service->enabled)
+ {
+ print '';
+ print '';
+ print $langs->trans("AddNewLine").' - ';
+ if ($conf->service->enabled)
+ {
+ print $langs->trans('RecordedProductsAndServices');
+ }
+ else
+ {
+ print $langs->trans('RecordedProducts');
+ }
+ print ' ';
+ print ''.$langs->trans('Qty').' ';
+ print ''.$langs->trans('ReductionShort').' ';
+ print ' ';
+ print ' ';
- print 'id.'#add" method="post">';
- print ' ';
- print ' ';
- print ' ';
+ print ' id.'#add" method="post">';
+ print ' ';
+ print ' ';
+ print ' ';
- $var=!$var;
- print '';
- print '';
- $html->select_produits_fournisseurs($object->fourn_id,'','idprodfournprice','',$filtre);
+ $var=!$var;
+ print ' ';
+ print '';
+ $html->select_produits_fournisseurs($object->fourn_id,'','idprodfournprice','',$filtre);
- if (! $conf->global->PRODUIT_USE_SEARCH_TO_SELECT) print ' ';
+ if (! $conf->global->PRODUIT_USE_SEARCH_TO_SELECT) print ' ';
- // Editor wysiwyg
- require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
+ // Editor wysiwyg
+ require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
$nbrows=ROWS_2;
if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
- $doleditor=new DolEditor('np_desc',$_POST["np_desc"],'',100,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70);
- $doleditor->Create();
+ $doleditor=new DolEditor('np_desc',$_POST["np_desc"],'',100,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70);
+ $doleditor->Create();
- print ' ';
- print ' ';
- print ' remise_client).'">% ';
- print ' ';
- print ' ';
+ print '';
+ print ' ';
+ print ' remise_client).'">% ';
+ print ' ';
+ print '';
- print ' ';
- }
- }
- print '
';
- print '';
+ print '';
+ }
+ }
+ print '
';
+ print '';
- if ($action != 'presend')
- {
+ if ($action != 'presend')
+ {
- /**
- * Boutons actions
- */
- if ($user->societe_id == 0 && $action != 'editline' && $action != 'delete')
- {
- print '';
+ /**
+ * Boutons actions
+ */
+ if ($user->societe_id == 0 && $action != 'editline' && $action != 'delete')
+ {
+ print '
';
- // Validate
- if ($object->statut == 0 && $num > 0)
- {
- if ($user->rights->fournisseur->commande->valider)
- {
- print '
id.'&action=valid"';
- print '>'.$langs->trans('Validate').' ';
- }
- }
+ // Validate
+ if ($object->statut == 0 && $num > 0)
+ {
+ if ($user->rights->fournisseur->commande->valider)
+ {
+ print '
id.'&action=valid"';
+ print '>'.$langs->trans('Validate').' ';
+ }
+ }
- // Approve
- if ($object->statut == 1)
- {
- if ($user->rights->fournisseur->commande->approuver)
- {
- print '
'.$langs->trans("ApproveOrder").' ';
- print '
'.$langs->trans("RefuseOrder").' ';
- }
- else
- {
+ // Approve
+ if ($object->statut == 1)
+ {
+ if ($user->rights->fournisseur->commande->approuver)
+ {
+ print '
'.$langs->trans("ApproveOrder").' ';
+ print '
'.$langs->trans("RefuseOrder").' ';
+ }
+ else
+ {
print '
'.$langs->trans("ApproveOrder").' ';
print '
'.$langs->trans("RefuseOrder").' ';
- }
- }
+ }
+ }
- // Send
- if (in_array($object->statut,array(2,3,4,5)))
- {
- if ($user->rights->fournisseur->commande->commander)
- {
- $comref = dol_sanitizeFileName($object->ref);
- $file = $conf->fournisseur->commande->dir_output . '/'.$comref.'/'.$comref.'.pdf';
- if (file_exists($file))
- {
- print '
id.'&action=presend&mode=init">'.$langs->trans('SendByMail').' ';
- }
- }
- }
+ // Send
+ if (in_array($object->statut,array(2,3,4,5)))
+ {
+ if ($user->rights->fournisseur->commande->commander)
+ {
+ $comref = dol_sanitizeFileName($object->ref);
+ $file = $conf->fournisseur->commande->dir_output . '/'.$comref.'/'.$comref.'.pdf';
+ if (file_exists($file))
+ {
+ print '
id.'&action=presend&mode=init">'.$langs->trans('SendByMail').' ';
+ }
+ }
+ }
- // Reopen
- if ($object->statut == 5 || $object->statut == 6 || $object->statut == 7 || $object->statut == 9)
- {
- if ($user->rights->fournisseur->commande->commander)
- {
- print '
'.$langs->trans("ReOpen").' ';
- }
- }
+ // Reopen
+ if ($object->statut == 5 || $object->statut == 6 || $object->statut == 7 || $object->statut == 9)
+ {
+ if ($user->rights->fournisseur->commande->commander)
+ {
+ print '
'.$langs->trans("ReOpen").' ';
+ }
+ }
- // Create bill
- if ($conf->fournisseur->enabled && $object->statut >= 2) // 2 means accepted
- {
- if ($user->rights->fournisseur->facture->creer)
- {
- print '
'.$langs->trans("CreateBill").' ';
- }
+ // Create bill
+ if ($conf->fournisseur->enabled && $object->statut >= 2) // 2 means accepted
+ {
+ if ($user->rights->fournisseur->facture->creer)
+ {
+ print '
'.$langs->trans("CreateBill").' ';
+ }
- //if ($user->rights->fournisseur->commande->creer && $object->statut > 2)
- //{
- // print '
id.'&action=classifybilled">'.$langs->trans("ClassifyBilled").' ';
- //}
- }
+ //if ($user->rights->fournisseur->commande->creer && $object->statut > 2)
+ //{
+ // print '
id.'&action=classifybilled">'.$langs->trans("ClassifyBilled").' ';
+ //}
+ }
// Cancel
if ($object->statut == 2)
@@ -1369,34 +1369,34 @@ if ($id > 0 || ! empty($ref))
}
}
- // Delete
- if ($user->rights->fournisseur->commande->supprimer)
- {
- print '
'.$langs->trans("Delete").' ';
- }
+ // Delete
+ if ($user->rights->fournisseur->commande->supprimer)
+ {
+ print '
'.$langs->trans("Delete").' ';
+ }
- print "
";
- }
+ print "
";
+ }
- print '';
- print ' '; // ancre
+ print '';
+ print ' '; // ancre
- /*
- * Documents generes
- */
- $comfournref = dol_sanitizeFileName($object->ref);
- $file = $conf->fournisseur->dir_output . '/commande/' . $comfournref . '/' . $comfournref . '.pdf';
- $relativepath = $comfournref.'/'.$comfournref.'.pdf';
- $filedir = $conf->fournisseur->dir_output . '/commande/' . $comfournref;
- $urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
- $genallowed=$user->rights->fournisseur->commande->creer;
- $delallowed=$user->rights->fournisseur->commande->supprimer;
+ /*
+ * Documents generes
+ */
+ $comfournref = dol_sanitizeFileName($object->ref);
+ $file = $conf->fournisseur->dir_output . '/commande/' . $comfournref . '/' . $comfournref . '.pdf';
+ $relativepath = $comfournref.'/'.$comfournref.'.pdf';
+ $filedir = $conf->fournisseur->dir_output . '/commande/' . $comfournref;
+ $urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
+ $genallowed=$user->rights->fournisseur->commande->creer;
+ $delallowed=$user->rights->fournisseur->commande->supprimer;
- $somethingshown=$formfile->show_documents('commande_fournisseur',$comfournref,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf);
+ $somethingshown=$formfile->show_documents('commande_fournisseur',$comfournref,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf);
- $object=$object;
+ $object=$object;
/*
* Linked object block
@@ -1404,139 +1404,139 @@ if ($id > 0 || ! empty($ref))
$somethingshown=$object->showLinkedObjectBlock();
- print ' ';
+ print ' ';
- if ( $user->rights->fournisseur->commande->commander && $object->statut == 2)
- {
- /**
- * Commander (action=commande)
- */
- print ' ';
- print '';
- print ' ';
- print ' ';
- print '';
- print ''.$langs->trans("ToOrder").' ';
- print ''.$langs->trans("OrderDate").' ';
- $date_com = dol_mktime(0,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]);
- print $html->select_date($date_com,'','','','',"commande");
- print ' ';
+ if ( $user->rights->fournisseur->commande->commander && $object->statut == 2)
+ {
+ /**
+ * Commander (action=commande)
+ */
+ print ' ';
+ print '';
+ print ' ';
+ print ' ';
+ print '';
+ print ''.$langs->trans("ToOrder").' ';
+ print ''.$langs->trans("OrderDate").' ';
+ $date_com = dol_mktime(0,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]);
+ print $html->select_date($date_com,'','','','',"commande");
+ print ' ';
- print ''.$langs->trans("OrderMode").' ';
- $formorder->select_methodes_commande($_POST["methodecommande"],"methodecommande",1);
- print ' ';
+ print ''.$langs->trans("OrderMode").' ';
+ $formorder->select_methodes_commande($_POST["methodecommande"],"methodecommande",1);
+ print ' ';
- print ''.$langs->trans("Comment").' ';
- print ' ';
- print '
';
- print ' ';
- }
+ print ''.$langs->trans("Comment").' ';
+ print ' ';
+ print '
';
+ print ' ';
+ }
- if ( $user->rights->fournisseur->commande->receptionner && ($object->statut == 3 || $object->statut == 4 ))
- {
- /**
- * Receptionner (action=livraison)
- */
- print ' ';
- print '';
- print ' ';
- print ' ';
- print '\n";
+ print " \n";
+ }
- // List of actions on element
- /* Hidden because" available into "Log" tab
- print ' ';
- include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php');
- $formactions=new FormActions($db);
- $somethingshown=$formactions->showactions($object,'order_supplier',$socid);
+ // List of actions on element
+ /* Hidden because" available into "Log" tab
+ print ' ';
+ include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php');
+ $formactions=new FormActions($db);
+ $somethingshown=$formactions->showactions($object,'order_supplier',$socid);
*/
- print '
';
- }
+ print '
';
+ }
- /*
- * Action presend
- *
- */
- if ($action == 'presend')
- {
- $ref = dol_sanitizeFileName($object->ref);
- $file = $conf->fournisseur->commande->dir_output . '/' . $ref . '/' . $ref . '.pdf';
+ /*
+ * Action presend
+ *
+ */
+ if ($action == 'presend')
+ {
+ $ref = dol_sanitizeFileName($object->ref);
+ $file = $conf->fournisseur->commande->dir_output . '/' . $ref . '/' . $ref . '.pdf';
- print ' ';
- print_titre($langs->trans('SendOrderByMail'));
+ print ' ';
+ print_titre($langs->trans('SendOrderByMail'));
- // Cree l'objet formulaire mail
- include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php');
- $formmail = new FormMail($db);
- $formmail->fromtype = 'user';
- $formmail->fromid = $user->id;
- $formmail->fromname = $user->getFullName($langs);
- $formmail->frommail = $user->email;
- $formmail->withfrom=1;
- $formmail->withto=empty($_POST["sendto"])?1:$_POST["sendto"];
- $formmail->withtosocid=$soc->id;
- $formmail->withtocc=1;
- $formmail->withtoccsocid=0;
- $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
- $formmail->withtocccsocid=0;
- $formmail->withtopic=$langs->trans('SendOrderRef','__ORDERREF__');
- $formmail->withfile=2;
- $formmail->withbody=1;
- $formmail->withdeliveryreceipt=1;
- $formmail->withcancel=1;
- // Tableau des substitutions
- $formmail->substit['__ORDERREF__']=$object->ref;
- // Tableau des parametres complementaires
- $formmail->param['action']='send';
- $formmail->param['models']='order_supplier_send';
- $formmail->param['orderid']=$object->id;
- $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
+ // Cree l'objet formulaire mail
+ include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php');
+ $formmail = new FormMail($db);
+ $formmail->fromtype = 'user';
+ $formmail->fromid = $user->id;
+ $formmail->fromname = $user->getFullName($langs);
+ $formmail->frommail = $user->email;
+ $formmail->withfrom=1;
+ $formmail->withto=empty($_POST["sendto"])?1:$_POST["sendto"];
+ $formmail->withtosocid=$soc->id;
+ $formmail->withtocc=1;
+ $formmail->withtoccsocid=0;
+ $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
+ $formmail->withtocccsocid=0;
+ $formmail->withtopic=$langs->trans('SendOrderRef','__ORDERREF__');
+ $formmail->withfile=2;
+ $formmail->withbody=1;
+ $formmail->withdeliveryreceipt=1;
+ $formmail->withcancel=1;
+ // Tableau des substitutions
+ $formmail->substit['__ORDERREF__']=$object->ref;
+ // Tableau des parametres complementaires
+ $formmail->param['action']='send';
+ $formmail->param['models']='order_supplier_send';
+ $formmail->param['orderid']=$object->id;
+ $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
- // Init list of files
- if (! empty($_REQUEST["mode"]) && $_REQUEST["mode"]=='init')
- {
- $formmail->clear_attached_files();
- $formmail->add_attached_files($file,dol_sanitizeFilename($ref.'.pdf'),'application/pdf');
- }
+ // Init list of files
+ if (! empty($_REQUEST["mode"]) && $_REQUEST["mode"]=='init')
+ {
+ $formmail->clear_attached_files();
+ $formmail->add_attached_files($file,dol_sanitizeFilename($ref.'.pdf'),'application/pdf');
+ }
- // Show form
- $formmail->show_form();
+ // Show form
+ $formmail->show_form();
- print ' ';
- }
+ print ' ';
+ }
- print '
';
+ print '
';
- }
- else
- {
- // Commande non trouvee
- dol_print_error($db);
- }
+ }
+ else
+ {
+ // Commande non trouvee
+ dol_print_error($db);
+ }
}
$db->close();
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index 54bfe5806a3..5218b2e8aa0 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -291,20 +291,20 @@ if ($action == 'add' && $user->rights->fournisseur->facture->creer)
if ($lines[$i]->date_end) $date_end=$lines[$i]->date_end;
$result = $object->addline(
- $desc,
- $lines[$i]->subprice,
- $lines[$i]->tva_tx,
- $lines[$i]->localtax1_tx,
- $lines[$i]->localtax2_tx,
- $lines[$i]->qty,
- $lines[$i]->fk_product,
- $lines[$i]->remise_percent,
- $date_start,
- $date_end,
- 0,
- $lines[$i]->info_bits,
- 'HT',
- $product_type
+ $desc,
+ $lines[$i]->subprice,
+ $lines[$i]->tva_tx,
+ $lines[$i]->localtax1_tx,
+ $lines[$i]->localtax2_tx,
+ $lines[$i]->qty,
+ $lines[$i]->fk_product,
+ $lines[$i]->remise_percent,
+ $date_start,
+ $date_end,
+ 0,
+ $lines[$i]->info_bits,
+ 'HT',
+ $product_type
);
if ($result < 0)
@@ -523,7 +523,7 @@ if ($action == 'addline')
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
}
- //supplier_invoice_pdf_create($db, $fac->id, $fac->modelpdf, $outputlangs);
+ //if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) supplier_invoice_pdf_create($db, $object->id, $object->modelpdf, $outputlangs);
unset($_POST['qty']);
unset($_POST['type']);
@@ -592,7 +592,7 @@ if ($action == 'edit' && $user->rights->fournisseur->facture->creer)
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
}
- //supplier_invoice_pdf_create($db, $object->id, $object->modelpdf, $outputlangs);
+ //if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) supplier_invoice_pdf_create($db, $object->id, $object->modelpdf, $outputlangs);
}
}
diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php
index 1470e7750c2..b794ed59eeb 100644
--- a/htdocs/livraison/fiche.php
+++ b/htdocs/livraison/fiche.php
@@ -117,11 +117,11 @@ if ($_REQUEST["action"] == 'confirm_valid' && $_REQUEST["confirm"] == 'yes' && $
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($newlang);
}
- $result=delivery_order_pdf_create($db, $delivery,$_REQUEST['model'],$outputlangs);
- if ($result <= 0)
- {
- dol_print_error($db,$result);
- exit;
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) $result=delivery_order_pdf_create($db, $delivery,$_REQUEST['model'],$outputlangs);
+ if ($result < 0)
+ {
+ dol_print_error($db,$result);
+ exit;
}
}