Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/projet/tasks/time.php
This commit is contained in:
Laurent Destailleur
2018-02-27 19:18:43 +01:00
parent b090f0da9c 75cbc466d5
commit 04934cc4aa
127 changed files with 193 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
htdocs/core/class/commoninvoice.class.php
View File

@@ -274,6 +274,63 @@ abstract class CommonInvoice extends CommonObject
}
}
/**
* Return list of payments
*
* @param string $filtertype 1 to filter on type of payment == 'PRE'
* @return array Array with list of payments
*/
function getListOfPayments($filtertype='')
{
$retarray=array();
$table='paiement_facture';
$table2='paiement';
$field='fk_facture';
$field2='fk_paiement';
$sharedentity='facture';
if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
{
$table='paiementfourn_facturefourn';
$table2='paiementfourn';
$field='fk_facturefourn';
$field2='fk_paiementfourn';
$sharedentity='facture_fourn';
}
$sql = 'SELECT p.ref, pf.amount, pf.multicurrency_amount, p.fk_paiement, p.datep, p.num_paiement as num, t.code';
$sql.= ' FROM '.MAIN_DB_PREFIX.$table.' as pf, '.MAIN_DB_PREFIX.$table2.' as p, '.MAIN_DB_PREFIX.'c_paiement as t';
$sql.= ' WHERE pf.'.$field.' = '.$this->id;
//$sql.= ' WHERE pf.'.$field.' = 1';
$sql.= ' AND pf.'.$field2.' = p.rowid';
$sql.= ' AND p.fk_paiement = t.id';
$sql.= ' AND p.entity IN (' . getEntity($sharedentity).')';
if ($filtertype) $sql.=" AND t.code='PRE'";
dol_syslog(get_class($this)."::getListOfPayments", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
$num = $this->db->num_rows($resql);
$i=0;
while ($i < $num)
{
$obj = $this->db->fetch_object($resql);
$retarray[]=array('amount'=>$obj->amount,'type'=>$obj->code, 'date'=>$obj->datep, 'num'=>$obj->num, 'ref'=>$obj->ref);
$i++;
}
$this->db->free($resql);
return $retarray;
}
else
{
$this->error=$this->db->lasterror();
dol_print_error($this->db);
return array();
}
}
/**
* Return if an invoice can be deleted
* Rule is:

11
htdocs/core/class/html.formmail.class.php
View File

@@ -252,6 +252,14 @@ class FormMail extends Form
$langs->load("other");
$langs->load("mails");
// Clear temp files. Must be done at beginning, before call of triggers
if (GETPOST('mode','alpha') == 'init' || (GETPOST('modelmailselected','alpha') && GETPOST('modelmailselected','alpha') != '-1'))
{
$this->clear_attached_files();
}
// Call hook getFormMail
$hookmanager->initHooks(array('formmail'));
$parameters=array(
@@ -306,7 +314,6 @@ class FormMail extends Form
if (GETPOST('mode','alpha') == 'init' || (GETPOST('modelmailselected','alpha') && GETPOST('modelmailselected','alpha') != '-1'))
{
$this->clear_attached_files();
if (! empty($arraydefaultmessage['joinfiles']) && is_array($this->param['fileinit']))
{
foreach($this->param['fileinit'] as $file)
@@ -399,7 +406,7 @@ class FormMail extends Form
$out.= '<table class="border" width="100%">'."\n";
$out.= '<table class="border" width="100%" style="border-top: 1px solid #BBB;">'."\n";
// Substitution array
if (! empty($this->withsubstit)) // Unset or set ->withsubstit=0 to disable this.