diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 64825d62cbb..d5f913ae0dd 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -184,6 +184,8 @@ print '| ' . $langs->trans("NovemberMin") . ' | ';
print '' . $langs->trans("DecemberMin") . ' | ';
print '' . $langs->trans("Total") . ' | ';
+
+//TODO : Cannot work with PGSQL !, Change that with php treatment rather than big SQL query
$sql = "SELECT IF(aa.account_number IS NULL, 'Non pointe', aa.account_number) AS 'code comptable',";
$sql .= " IF(aa.label IS NULL, 'Non pointe', aa.label) AS 'Intitulé',";
$sql .= " ROUND(SUM(IF(MONTH(f.datef)=1,fd.total_ht,0)),2) AS 'Janvier',";
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index bec4156dbe0..07faaf92696 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -4,7 +4,7 @@
* Copyright (C) 2004-2012 Laurent Destailleur
* Copyright (C) 2005-2012 Regis Houssin
* Copyright (C) 2012 Marcos García
- * Copyright (C) 2012-2015 Philippe Grand
+ * Copyright (C) 2012-2016 Philippe Grand
* Copyright (C) 2015 Alexandre Spangaro
*
* This program is free software; you can redistribute it and/or modify
@@ -94,7 +94,7 @@ if ($rowid > 0)
// Define variables to know what current user can do on properties of user linked to edited member
if ($object->user_id)
{
- // $user est le user qui edite, $object->user_id est l'id de l'utilisateur lies au membre edite
+ // $ User is the user who edits, $ object->user_id is the id of the related user in the edited member
$caneditfielduser=((($user->id == $object->user_id) && $user->rights->user->self->creer)
|| (($user->id != $object->user_id) && $user->rights->user->user->creer));
$caneditpassworduser=((($user->id == $object->user_id) && $user->rights->user->self->password)
@@ -209,7 +209,7 @@ if (empty($reshook))
{
if ($result > 0)
{
- // Creation user
+ // User creation
$company = new Societe($db);
$result=$company->create_from_member($object,GETPOST('companyname'));
@@ -495,7 +495,7 @@ if (empty($reshook))
$error++;
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Nature")), null, 'errors');
}
- // Test si le login existe deja
+ // Tests if the login already exists
if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
{
if (empty($login)) {
@@ -550,11 +550,11 @@ if (empty($reshook))
{
$db->begin();
- // Email a peu pres correct et le login n'existe pas
+ // Email about right and login does not exist
$result=$object->create($user);
if ($result > 0)
{
- // Categories association
+ // Fundation categories
$memcats = GETPOST('memcats', 'array');
$object->setCategories($memcats);
@@ -615,7 +615,7 @@ if (empty($reshook))
if ($result >= 0 && ! count($object->errors))
{
- // Send confirmation Email (selon param du type adherent sinon generique)
+ // Send confirmation email (according to parameters of member type. Otherwise generic)
if ($object->email && GETPOST("send_mail"))
{
$result=$object->send_an_email($adht->getMailOnValid(),$conf->global->ADHERENT_MAIL_VALID_SUBJECT,array(),array(),array(),"","",0,2);
@@ -1379,7 +1379,7 @@ else
$helpcontent.=dol_htmlentitiesbr($texttosend)."\n";
$label=$form->textwithpicto($tmp,$helpcontent,1,'help');
- // Cree un tableau formulaire
+ // Create an array
$formquestion=array();
if ($object->email) $formquestion[]=array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $label, 'value' => (! empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL)?'true':'false'));
if ($backtopage) $formquestion[]=array('type' => 'hidden', 'name' => 'backtopage', 'value' => ($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]));
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 2bd9ce1d8a4..0a886230100 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -756,7 +756,8 @@ if (! $sall)
$sql.= ' f.datef, f.date_lim_reglement,';
$sql.= ' f.paye, f.fk_statut,';
$sql.= ' f.datec, f.tms,';
- $sql.= ' s.rowid, s.nom, s.town, s.zip, s.fk_pays, s.code_client, s.client';
+ $sql.= ' s.rowid, s.nom, s.town, s.zip, s.fk_pays, s.code_client, s.client, typent.code';
+ $sql.= ' ,state.code_departement, state.nom';
}
else
{
diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index d699a9fc7a6..b6043539c0d 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -1,7 +1,7 @@
* Copyright (C) 2012-2015 Juanjo Menent
- * Copyright (C) 2013-2015 Philippe Grand
+ * Copyright (C) 2013-2016 Philippe Grand
* Copyright (C) 2015 Alexandre Spangaro
* Copyright (C) 2015 Benoit Bruchard
*
@@ -90,12 +90,12 @@ else if ($action == 'setdoc')
{
if (dolibarr_set_const($db, "DON_ADDON_MODEL",$value,'chaine',0,'',$conf->entity))
{
- // La constante qui a ete lue en avant du nouveau set
- // on passe donc par une variable pour avoir un affichage coherent
+ // The constant that was read before the new set
+ // So we go through a variable for a coherent display
$conf->global->DON_ADDON_MODEL = $value;
}
- // On active le modele
+ // It enables the model
$ret = delDocumentModel($value, $type);
if ($ret > 0)
{
@@ -321,7 +321,7 @@ if (preg_match('/fr/i',$conf->global->MAIN_INFO_SOCIETE_COUNTRY))
print '
';
print load_fiche_titre($langs->trans("DonationsModels"));
-// Defini tableau def de modele
+// Defined the template definition table
$type='donation';
$def = array();
$sql = "SELECT nom";
@@ -408,7 +408,7 @@ if (is_resource($handle))
print "";
}
- // Defaut
+ // Default
if ($conf->global->DON_ADDON_MODEL == "$name")
{
print "";
|