';
diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index 8ce904aad7c..93f7c301519 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -69,7 +69,7 @@ if ($action == 'setmod')
dolibarr_set_const($db, "PAYMENT_ADDON",$value,'chaine',0,'',$conf->entity);
}
-if ($action == 'set_FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS')
+if ($action == 'setparams')
{
$freetext = GETPOST('FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS'); // No alpha here, we want exact string
@@ -77,16 +77,31 @@ if ($action == 'set_FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS')
if (! $res > 0) $error++;
- if (! $error)
- {
- setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
- }
- else
+ if ($error)
{
setEventMessages($langs->trans("Error"), null, 'errors');
}
+
+ /*
+ $freetext = GETPOST('INVOICE_AUTO_FILLJS'); // No alpha here, we want exact string
+
+ $res = dolibarr_set_const($db, "INVOICE_AUTO_FILLJS",$freetext,'chaine',0,'',$conf->entity);
+
+ if (! $res > 0) $error++;
+
+ if ($error)
+ {
+ setEventMessages($langs->trans("Error"), null, 'errors');
+ }*/
+
+ if (! $error)
+ {
+ setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+ }
+
}
+
/*
* View
*/
@@ -235,6 +250,10 @@ print "
";
print load_fiche_titre($langs->trans("OtherOptions"),'','');
+print '
';
+
dol_fiche_end();
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index da6cfdaf15f..038b42e7c13 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2421,10 +2421,12 @@ if ($action == 'create')
include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
$formmail = new FormMail($db);
$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
- $formmail->fromtype = 'user';
- $formmail->fromid = $user->id;
- $formmail->fromname = $user->getFullName($langs);
- $formmail->frommail = $user->email;
+ $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
+
+ if($formmail->fromtype === 'user'){
+ $formmail->fromid = $user->id;
+
+ }
$formmail->trackid='pro'.$object->id;
if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) // If bit 2 is set
{
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 668b093e7db..289ba272b8c 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -133,6 +133,7 @@ if ($object->id > 0)
$modulepart = 'propal';
$permission = $user->rights->propal->creer;
+ $permtoedit = $user->rights->propal->creer;
$param = '&id=' . $object->id;
include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
}
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 41cd63ff446..88f8f8fa3df 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -441,10 +441,12 @@ if ($resql)
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
$formmail = new FormMail($db);
$formmail->withform=-1;
- $formmail->fromtype = 'user';
- $formmail->fromid = $user->id;
- $formmail->fromname = $user->getFullName($langs);
- $formmail->frommail = $user->email;
+ $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
+
+ if($formmail->fromtype === 'user'){
+ $formmail->fromid = $user->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='ord'.$object->id;
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 9d35e4cc683..b79ea443a3e 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2629,10 +2629,12 @@ if ($action == 'create' && $user->rights->commande->creer)
include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
$formmail = new FormMail($db);
$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
- $formmail->fromtype = 'user';
- $formmail->fromid = $user->id;
- $formmail->fromname = $user->getFullName($langs);
- $formmail->frommail = $user->email;
+ $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
+
+ if($formmail->fromtype === 'user'){
+ $formmail->fromid = $user->id;
+
+ }
$formmail->trackid='ord'.$object->id;
if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) // If bit 2 is set
{
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index 6b96940df98..a05a6e0061d 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -121,6 +121,7 @@ if ($id > 0 || ! empty($ref))
$modulepart = 'commande';
$permission = $user->rights->commande->creer;
+ $permtoedit = $user->rights->commande->creer;
$param = '&id=' . $object->id;
include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
}
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index b1abbcfb6b5..beccd80c7e8 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -469,10 +469,12 @@ if ($resql)
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
$formmail = new FormMail($db);
$formmail->withform=-1;
- $formmail->fromtype = 'user';
- $formmail->fromid = $user->id;
- $formmail->fromname = $user->getFullName($langs);
- $formmail->frommail = $user->email;
+ $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
+
+ if($formmail->fromtype === 'user'){
+ $formmail->fromid = $user->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='ord'.$object->id;
diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php
index a014bdc5d60..4c2182bb1e8 100644
--- a/htdocs/compta/bank/document.php
+++ b/htdocs/compta/bank/document.php
@@ -217,6 +217,7 @@ if ($id > 0 || !empty($ref)) {
}
else {
Header('Location: index.php');
+ exit;
}
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index dbd36308b1e..a365146b5a2 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -4108,10 +4108,12 @@ else if ($id > 0 || ! empty($ref))
include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
$formmail = new FormMail($db);
$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
- $formmail->fromtype = 'user';
- $formmail->fromid = $user->id;
- $formmail->fromname = $user->getFullName($langs);
- $formmail->frommail = $user->email;
+ $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
+
+ if($formmail->fromtype === 'user'){
+ $formmail->fromid = $user->id;
+
+ }
$formmail->trackid='inv'.$object->id;
if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) // If bit 2 is set
{
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index 9a15b7875d8..246e5595779 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -149,6 +149,7 @@ if ($id > 0 || ! empty($ref))
$modulepart = 'facture';
$permission = $user->rights->facture->creer;
+ $permtoedit = $user->rights->facture->creer;
$param = '&id=' . $object->id;
include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 70e4cc03974..d49ffaee0bd 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -278,7 +278,7 @@ if ($search_user > 0)
$sql.=", ".MAIN_DB_PREFIX."c_type_contact as tc";
}
$sql.= ' WHERE f.fk_soc = s.rowid';
-$sql.= " AND f.entity = ".$conf->entity;
+$sql.= ' AND f.entity IN ('.getEntity('facture', 1).')';
if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
if ($search_product_category > 0) $sql.=" AND cp.fk_categorie = ".$search_product_category;
if ($socid > 0) $sql.= ' AND s.rowid = '.$socid;
@@ -520,10 +520,12 @@ if ($resql)
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
$formmail = new FormMail($db);
$formmail->withform=-1;
- $formmail->fromtype = 'user';
- $formmail->fromid = $user->id;
- $formmail->fromname = $user->getFullName($langs);
- $formmail->frommail = $user->email;
+ $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
+
+ if($formmail->fromtype === 'user'){
+ $formmail->fromid = $user->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='inv'.$object->id;
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 4b0039c0a21..2c8c8d32334 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -38,6 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
$langs->load('companies');
$langs->load('bills');
$langs->load('banks');
+$langs->load('multicurrency');
$action = GETPOST('action','alpha');
$confirm = GETPOST('confirm');
@@ -433,7 +434,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
';
print ' });'."\n";
- if(!empty($conf->global->INVOICE_AUTO_FILLJS)){
+ if (!empty($conf->use_javascript_ajax)){
//Add js for AutoFill
print ' $(document).ready(function () {';
print ' $(".AutoFillAmout").on(\'click touchstart\', function(){
@@ -515,10 +516,12 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
dol_fiche_end();
+
/*
* List of unpaid invoices
*/
- $sql = 'SELECT f.rowid as facid, f.facnumber, f.total_ttc, f.multicurrency_total_ttc, f.type, ';
+
+ $sql = 'SELECT f.rowid as facid, f.facnumber, f.total_ttc, f.multicurrency_code, f.multicurrency_total_ttc, f.type, ';
$sql.= ' f.datef as df, f.fk_soc as socid';
$sql.= ' FROM '.MAIN_DB_PREFIX.'facture as f';
@@ -572,12 +575,13 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
print '
';
print '| '.$arraytitle.' | ';
print ''.$langs->trans('Date').' | ';
- print ''.$langs->trans('AmountTTC').' | ';
+ if (!empty($conf->multicurrency->enabled)) print ''.$langs->trans('Currency').' | ';
if (!empty($conf->multicurrency->enabled)) print ''.$langs->trans('MulticurrencyAmountTTC').' | ';
- print ''.$alreadypayedlabel.' | ';
if (!empty($conf->multicurrency->enabled)) print ''.$multicurrencyalreadypayedlabel.' | ';
- print ''.$remaindertopay.' | ';
if (!empty($conf->multicurrency->enabled)) print ''.$multicurrencyremaindertopay.' | ';
+ print ''.$langs->trans('AmountTTC').' | ';
+ print ''.$alreadypayedlabel.' | ';
+ print ''.$remaindertopay.' | ';
print ''.$langs->trans('PaymentAmount').' | ';
if (!empty($conf->multicurrency->enabled)) print ''.$langs->trans('MulticurrencyPaymentAmount').' | ';
print ' | ';
@@ -624,12 +628,35 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
// Date
print ''.dol_print_date($db->jdate($objp->df),'day')." | \n";
-
- // Price
- print ''.price($sign * $objp->total_ttc).' | ';
-
+
+ // Currency
+ print ''.$objp->multicurrency_code." | \n";
+
// Multicurrency Price
- if (!empty($conf->multicurrency->enabled)) print ''.price($sign * $objp->multicurrency_total_ttc).' | ';
+ if (!empty($conf->multicurrency->enabled))
+ {
+ print '';
+ if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $objp->multicurrency_total_ttc);
+ print ' | ';
+
+ // Multicurrency Price
+ print '';
+ if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
+ {
+ print price($sign * $multicurrency_payment);
+ if ($multicurrency_creditnotes) print '+'.price($multicurrency_creditnotes);
+ if ($multicurrency_deposits) print '+'.price($multicurrency_deposits);
+ }
+ print ' | ';
+
+ // Multicurrency Price
+ print '';
+ if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $multicurrency_remaintopay);
+ print ' | ';
+ }
+
+ // Price
+ print ''.price($sign * $objp->total_ttc).' | ';
// Received or paid back
print ''.price($sign * $paiement);
@@ -637,25 +664,10 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
if ($deposits) print '+'.price($deposits);
print ' | ';
- // Multicurrency Price
- if (!empty($conf->multicurrency->enabled))
- {
- print ''.price($sign * $multicurrency_payment);
- if ($multicurrency_creditnotes) print '+'.price($multicurrency_creditnotes);
- if ($multicurrency_deposits) print '+'.price($multicurrency_deposits);
- print ' | ';
- }
-
// Remain to take or to pay back
print ''.price($sign * $remaintopay).' | ';
//$test= price(price2num($objp->total_ttc - $paiement - $creditnotes - $deposits));
- // Multicurrency Price
- if (!empty($conf->multicurrency->enabled))
- {
- print ''.price($sign * $multicurrency_remaintopay).' | ';
- }
-
// Amount
print '';
@@ -665,7 +677,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
if ($action != 'add_paiement')
{
- if(!empty($conf->global->INVOICE_AUTO_FILLJS))
+ if (!empty($conf->use_javascript_ajax))
print img_picto("Auto fill",'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'");
print '';
print '';
@@ -678,7 +690,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
print " | ";
// Multicurrency Price
- if (!empty($conf->multicurrency->enabled))
+ if (! empty($conf->multicurrency->enabled))
{
print '';
@@ -686,17 +698,20 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
$namef = 'multicurrency_amount_'.$objp->facid;
$nameRemain = 'multicurrency_remain_'.$objp->facid;
- if ($action != 'add_paiement')
+ if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
{
- if(!empty($conf->global->INVOICE_AUTO_FILLJS))
- print img_picto("Auto fill",'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $multicurrency_remaintopay)."'");
- print '';
- print '';
- }
- else
- {
- print '';
- print '';
+ if ($action != 'add_paiement')
+ {
+ if (!empty($conf->use_javascript_ajax))
+ print img_picto("Auto fill",'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $multicurrency_remaintopay)."'");
+ print '';
+ print '';
+ }
+ else
+ {
+ print '';
+ print '';
+ }
}
print " | ";
}
@@ -727,16 +742,16 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
{
// Print total
print '
';
- print '| '.$langs->trans('TotalTTC').' | ';
- print ''.price($sign * $total_ttc).' | ';
+ print ''.$langs->trans('TotalTTC').' | ';
if (!empty($conf->multicurrency->enabled)) print ' | ';
+ if (!empty($conf->multicurrency->enabled)) print ' | ';
+ if (!empty($conf->multicurrency->enabled)) print ' | ';
+ print ''.price($sign * $total_ttc).' | ';
print ''.price($sign * $totalrecu);
if ($totalrecucreditnote) print '+'.price($totalrecucreditnote);
if ($totalrecudeposits) print '+'.price($totalrecudeposits);
print ' | ';
- if (!empty($conf->multicurrency->enabled)) print ' | ';
print ''.price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits,'MT')).' | ';
- if (!empty($conf->multicurrency->enabled)) print ' | ';
print ' | ';
if (!empty($conf->multicurrency->enabled)) print ' | ';
print ' | ';
diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php
index 988dfc28dad..8c79dfd1580 100644
--- a/htdocs/contact/document.php
+++ b/htdocs/contact/document.php
@@ -138,6 +138,7 @@ if ($object->id)
$modulepart = 'contact';
$permission = $user->rights->societe->contact->creer;
+ $permtoedit = $user->rights->societe->contact->creer;
$param = '&id=' . $object->id;
include DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
} else {
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 69a1f55f2d6..e8b8a990417 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -967,6 +967,28 @@ if (empty($reshook))
}
}
}
+
+ // Action clone object
+ if ($action == 'confirm_clone' && $confirm == 'yes')
+ {
+ if (! GETPOST('socid', 3))
+ {
+ setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
+ }
+ else
+ {
+ if ($object->id > 0) {
+ $result = $object->createFromClone($socid);
+ if ($result > 0) {
+ header("Location: " . $_SERVER['PHP_SELF'] . '?id=' . $result);
+ exit();
+ } else {
+ if (count($object->errors) > 0) setEventMessages($object->error, $object->errors, 'errors');
+ $action = '';
+ }
+ }
+ }
+ }
}
/*
@@ -1265,6 +1287,12 @@ else
print '';
}
+ // Clone confirmation
+ if ($action == 'clone') {
+ $formquestion = array(array('type' => 'other','name' => 'socid','label' => $langs->trans("SelectThirdParty"),'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', '(s.client=1 OR s.client=2 OR s.client=3)')));
+ print $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('CloneContract'), $langs->trans('ConfirmCloneContract', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
+ }
+
print '';
$linkback = ''.$langs->trans("BackToList").'';
@@ -1964,6 +1992,11 @@ else
if ($user->rights->facture->creer) print '';
else print '';
}
+
+ // Clone
+ if ($user->rights->contrat->creer) {
+ print '';
+ }
if ($object->nbofservicesclosed < $nbofservices)
{
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index eb08bb52ba8..6b0dc8d7fdb 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -56,7 +56,7 @@ class Contrat extends CommonObject
* @var string
*/
var $ref_customer;
-
+
/**
* Supplier reference of the contract
* @var string
@@ -536,7 +536,7 @@ class Contrat extends CommonObject
return -1;
}
}
-
+
/**
* Load a contract from database
*
@@ -904,7 +904,7 @@ class Contrat extends CommonObject
}
if (! $paramsok) return -1;
-
+
$this->db->begin();
$now=dol_now();
@@ -969,7 +969,7 @@ class Contrat extends CommonObject
}
}
}
-
+
// Insert contacts commerciaux ('SALESREPSIGN','contrat')
if (! $error)
{
@@ -996,8 +996,8 @@ class Contrat extends CommonObject
{
dol_print_error($this->db);
$error++;
- }
-
+ }
+
if (! empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN))
{
$originforcontact = $origin;
@@ -1018,10 +1018,10 @@ class Contrat extends CommonObject
}
}
}
-
+
$sqlcontact = "SELECT ctc.code, ctc.source, ec.fk_socpeople FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as ctc";
$sqlcontact.= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$originforcontact."'";
-
+
$resqlcontact = $this->db->query($sqlcontact);
if ($resqlcontact)
{
@@ -1034,11 +1034,11 @@ class Contrat extends CommonObject
}
}
else dol_print_error($resqlcontact);
- }
+ }
}
}
}
-
+
if (! $error)
{
// Call trigger
@@ -1381,7 +1381,7 @@ class Contrat extends CommonObject
$localtaxes_type=getLocalTaxesFromRate($txtva, 0, $this->societe, $mysoc);
$txtva = preg_replace('/\s*\(.*\)/','',$txtva); // Remove code into vatrate.
-
+
$tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, 1,$mysoc, $localtaxes_type);
$total_ht = $tabprice[0];
$total_tva = $tabprice[1];
@@ -1404,9 +1404,9 @@ class Contrat extends CommonObject
if (empty($pa_ht)) $pa_ht=0;
-
+
// if buy price not defined, define buyprice as configured in margin admin
- if ($this->pa_ht == 0)
+ if ($this->pa_ht == 0)
{
if (($result = $this->defineBuyPrice($pu_ht, $remise_percent, $fk_product)) < 0)
{
@@ -1565,7 +1565,7 @@ class Contrat extends CommonObject
$localtaxes_type=getLocalTaxesFromRate($tvatx, 0, $this->societe, $mysoc);
$tvatx = preg_replace('/\s*\(.*\)/','',$tvatx); // Remove code into vatrate.
-
+
$tabprice=calcul_price_total($qty, $pu, $remise_percent, $tvatx, $localtax1tx, $localtax2tx, 0, $price_base_type, $info_bits, 1, $mysoc, $localtaxes_type);
$total_ht = $tabprice[0];
$total_tva = $tabprice[1];
@@ -1589,7 +1589,7 @@ class Contrat extends CommonObject
if (empty($pa_ht)) $pa_ht=0;
// if buy price not defined, define buyprice as configured in margin admin
- if ($this->pa_ht == 0)
+ if ($this->pa_ht == 0)
{
if (($result = $this->defineBuyPrice($pu_ht, $remise_percent)) < 0)
{
@@ -2263,6 +2263,120 @@ class Contrat extends CommonObject
return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
}
+
+ /**
+ * Load an object from its id and create a new one in database
+ *
+ * @param int $socid Id of thirdparty
+ * @param int $notrigger 1=Does not execute triggers, 0= execute triggers
+ * @return int New id of clone
+ */
+ function createFromClone($socid = 0, $notrigger=0) {
+ global $db, $user, $langs, $conf, $hookmanager;
+
+ dol_include_once('/projet/class/project.class.php');
+
+ $this->context['createfromclone'] = 'createfromclone';
+
+ $error = 0;
+ $now = dol_now();
+
+ $this->fetch($this->id);
+ // Load dest object
+ $clonedObj = clone $this;
+
+ $this->db->begin();
+
+ $objsoc = new Societe($this->db);
+
+ $objsoc->fetch($clonedObj->socid);
+
+ // $clonedObj->id=0;
+ $clonedObj->statut = 0;
+
+ if (empty($conf->global->CONTRACT_ADDON) || ! is_readable(DOL_DOCUMENT_ROOT . "/core/modules/contract/" . $conf->global->CONTRACT_ADDON . ".php")) {
+ $this->error = 'ErrorSetupNotComplete';
+ dol_syslog($this->error);
+ return - 1;
+ }
+
+ // Set ref
+ require_once DOL_DOCUMENT_ROOT . "/core/modules/contract/" . $conf->global->CONTRACT_ADDON . '.php';
+ $obj = $conf->global->CONTRACT_ADDON;
+ $modContract = new $obj();
+ $clonedObj->ref = $modContract->getNextValue($objsoc, $clonedObj);
+
+ // get extrafields so they will be clone
+ foreach ( $this->lines as $line ) {
+ $line->fetch_optionals($line->rowid);
+ }
+
+ // Create clone
+ $result = $clonedObj->create($user);
+ if ($result < 0) {
+ $error ++;
+ $this->error = $clonedObj->error;
+ $this->errors[] = $clonedObj->error;
+ } else {
+ // copy internal contacts
+ if ($clonedObj->copy_linked_contact($this, 'internal') < 0)
+ $error ++;
+
+ // copy external contacts if same company
+ elseif ($this->socid == $clonedObj->socid) {
+ if ($clonedObj->copy_linked_contact($this, 'external') < 0)
+ $error ++;
+ }
+ }
+
+ if (! $error) {
+ foreach ( $this->lines as $line ) {
+ $result = $clonedObj->addline($line->desc, $line->subprice, $line->qty, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, $line->fk_product, $line->remise_percent, $line->date_ouverture, $line->date_cloture, 'HT', 0, $line->info_bits, $line->fk_fournprice, $line->pa_ht, $line->array_options, $line->fk_unit);
+ if ($result < 0) {
+ $error ++;
+ $this->error = $clonedObj->error;
+ $this->errors[] = $clonedObj->error;
+ }
+ }
+ }
+
+ if (! $error) {
+ // Hook of thirdparty module
+ if (is_object($hookmanager)) {
+ $parameters = array (
+ 'objFrom' => $this,
+ 'clonedObj' => $clonedObj
+ );
+ $action = '';
+ $reshook = $hookmanager->executeHooks('createFrom', $parameters, $clonedObj, $action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook < 0)
+ $error ++;
+ }
+
+ }
+
+ if (! $notrigger && empty($error))
+ {
+ // Call trigger
+ $clonedObj->old_copy=$this;
+ $result = $clonedObj->call_trigger('CONTRACT_CLONE', $user);
+ if ($result < 0) {
+ $error ++;
+ }
+ // End call triggers
+ }
+
+ unset($this->context['createfromclone']);
+
+ // End
+ if (! $error) {
+ $this->db->commit();
+ return $clonedObj->id;
+ } else {
+ $this->db->rollback();
+ return - 1;
+ }
+ }
}
@@ -2273,7 +2387,7 @@ class ContratLigne extends CommonObjectLine
{
public $element='contratdet';
public $table_element='contratdet';
-
+
var $id;
var $ref;
var $tms;
@@ -2291,10 +2405,10 @@ class ContratLigne extends CommonObjectLine
public $libelle;
var $description;
-
+
var $product_ref;
var $product_label;
-
+
var $date_commande;
var $date_ouverture_prevue; // date start planned
var $date_ouverture; // date start real
@@ -2435,7 +2549,7 @@ class ContratLigne extends CommonObjectLine
$result='';
$label=$langs->trans("ShowContractOfService").': '.$this->label;
if (empty($label)) $label=$this->description;
-
+
$link = '';
$linkend='';
@@ -2631,7 +2745,7 @@ class ContratLigne extends CommonObjectLine
if (empty($this->pa_ht)) $this->pa_ht=0;
// if buy price not defined, define buyprice as configured in margin admin
- if ($this->pa_ht == 0)
+ if ($this->pa_ht == 0)
{
if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
{
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index 024cf561fb5..ef7e73ad4c8 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -124,6 +124,7 @@ if ($object->id)
$modulepart = 'contract';
$permission = $user->rights->contrat->creer;
+ $permtoedit = $user->rights->contrat->creer;
$param = '&id=' . $object->id;
include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
diff --git a/htdocs/core/actions_builddoc.inc.php b/htdocs/core/actions_builddoc.inc.php
index 15dc5d060b0..5984283b996 100644
--- a/htdocs/core/actions_builddoc.inc.php
+++ b/htdocs/core/actions_builddoc.inc.php
@@ -88,6 +88,10 @@ if ($action == 'builddoc' && $permissioncreate)
setEventMessages($object->error, $object->errors, 'errors');
$action='';
}
+ else
+ {
+ setEventMessages($langs->trans("FileGenerated"), null);
+ }
}
}
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index 3ac6fb36289..297fe373c04 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -201,8 +201,26 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
{
$langs->load("commercial");
- $from = $_POST['fromname'] . ' <' . $_POST['frommail'] .'>';
- $replyto = $_POST['replytoname']. ' <' . $_POST['replytomail'].'>';
+ $fromtype = GETPOST('fromtype');
+ if ($fromtype === 'user') {
+ $from = $user->getFullName($langs) .' <'.$user->email.'>';
+ }
+ elseif ($fromtype === 'company') {
+ $from = $conf->global->MAIN_INFO_SOCIETE_NOM .' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
+ }
+ elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
+ $tmp=explode(',', $user->email_aliases);
+ $from = trim($tmp[($reg[1] - 1)]);
+ }
+ elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
+ $tmp=explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
+ $from = trim($tmp[($reg[1] - 1)]);
+ }
+ else {
+ $from = $_POST['fromname'] . ' <' . $_POST['frommail'] .'>';
+ }
+
+ $replyto = $_POST['replytoname']. ' <' . $_POST['replytomail'].'>';
$message = $_POST['message'];
$sendtobcc= GETPOST('sendtoccc');
if ($mode == 'emailfromproposal') $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO));
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index b388298cf08..abe672dee68 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -1,7 +1,7 @@
* Copyright (C) 2003 Xavier Dutoit
- * Copyright (C) 2004-2012 Laurent Destailleur
+ * Copyright (C) 2004-2016 Laurent Destailleur
* Copyright (C) 2005-2012 Regis Houssin
* Copyright (C) 2006 Jean Heimburger
*
@@ -491,8 +491,8 @@ class Conf
// By default, we use the zip town autofill
if (! isset($this->global->MAIN_USE_ZIPTOWN_DICTIONNARY)) $this->global->MAIN_USE_ZIPTOWN_DICTIONNARY=1;
- // Define list of limited modules
- if (! isset($this->global->MAIN_MODULES_FOR_EXTERNAL)) $this->global->MAIN_MODULES_FOR_EXTERNAL='user,societe,propal,commande,facture,categorie,supplier_proposal,fournisseur,contact,projet,contrat,ficheinter,expedition,agenda,resource,adherent'; // '' means 'all'. Note that contact is added here as it should be a module later.
+ // Define list of limited modules (value must be key found for "name" property of module, so for example 'supplierproposal' for Module "Supplier Proposal"
+ if (! isset($this->global->MAIN_MODULES_FOR_EXTERNAL)) $this->global->MAIN_MODULES_FOR_EXTERNAL='user,societe,propal,commande,facture,categorie,supplierproposal,fournisseur,contact,projet,contrat,ficheinter,expedition,agenda,resource,adherent'; // '' means 'all'. Note that contact is added here as it should be a module later.
// Enable select2
if (empty($this->global->MAIN_USE_JQUERY_MULTISELECT) || $this->global->MAIN_USE_JQUERY_MULTISELECT == '1') $this->global->MAIN_USE_JQUERY_MULTISELECT='select2';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 871f6a2d209..ceac1fc4b44 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4102,6 +4102,11 @@ class Form
$out='';
$out.= '