diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index 4174ee7809f7b4c28f1ce2a44b4ee5cc69109b90..8bf7dfe0c44ea57ff1c05ed7c0c5f786980ba0a9 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -364,28 +364,63 @@ class AccountingAccount extends CommonObject
/**
* Return clicable name (with picto eventually)
*
- * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
- * @return string Chaine avec URL
+ * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
+ * @param int $withlabel 0=No label, 1=Include label of account
+ * @param int $nourl 1=Disable url
+ * @param string $moretitle Add more text to title tooltip
+ * @param int $notooltip 1=Disable tooltip
+ * @return string String with URL
*/
- function getNomUrl($withpicto = 0) {
- global $langs;
+ function getNomUrl($withpicto = 0, $withlabel = 0, $nourl = 0, $moretitle='',$notooltip=0)
+ {
+ global $langs, $conf, $user;
+ require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+
+ if (! empty($conf->dol_no_mouse_hover)) $notooltip=1; // Force disable tooltips
$result = '';
- $link = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/card.php?id=' . $this->id . '">';
- $linkend = '</a>';
+ $url = DOL_URL_ROOT . '/accountancy/admin/card.php?id=' . $this->id;
$picto = 'billr';
+ $label='';
+
+ $label = '<u>' . $langs->trans("ShowAccountingAccount") . '</u>';
+ if (! empty($this->account_number))
+ $label .= '<br><b>'.$langs->trans('AccountAccounting') . ':</b> ' . length_accountg($this->account_number);
+ if (! empty($this->label))
+ $label .= '<br><b>'.$langs->trans('Label') . ':</b> ' . $this->label;
+ if ($moretitle) $label.=' - '.$moretitle;
+
+ $linkclose='';
+ if (empty($notooltip))
+ {
+ if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+ {
+ $label=$langs->trans("ShowAccoutingAccount");
+ $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+ }
+ $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+ $linkclose.=' class="classfortooltip"';
+ }
+
+ $linkstart='<a href="'.$url.'"';
+ $linkstart.=$linkclose.'>';
+ $linkend='</a>';
+
+ if ($nourl)
+ {
+ $linkstart = '';
+ $linkclose = '';
+ $linkend = '';
+ }
- $label = $langs->trans("Show") . ': ' . $this->account_number . ' - ' . $this->label;
+ $label_link = length_accountg($this->account_number);
+ if ($withlabel) $label_link .= ' - ' . $this->label;
- if ($withpicto)
- $result .= ($link . img_object($label, $picto) . $linkend);
- if ($withpicto && $withpicto != 2)
- $result .= ' ';
- if ($withpicto != 2)
- require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
- $result .= $link . length_accountg($this->account_number) . ' - ' . $this->label . $linkend;
+ if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
+ if ($withpicto && $withpicto != 2) $result .= ' ';
+ if ($withpicto != 2) $result.=$linkstart . $label_link . $linkend;
return $result;
}
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 46c6a55cf2f59fe7c206384cc8994b48572d21b0..348ca1938b0db0ef9c045cb1b9bef3f131a3e208 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1366,103 +1366,14 @@ class Propal extends CommonObject
$this->lines = array();
/*
- * Lignes propales liees a un produit ou non
+ * Lines
*/
- $sql = "SELECT d.rowid, d.fk_propal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,";
- $sql.= " d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,";
- $sql.= " d.fk_unit,";
- $sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label,';
- $sql.= ' d.date_start, d.date_end';
- $sql.= ' ,d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc';
- $sql.= " FROM ".MAIN_DB_PREFIX."propaldet as d";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON d.fk_product = p.rowid";
- $sql.= " WHERE d.fk_propal = ".$this->id;
- $sql.= " ORDER by d.rang";
-
- $result = $this->db->query($sql);
- if ($result)
- {
- require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
- $extrafieldsline=new ExtraFields($this->db);
- $line = new PropaleLigne($this->db);
- $extralabelsline=$extrafieldsline->fetch_name_optionals_label($line->table_element,true);
-
- $num = $this->db->num_rows($result);
- $i = 0;
-
- while ($i < $num)
- {
- $objp = $this->db->fetch_object($result);
-
- $line = new PropaleLigne($this->db);
-
- $line->rowid = $objp->rowid; //Deprecated
- $line->id = $objp->rowid;
- $line->fk_propal = $objp->fk_propal;
- $line->fk_parent_line = $objp->fk_parent_line;
- $line->product_type = $objp->product_type;
- $line->label = $objp->custom_label;
- $line->desc = $objp->description; // Description ligne
- $line->qty = $objp->qty;
- $line->tva_tx = $objp->tva_tx;
- $line->localtax1_tx = $objp->localtax1_tx;
- $line->localtax2_tx = $objp->localtax2_tx;
- $line->subprice = $objp->subprice;
- $line->fk_remise_except = $objp->fk_remise_except;
- $line->remise_percent = $objp->remise_percent;
- $line->price = $objp->price; // TODO deprecated
-
- $line->info_bits = $objp->info_bits;
- $line->total_ht = $objp->total_ht;
- $line->total_tva = $objp->total_tva;
- $line->total_localtax1 = $objp->total_localtax1;
- $line->total_localtax2 = $objp->total_localtax2;
- $line->total_ttc = $objp->total_ttc;
- $line->fk_fournprice = $objp->fk_fournprice;
- $marginInfos = getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $line->fk_fournprice, $objp->pa_ht);
- $line->pa_ht = $marginInfos[0];
- $line->marge_tx = $marginInfos[1];
- $line->marque_tx = $marginInfos[2];
- $line->special_code = $objp->special_code;
- $line->rang = $objp->rang;
-
- $line->fk_product = $objp->fk_product;
-
- $line->ref = $objp->product_ref; // TODO deprecated
- $line->product_ref = $objp->product_ref;
- $line->libelle = $objp->product_label; // TODO deprecated
- $line->product_label = $objp->product_label;
- $line->product_desc = $objp->product_desc; // Description produit
- $line->fk_product_type = $objp->fk_product_type;
- $line->fk_unit = $objp->fk_unit;
-
- $line->date_start = $this->db->jdate($objp->date_start);
- $line->date_end = $this->db->jdate($objp->date_end);
-
- // Multicurrency
- $line->fk_multicurrency = $objp->fk_multicurrency;
- $line->multicurrency_code = $objp->multicurrency_code;
- $line->multicurrency_subprice = $objp->multicurrency_subprice;
- $line->multicurrency_total_ht = $objp->multicurrency_total_ht;
- $line->multicurrency_total_tva = $objp->multicurrency_total_tva;
- $line->multicurrency_total_ttc = $objp->multicurrency_total_ttc;
-
- $line->fetch_optionals($line->id,$extralabelsline);
-
- $this->lines[$i] = $line;
- //dol_syslog("1 ".$line->fk_product);
- //print "xx $i ".$this->lines[$i]->fk_product;
- $i++;
- }
- $this->db->free($result);
- }
- else
+ $result=$this->fetch_lines();
+ if ($result < 0)
{
- $this->error=$this->db->lasterror();
- return -1;
+ return -3;
}
-
return 1;
}
@@ -1475,6 +1386,113 @@ class Propal extends CommonObject
return -1;
}
}
+
+ /**
+ * Load array lines
+ *
+ * @param int $only_product Return only physical products
+ * @return int <0 if KO, >0 if OK
+ */
+ function fetch_lines($only_product=0)
+ {
+ $this->lines=array();
+
+ $sql = 'SELECT d.rowid, d.fk_propal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,';
+ $sql.= ' d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,';
+ $sql.= ' d.fk_unit,';
+ $sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label,';
+ $sql.= ' d.date_start, d.date_end';
+ $sql.= ' ,d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc';
+ $sql.= ' FROM '.MAIN_DB_PREFIX.'propaldet as d';
+ $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (d.fk_product = p.rowid)';
+ $sql.= ' WHERE d.fk_propal = '.$this->id;
+ if ($only_product) $sql .= ' AND p.fk_product_type = 0';
+ $sql.= ' ORDER by d.rang';
+
+ dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
+ $result = $this->db->query($sql);
+ if ($result)
+ {
+ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+ $num = $this->db->num_rows($result);
+
+ $i = 0;
+ while ($i < $num)
+ {
+ $objp = $this->db->fetch_object($result);
+
+ $line = new PropaleLigne($this->db);
+
+ $line->rowid = $objp->rowid; //Deprecated
+ $line->id = $objp->rowid;
+ $line->fk_propal = $objp->fk_propal;
+ $line->fk_parent_line = $objp->fk_parent_line;
+ $line->product_type = $objp->product_type;
+ $line->label = $objp->custom_label;
+ $line->desc = $objp->description; // Description ligne
+ $line->qty = $objp->qty;
+ $line->tva_tx = $objp->tva_tx;
+ $line->localtax1_tx = $objp->localtax1_tx;
+ $line->localtax2_tx = $objp->localtax2_tx;
+ $line->subprice = $objp->subprice;
+ $line->fk_remise_except = $objp->fk_remise_except;
+ $line->remise_percent = $objp->remise_percent;
+ $line->price = $objp->price; // TODO deprecated
+
+ $line->info_bits = $objp->info_bits;
+ $line->total_ht = $objp->total_ht;
+ $line->total_tva = $objp->total_tva;
+ $line->total_localtax1 = $objp->total_localtax1;
+ $line->total_localtax2 = $objp->total_localtax2;
+ $line->total_ttc = $objp->total_ttc;
+ $line->fk_fournprice = $objp->fk_fournprice;
+ $marginInfos = getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $line->fk_fournprice, $objp->pa_ht);
+ $line->pa_ht = $marginInfos[0];
+ $line->marge_tx = $marginInfos[1];
+ $line->marque_tx = $marginInfos[2];
+ $line->special_code = $objp->special_code;
+ $line->rang = $objp->rang;
+
+ $line->fk_product = $objp->fk_product;
+
+ $line->ref = $objp->product_ref; // TODO deprecated
+ $line->product_ref = $objp->product_ref;
+ $line->libelle = $objp->product_label; // TODO deprecated
+ $line->product_label = $objp->product_label;
+ $line->product_desc = $objp->product_desc; // Description produit
+ $line->fk_product_type = $objp->fk_product_type;
+ $line->fk_unit = $objp->fk_unit;
+
+ $line->date_start = $this->db->jdate($objp->date_start);
+ $line->date_end = $this->db->jdate($objp->date_end);
+
+ // Multicurrency
+ $line->fk_multicurrency = $objp->fk_multicurrency;
+ $line->multicurrency_code = $objp->multicurrency_code;
+ $line->multicurrency_subprice = $objp->multicurrency_subprice;
+ $line->multicurrency_total_ht = $objp->multicurrency_total_ht;
+ $line->multicurrency_total_tva = $objp->multicurrency_total_tva;
+ $line->multicurrency_total_ttc = $objp->multicurrency_total_ttc;
+
+ $line->fetch_optionals();
+
+ $this->lines[$i] = $line;
+ //dol_syslog("1 ".$line->fk_product);
+ //print "xx $i ".$this->lines[$i]->fk_product;
+ $i++;
+ }
+
+ $this->db->free($result);
+
+ return 1;
+ }
+ else
+ {
+ $this->error=$this->db->lasterror();
+ return -3;
+ }
+ }
/**
* Update value of extrafields on the proposal
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index df6e6b1c8c83e3e4ae897d33130c9b1c39a073fa..5b3bb3a58fe35e679e40323d21d307ad104fe899 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -1,11 +1,11 @@
<?php
/* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
- * Copyright (C) 2004-2016 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2014-2016 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
- * Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
- * Copyright (C) 2016 Marcos García <marcosgdf@gmail.com>
+ * Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
+ * Copyright (C) 2004-2016 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2014-2017 Alexandre Spangaro <aspangaro@zendsi.com>
+ * Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
+ * Copyright (C) 2016 Marcos García <marcosgdf@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -35,8 +35,8 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/html.formbank.class.php';
require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
if (! empty($conf->categorie->enabled)) require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
$langs->load("banks");
$langs->load("bills");
@@ -664,7 +664,10 @@ else
print '<tr class="liste_titre_add"><td class="titlefield">'.$langs->trans("AccountancyCode").'</td>';
print '<td>';
if (! empty($conf->accounting->enabled)) {
- print length_accountg($object->account_number).'</td></tr>';
+ $accountingaccount = new AccountingAccount($db);
+ $accountingaccount->fetch('',$object->account_number);
+
+ print $accountingaccount->getNomUrl(0,1,1,'',1);
} else {
print $object->account_number;
}
@@ -683,13 +686,11 @@ else
print '</table>';
-
print '</div>';
print '<div class="fichehalfright">';
print '<div class="ficheaddleft">';
print '<div class="underbanner clearboth"></div>';
-
print '<table class="border centpercent">';
// Categories
@@ -703,8 +704,7 @@ else
print '<td>'.dol_htmlentitiesbr($object->comment).'</td></tr>';
print '</table>';
-
-
+
if ($object->type == Account::TYPE_SAVINGS || $object->type == Account::TYPE_CURRENT)
{
print '<br>';
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 74badc6daae73a0612c72ca641ac1d2b8e8d72dc..58e47a29ec86a81b9d8f169c8712d2c1241325e5 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -406,60 +406,105 @@ if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_se
$outputlangs->setDefaultLang($newlang);
}
- // Create empty PDF
- $pdf=pdf_getInstance();
- if (class_exists('TCPDF'))
- {
- $pdf->setPrintHeader(false);
- $pdf->setPrintFooter(false);
- }
- $pdf->SetFont(pdf_getPDFFont($outputlangs));
-
- if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
-
- // Add all others
- foreach($files as $file)
- {
- // Charge un document PDF depuis un fichier.
- $pagecount = $pdf->setSourceFile($file);
- for ($i = 1; $i <= $pagecount; $i++)
- {
- $tplidx = $pdf->importPage($i);
- $s = $pdf->getTemplatesize($tplidx);
- $pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
- $pdf->useTemplate($tplidx);
- }
+ if(!empty($conf->global->USE_PDFTK_FOR_PDF_CONCAT)) {
+ // Create output dir if not exists
+ dol_mkdir($diroutputmassaction);
+
+ // Defined name of merged file
+ $filename=strtolower(dol_sanitizeFileName($langs->transnoentities($objectlabel)));
+ $filename=preg_replace('/\s/','_',$filename);
+
+ // Save merged file
+ if ($filter=='paye:0')
+ {
+ if ($option=='late') $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid"))).'_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Late")));
+ else $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid")));
+ }
+ if ($year) $filename.='_'.$year;
+ if ($month) $filename.='_'.$month;
+
+ if (count($files)>0)
+ {
+
+ $now=dol_now();
+ $file=$diroutputmassaction.'/'.$filename.'_'.dol_print_date($now,'dayhourlog').'.pdf';
+
+ $input_files = '';
+ foreach($files as $f) {
+ $input_files.=' '.escapeshellarg($f);
+ }
+
+ $cmd = 'pdftk '.$input_files.' cat output '.escapeshellarg($file);
+ exec($cmd);
+
+ if (! empty($conf->global->MAIN_UMASK))
+ @chmod($file, octdec($conf->global->MAIN_UMASK));
+
+ $langs->load("exports");
+ setEventMessages($langs->trans('FileSuccessfullyBuilt',$filename.'_'.dol_print_date($now,'dayhourlog')), null, 'mesgs');
+ }
+ else
+ {
+ setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
+ }
+
}
-
- // Create output dir if not exists
- dol_mkdir($diroutputmassaction);
-
- // Defined name of merged file
- $filename=strtolower(dol_sanitizeFileName($langs->transnoentities($objectlabel)));
- $filename=preg_replace('/\s/','_',$filename);
-
- // Save merged file
- if ($filter=='paye:0')
- {
- if ($option=='late') $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid"))).'_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Late")));
- else $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid")));
- }
- if ($year) $filename.='_'.$year;
- if ($month) $filename.='_'.$month;
- if ($pagecount)
- {
- $now=dol_now();
- $file=$diroutputmassaction.'/'.$filename.'_'.dol_print_date($now,'dayhourlog').'.pdf';
- $pdf->Output($file,'F');
- if (! empty($conf->global->MAIN_UMASK))
- @chmod($file, octdec($conf->global->MAIN_UMASK));
-
- $langs->load("exports");
- setEventMessages($langs->trans('FileSuccessfullyBuilt',$filename.'_'.dol_print_date($now,'dayhourlog')), null, 'mesgs');
- }
- else
- {
- setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
+ else {
+ // Create empty PDF
+ $pdf=pdf_getInstance();
+ if (class_exists('TCPDF'))
+ {
+ $pdf->setPrintHeader(false);
+ $pdf->setPrintFooter(false);
+ }
+ $pdf->SetFont(pdf_getPDFFont($outputlangs));
+
+ if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+
+ // Add all others
+ foreach($files as $file)
+ {
+ // Charge un document PDF depuis un fichier.
+ $pagecount = $pdf->setSourceFile($file);
+ for ($i = 1; $i <= $pagecount; $i++)
+ {
+ $tplidx = $pdf->importPage($i);
+ $s = $pdf->getTemplatesize($tplidx);
+ $pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
+ $pdf->useTemplate($tplidx);
+ }
+ }
+
+ // Create output dir if not exists
+ dol_mkdir($diroutputmassaction);
+
+ // Defined name of merged file
+ $filename=strtolower(dol_sanitizeFileName($langs->transnoentities($objectlabel)));
+ $filename=preg_replace('/\s/','_',$filename);
+
+ // Save merged file
+ if ($filter=='paye:0')
+ {
+ if ($option=='late') $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid"))).'_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Late")));
+ else $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid")));
+ }
+ if ($year) $filename.='_'.$year;
+ if ($month) $filename.='_'.$month;
+ if ($pagecount)
+ {
+ $now=dol_now();
+ $file=$diroutputmassaction.'/'.$filename.'_'.dol_print_date($now,'dayhourlog').'.pdf';
+ $pdf->Output($file,'F');
+ if (! empty($conf->global->MAIN_UMASK))
+ @chmod($file, octdec($conf->global->MAIN_UMASK));
+
+ $langs->load("exports");
+ setEventMessages($langs->trans('FileSuccessfullyBuilt',$filename.'_'.dol_print_date($now,'dayhourlog')), null, 'mesgs');
+ }
+ else
+ {
+ setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
+ }
}
}
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 42daafe9c2d018a52213e4dae23ef00ed1e335f5..1798eb190599f684386725393a000617636d5317 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -128,7 +128,9 @@ class FactureFournisseur extends CommonInvoice
public $multicurrency_total_ht;
public $multicurrency_total_tva;
public $multicurrency_total_ttc;
-
+ //! id of source invoice if replacement invoice or credit note
+ public $fk_facture_source;
+
/**
* Standard invoice
*/
@@ -263,6 +265,7 @@ class FactureFournisseur extends CommonInvoice
$sql.= ", fk_multicurrency";
$sql.= ", multicurrency_code";
$sql.= ", multicurrency_tx";
+ $sql.= ", fk_facture_source";
$sql.= ")";
$sql.= " VALUES (";
$sql.= "'(PROV)'";
@@ -286,6 +289,7 @@ class FactureFournisseur extends CommonInvoice
$sql.= ", ".(int) $this->fk_multicurrency;
$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
$sql.= ", ".(double) $this->multicurrency_tx;
+ $sql.= ", ".(isset($this->fk_facture_source)?$this->fk_facture_source:"NULL");
$sql.= ")";
dol_syslog(get_class($this)."::create", LOG_DEBUG);
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index bd1e41c546442af4c0af2dd8142e467c08b899fd..f9162c5ca210c8fb356f1a3e81559ce12c662a9c 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -59,6 +59,7 @@ ChangeAndLoad=Change and load
Addanaccount=Add an accounting account
AccountAccounting=Accounting account
AccountAccountingShort=Account
+ShowAccoutingAccount=Show accounting account
AccountAccountingSuggest=Accounting account suggested
MenuDefaultAccounts=Default accounts
MenuVatAccounts=Vat accounts