Skip to content
Snippets Groups Projects
Commit 01c2a831 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

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

parents de8ced60 aee5f6dd
Branches
Tags
No related merge requests found
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
/* Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2009 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2009 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2016 Charlie Benke <charlie@patas-monkey.com>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
...@@ -35,10 +36,14 @@ class AdherentType extends CommonObject ...@@ -35,10 +36,14 @@ class AdherentType extends CommonObject
public $table_element = 'adherent_type'; public $table_element = 'adherent_type';
public $element = 'adherent_type'; public $element = 'adherent_type';
var $id;
var $ref;
var $libelle; var $libelle;
var $cotisation; // Soumis a la cotisation var $cotisation; // Soumis a la cotisation
var $note;
var $vote; // droit de vote var $vote; // droit de vote
var $mail_valid; //mail envoye lors de la validation var $mail_valid; //mail envoye lors de la validation
var $statut;
/** /**
...@@ -110,7 +115,7 @@ class AdherentType extends CommonObject ...@@ -110,7 +115,7 @@ class AdherentType extends CommonObject
$sql.= "note = '".$this->db->escape($this->note)."',"; $sql.= "note = '".$this->db->escape($this->note)."',";
$sql.= "vote = '".$this->vote."',"; $sql.= "vote = '".$this->vote."',";
$sql.= "mail_valid = '".$this->db->escape($this->mail_valid)."'"; $sql.= "mail_valid = '".$this->db->escape($this->mail_valid)."'";
$sql .= " WHERE rowid = $this->id"; $sql .= " WHERE rowid =".$this->id;
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) if ($result)
...@@ -223,7 +228,7 @@ class AdherentType extends CommonObject ...@@ -223,7 +228,7 @@ class AdherentType extends CommonObject
{ {
global $conf,$langs; global $conf,$langs;
$projets = array(); $adherenttypes = array();
$sql = "SELECT rowid, libelle"; $sql = "SELECT rowid, libelle";
$sql.= " FROM ".MAIN_DB_PREFIX."adherent_type"; $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type";
...@@ -241,7 +246,7 @@ class AdherentType extends CommonObject ...@@ -241,7 +246,7 @@ class AdherentType extends CommonObject
{ {
$obj = $this->db->fetch_object($resql); $obj = $this->db->fetch_object($resql);
$projets[$obj->rowid] = $langs->trans($obj->libelle); $adherenttypes[$obj->rowid] = $langs->trans($obj->libelle);
$i++; $i++;
} }
} }
...@@ -250,8 +255,7 @@ class AdherentType extends CommonObject ...@@ -250,8 +255,7 @@ class AdherentType extends CommonObject
{ {
print $this->db->error(); print $this->db->error();
} }
return $adherenttypes;
return $projets;
} }
...@@ -308,7 +312,7 @@ class AdherentType extends CommonObject ...@@ -308,7 +312,7 @@ class AdherentType extends CommonObject
function getMailOnSubscription() function getMailOnSubscription()
{ {
global $conf; global $conf;
// mail_subscription not defined so never used
if (! empty($this->mail_subscription) && trim(dol_htmlentitiesbr_decode($this->mail_subscription))) // Property not yet defined if (! empty($this->mail_subscription) && trim(dol_htmlentitiesbr_decode($this->mail_subscription))) // Property not yet defined
{ {
return $this->mail_subscription; return $this->mail_subscription;
...@@ -327,7 +331,7 @@ class AdherentType extends CommonObject ...@@ -327,7 +331,7 @@ class AdherentType extends CommonObject
function getMailOnResiliate() function getMailOnResiliate()
{ {
global $conf; global $conf;
// NOTE mail_resiliate not defined so never used
if (! empty($this->mail_resiliate) && trim(dol_htmlentitiesbr_decode($this->mail_resiliate))) // Property not yet defined if (! empty($this->mail_resiliate) && trim(dol_htmlentitiesbr_decode($this->mail_resiliate))) // Property not yet defined
{ {
return $this->mail_resiliate; return $this->mail_resiliate;
......
...@@ -200,7 +200,10 @@ if (! $rowid && $action != 'create' && $action != 'edit') ...@@ -200,7 +200,10 @@ if (! $rowid && $action != 'create' && $action != 'edit')
print '<td>'.dol_escape_htmltag($objp->libelle).'</td>'; print '<td>'.dol_escape_htmltag($objp->libelle).'</td>';
print '<td align="center">'.yn($objp->cotisation).'</td>'; print '<td align="center">'.yn($objp->cotisation).'</td>';
print '<td align="center">'.yn($objp->vote).'</td>'; print '<td align="center">'.yn($objp->vote).'</td>';
if ($user->rights->adherent->configurer)
print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$objp->rowid.'">'.img_edit().'</a></td>'; print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$objp->rowid.'">'.img_edit().'</a></td>';
else
print '<td align="right">&nbsp;</td>';
print "</tr>"; print "</tr>";
$i++; $i++;
} }
......
...@@ -3953,6 +3953,7 @@ else if ($id > 0 || ! empty($ref)) ...@@ -3953,6 +3953,7 @@ else if ($id > 0 || ! empty($ref))
} }
// Classify 'closed not completely paid' (possible si validee et pas encore classee payee) // Classify 'closed not completely paid' (possible si validee et pas encore classee payee)
if ($object->statut == 1 && $object->paye == 0 && $resteapayer > 0 && $user->rights->facture->paiement) if ($object->statut == 1 && $object->paye == 0 && $resteapayer > 0 && $user->rights->facture->paiement)
{ {
if ($totalpaye > 0 || $totalcreditnotes > 0) if ($totalpaye > 0 || $totalcreditnotes > 0)
...@@ -3962,13 +3963,19 @@ else if ($id > 0 || ! empty($ref)) ...@@ -3962,13 +3963,19 @@ else if ($id > 0 || ! empty($ref))
} }
else else
{ {
if ($objectidnext) { if ( empty($conf->global->INVOICE_CAN_NEVER_BE_CANCELED))
{
if ($objectidnext)
{
print '<div class="inline-block divButAction"><span class="butActionRefused" title="' . $langs->trans("DisabledBecauseReplacedInvoice") . '">' . $langs->trans('ClassifyCanceled') . '</span></div>'; print '<div class="inline-block divButAction"><span class="butActionRefused" title="' . $langs->trans("DisabledBecauseReplacedInvoice") . '">' . $langs->trans('ClassifyCanceled') . '</span></div>';
} else { }
else
{
print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?facid=' . $object->id . '&amp;action=canceled">' . $langs->trans('ClassifyCanceled') . '</a></div>'; print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?facid=' . $object->id . '&amp;action=canceled">' . $langs->trans('ClassifyCanceled') . '</a></div>';
} }
} }
} }
}
// Clone // Clone
if (($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA) && $user->rights->facture->creer) if (($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA) && $user->rights->facture->creer)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment