From 26899dc22b11c10637f34b0ef9c3093374a9e3a1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 03:49:10 +0000 Subject: [PATCH 001/166] Fix: img extension was not correctly managed From 183a2c6fb9eda598adc75f421b3503d564f240af Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 18 Jul 2011 08:59:42 +0000 Subject: [PATCH 002/166] Fix: uniformize code From 75051bff42f739e552cb43dd2d91755d844b5d1a Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 18 Jul 2011 10:22:22 +0000 Subject: [PATCH 003/166] Fix: bad gmap mode From 62ded7f4268c8764d2fdf33132ab6bf15df17492 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 11:11:19 +0000 Subject: [PATCH 004/166] Fix: Several fix in vat calculation. Add warning to say deposit invoices are not included. From 181e54f548cbd813a7a1b8b9485df7a5a39fef81 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 11:31:53 +0000 Subject: [PATCH 005/166] Fix: SMS setup From 5b9e0105cee07c8daa65cc1b8056741e311253e3 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 18 Jul 2011 16:37:14 +0000 Subject: [PATCH 006/166] Fix: Show LastName or ThirdPartyName label correctly (very important for the Hispanic community) --- htdocs/societe/soc.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 93ba18473fa..f843e20558c 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -26,7 +26,7 @@ * \file htdocs/societe/soc.php * \ingroup societe * \brief Third party card page - * \version $Id: soc.php,v 1.123 2011/07/18 16:48:26 simnandez Exp $ + * \version $Id: soc.php,v 1.122 2011/07/18 16:37:14 simnandez Exp $ */ require("../main.inc.php"); @@ -275,7 +275,7 @@ if (empty($reshook)) dol_syslog("This thirdparty is a personal people",LOG_DEBUG); $contact=new Contact($db); - $contact->civilite_id=$object->civilite_id; + $contact->civilite_id = $object->civilite_id; $contact->name=$object->nom_particulier; $contact->firstname=$object->prenom; $contact->address=$object->address; @@ -283,13 +283,10 @@ if (empty($reshook)) $contact->cp=$object->cp; $contact->town=$object->town; $contact->ville=$object->ville; - $contact->fk_departement=$object->departement_id; - $contact->fk_pays=$object->pays_id; + $contact->fk_pays=$object->fk_pays; $contact->socid=$object->id; // fk_soc $contact->status=1; $contact->email=$object->email; - $contact->phone_pro=$object->tel; - $contact->fax=$object->fax; $contact->priv=0; $result=$contact->create($user); @@ -1968,5 +1965,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/18 16:48:26 $ - $Revision: 1.123 $'); +llxFooter('$Date: 2011/07/18 16:37:14 $ - $Revision: 1.122 $'); ?> \ No newline at end of file From ffa68878c5c3c5f3b209fc3e957aa9c95aed3fe5 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 18 Jul 2011 16:48:26 +0000 Subject: [PATCH 007/166] Fix: Correct and add more data to the contact into Private individual creation --- htdocs/societe/soc.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index f843e20558c..93ba18473fa 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -26,7 +26,7 @@ * \file htdocs/societe/soc.php * \ingroup societe * \brief Third party card page - * \version $Id: soc.php,v 1.122 2011/07/18 16:37:14 simnandez Exp $ + * \version $Id: soc.php,v 1.123 2011/07/18 16:48:26 simnandez Exp $ */ require("../main.inc.php"); @@ -275,7 +275,7 @@ if (empty($reshook)) dol_syslog("This thirdparty is a personal people",LOG_DEBUG); $contact=new Contact($db); - $contact->civilite_id = $object->civilite_id; + $contact->civilite_id=$object->civilite_id; $contact->name=$object->nom_particulier; $contact->firstname=$object->prenom; $contact->address=$object->address; @@ -283,10 +283,13 @@ if (empty($reshook)) $contact->cp=$object->cp; $contact->town=$object->town; $contact->ville=$object->ville; - $contact->fk_pays=$object->fk_pays; + $contact->fk_departement=$object->departement_id; + $contact->fk_pays=$object->pays_id; $contact->socid=$object->id; // fk_soc $contact->status=1; $contact->email=$object->email; + $contact->phone_pro=$object->tel; + $contact->fax=$object->fax; $contact->priv=0; $result=$contact->create($user); @@ -1965,5 +1968,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/18 16:37:14 $ - $Revision: 1.122 $'); +llxFooter('$Date: 2011/07/18 16:48:26 $ - $Revision: 1.123 $'); ?> \ No newline at end of file From 2bea83f62ea6287aed23db0920e477c0d63a2a7d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 17:54:09 +0000 Subject: [PATCH 008/166] Fix: Translation of id prof From 1fd39a20ce9f7e07f6f4d5b25540a94c61cd4da9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:07:36 +0000 Subject: [PATCH 009/166] Fix: encoding From 0914fd7742fa80ece1019e08d1edf8db46fa597f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:08:35 +0000 Subject: [PATCH 010/166] Enable SMS menu --- htdocs/includes/menus/init_menu_auguria.sql | 8 ++++---- htdocs/includes/menus/standard/eldy.lib.php | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql index 1f864826999..7d9b48b817b 100644 --- a/htdocs/includes/menus/init_menu_auguria.sql +++ b/htdocs/includes/menus/init_menu_auguria.sql @@ -1,6 +1,6 @@ -- --- $Id: init_menu_auguria.sql,v 1.123 2011/07/18 19:25:48 eldy Exp $ --- $Revision: 1.123 $ +-- $Id: init_menu_auguria.sql,v 1.122 2011/07/18 18:08:35 eldy Exp $ +-- $Revision: 1.122 $ -- -- Menu base entries -- This file is loaded when a menu handler base is activated (auguria, etc..) @@ -254,7 +254,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4205__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=outofdate', 'MenuMembersNotUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 4, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4206__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=uptodate', 'MenuMembersUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4208__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersStats', 1, 'members', '$user->rights->adherent->lire', '', 2, 7, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); -- Members - Subscriptions insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4300__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/index.php?leftmenu=accountancy&mainmenu=members', 'Subscriptions', 0, 'compta', '$user->rights->adherent->cotisation->lire', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4301__+MAX_llx_menu__, 'members', '', 4300__+MAX_llx_menu__, '/adherents/liste.php?statut=-1&leftmenu=accountancy&mainmenu=members', 'NewSubscription', 1, 'compta', '$user->rights->adherent->cotisation->creer', '', 2, 0, __ENTITY__); @@ -263,7 +263,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled && $conf->export->enabled', __HANDLER__, 'left', 4501__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/exports/index.php?leftmenu=export', 'Datas', 1, 'members', '$user->rights->adherent->export', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4502__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/htpasswd.php?leftmenu=export', 'Filehtpasswd', 1, 'members', '$user->rights->adherent->export', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4503__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/cartes/carte.php?leftmenu=export', 'MembersCards', 1, 'members', '$user->rights->adherent->export', '', 2, 2, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersTypes', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersType', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4701__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members&action=create', 'New', 1, 'members', '$user->rights->adherent->configurer', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4702__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'List', 1, 'members', '$user->rights->adherent->configurer', '', 2, 1, __ENTITY__); -- Members - Category member diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php index 8c81bf6ea3a..893899ae5cd 100644 --- a/htdocs/includes/menus/standard/eldy.lib.php +++ b/htdocs/includes/menus/standard/eldy.lib.php @@ -21,7 +21,7 @@ /** * \file htdocs/includes/menus/standard/eldy.lib.php * \brief Library for file eldy menus - * \version $Id: eldy.lib.php,v 1.60 2011/07/18 20:19:41 eldy Exp $ + * \version $Id: eldy.lib.php,v 1.59 2011/07/18 18:08:35 eldy Exp $ */ @@ -460,13 +460,13 @@ function print_eldy_menu($db,$atarget,$type_user) else { $url=dol_buildpath($newTabMenu[$i]['url'],1); + if (! preg_match('/\?/',$url)) $url.='?'; + else $url.='&'; if (! preg_match('/mainmenu/i',$url) || ! preg_match('/leftmenu/i',$url)) { - if (! preg_match('/\?/',$url)) $url.='?'; - else $url.='&'; - $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu='; + $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=&'; } - //$url.="idmenu=".$newTabMenu[$i]['rowid']; // Already done by menuLoad + $url.="idmenu=".$newTabMenu[$i]['rowid']; } $url=preg_replace('/__LOGIN__/',$user->login,$url); From 563b5703f20d92c69b4fbb2da515b77f5f9c44d2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:09:04 +0000 Subject: [PATCH 011/166] Uniformize code From d7be7729227f7bfffc8a7271bbd41eb3a31b330e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:10:28 +0000 Subject: [PATCH 012/166] Prepare 3.1.0 From f05f215cbad9c292da9c2deba2fe675ade424f91 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:31:53 +0000 Subject: [PATCH 013/166] Prepare 3.1.0 From 99b55fa40c9be4d19449a5965c0a321ea0ff3750 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 19:25:46 +0000 Subject: [PATCH 014/166] Fix: Debug new features --- htdocs/includes/menus/init_menu_auguria.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql index 7d9b48b817b..1f864826999 100644 --- a/htdocs/includes/menus/init_menu_auguria.sql +++ b/htdocs/includes/menus/init_menu_auguria.sql @@ -1,6 +1,6 @@ -- --- $Id: init_menu_auguria.sql,v 1.122 2011/07/18 18:08:35 eldy Exp $ --- $Revision: 1.122 $ +-- $Id: init_menu_auguria.sql,v 1.123 2011/07/18 19:25:48 eldy Exp $ +-- $Revision: 1.123 $ -- -- Menu base entries -- This file is loaded when a menu handler base is activated (auguria, etc..) @@ -254,7 +254,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4205__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=outofdate', 'MenuMembersNotUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 4, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4206__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=uptodate', 'MenuMembersUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4208__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersStats', 1, 'members', '$user->rights->adherent->lire', '', 2, 7, __ENTITY__); -- Members - Subscriptions insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4300__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/index.php?leftmenu=accountancy&mainmenu=members', 'Subscriptions', 0, 'compta', '$user->rights->adherent->cotisation->lire', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4301__+MAX_llx_menu__, 'members', '', 4300__+MAX_llx_menu__, '/adherents/liste.php?statut=-1&leftmenu=accountancy&mainmenu=members', 'NewSubscription', 1, 'compta', '$user->rights->adherent->cotisation->creer', '', 2, 0, __ENTITY__); @@ -263,7 +263,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled && $conf->export->enabled', __HANDLER__, 'left', 4501__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/exports/index.php?leftmenu=export', 'Datas', 1, 'members', '$user->rights->adherent->export', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4502__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/htpasswd.php?leftmenu=export', 'Filehtpasswd', 1, 'members', '$user->rights->adherent->export', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4503__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/cartes/carte.php?leftmenu=export', 'MembersCards', 1, 'members', '$user->rights->adherent->export', '', 2, 2, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersType', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersTypes', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4701__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members&action=create', 'New', 1, 'members', '$user->rights->adherent->configurer', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4702__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'List', 1, 'members', '$user->rights->adherent->configurer', '', 2, 1, __ENTITY__); -- Members - Category member From f828672ce4f730c2966fb8be7995fa59106e4ec8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 20:03:42 +0000 Subject: [PATCH 015/166] Update screenshots From 178f043bab113ae759a8592f9202e39729b07ba0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 20:19:41 +0000 Subject: [PATCH 016/166] Try a better fix to avoid duplicate idmenu into url --- htdocs/includes/menus/standard/eldy.lib.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php index 893899ae5cd..8c81bf6ea3a 100644 --- a/htdocs/includes/menus/standard/eldy.lib.php +++ b/htdocs/includes/menus/standard/eldy.lib.php @@ -21,7 +21,7 @@ /** * \file htdocs/includes/menus/standard/eldy.lib.php * \brief Library for file eldy menus - * \version $Id: eldy.lib.php,v 1.59 2011/07/18 18:08:35 eldy Exp $ + * \version $Id: eldy.lib.php,v 1.60 2011/07/18 20:19:41 eldy Exp $ */ @@ -460,13 +460,13 @@ function print_eldy_menu($db,$atarget,$type_user) else { $url=dol_buildpath($newTabMenu[$i]['url'],1); - if (! preg_match('/\?/',$url)) $url.='?'; - else $url.='&'; if (! preg_match('/mainmenu/i',$url) || ! preg_match('/leftmenu/i',$url)) { - $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=&'; + if (! preg_match('/\?/',$url)) $url.='?'; + else $url.='&'; + $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu='; } - $url.="idmenu=".$newTabMenu[$i]['rowid']; + //$url.="idmenu=".$newTabMenu[$i]['rowid']; // Already done by menuLoad } $url=preg_replace('/__LOGIN__/',$user->login,$url); From a179cfe5a357ae73b2abc19f4d14fb08cf8bea63 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 21:08:46 +0000 Subject: [PATCH 017/166] Fix: Trans From 802ff8e930d70064891306f986dfa4564aae794b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:28:30 +0000 Subject: [PATCH 018/166] Delete of security event keep add a delete event From f4a6963646627b4d1946b3f5a3fb4a7acf5746a1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:35:06 +0000 Subject: [PATCH 019/166] Doxygen From 06850ce6a274a9dbc8b1ea627dba40d1c2b52be7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:37:03 +0000 Subject: [PATCH 020/166] Nicer look From 4e22c9e44c72cd07c7fd5f696d716b1e28e8fa71 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 03:49:10 +0000 Subject: [PATCH 021/166] Fix: img extension was not correctly managed From 50441e05c6a8c13cc6f318509850664456c4f628 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 18 Jul 2011 08:59:42 +0000 Subject: [PATCH 022/166] Fix: uniformize code From 742047648713aa11be80bf63743ecd70d3542095 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 18 Jul 2011 10:22:22 +0000 Subject: [PATCH 023/166] Fix: bad gmap mode From a9af6a245177543c760d72bc97a99944143fc0d5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 11:11:19 +0000 Subject: [PATCH 024/166] Fix: Several fix in vat calculation. Add warning to say deposit invoices are not included. From d45ef142c0f14de516640b25d8e023242bab472f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 11:31:53 +0000 Subject: [PATCH 025/166] Fix: SMS setup From 0f19ef3ed5d8396f87d50b6d8d55d4677775c984 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 18 Jul 2011 16:37:14 +0000 Subject: [PATCH 026/166] Fix: Show LastName or ThirdPartyName label correctly (very important for the Hispanic community) --- htdocs/societe/soc.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 93ba18473fa..f843e20558c 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -26,7 +26,7 @@ * \file htdocs/societe/soc.php * \ingroup societe * \brief Third party card page - * \version $Id: soc.php,v 1.123 2011/07/18 16:48:26 simnandez Exp $ + * \version $Id: soc.php,v 1.122 2011/07/18 16:37:14 simnandez Exp $ */ require("../main.inc.php"); @@ -275,7 +275,7 @@ if (empty($reshook)) dol_syslog("This thirdparty is a personal people",LOG_DEBUG); $contact=new Contact($db); - $contact->civilite_id=$object->civilite_id; + $contact->civilite_id = $object->civilite_id; $contact->name=$object->nom_particulier; $contact->firstname=$object->prenom; $contact->address=$object->address; @@ -283,13 +283,10 @@ if (empty($reshook)) $contact->cp=$object->cp; $contact->town=$object->town; $contact->ville=$object->ville; - $contact->fk_departement=$object->departement_id; - $contact->fk_pays=$object->pays_id; + $contact->fk_pays=$object->fk_pays; $contact->socid=$object->id; // fk_soc $contact->status=1; $contact->email=$object->email; - $contact->phone_pro=$object->tel; - $contact->fax=$object->fax; $contact->priv=0; $result=$contact->create($user); @@ -1968,5 +1965,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/18 16:48:26 $ - $Revision: 1.123 $'); +llxFooter('$Date: 2011/07/18 16:37:14 $ - $Revision: 1.122 $'); ?> \ No newline at end of file From 2852d6c7bc2d296c613cc42ace8f22e5d32ffe86 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 18 Jul 2011 16:48:26 +0000 Subject: [PATCH 027/166] Fix: Correct and add more data to the contact into Private individual creation --- htdocs/societe/soc.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index f843e20558c..93ba18473fa 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -26,7 +26,7 @@ * \file htdocs/societe/soc.php * \ingroup societe * \brief Third party card page - * \version $Id: soc.php,v 1.122 2011/07/18 16:37:14 simnandez Exp $ + * \version $Id: soc.php,v 1.123 2011/07/18 16:48:26 simnandez Exp $ */ require("../main.inc.php"); @@ -275,7 +275,7 @@ if (empty($reshook)) dol_syslog("This thirdparty is a personal people",LOG_DEBUG); $contact=new Contact($db); - $contact->civilite_id = $object->civilite_id; + $contact->civilite_id=$object->civilite_id; $contact->name=$object->nom_particulier; $contact->firstname=$object->prenom; $contact->address=$object->address; @@ -283,10 +283,13 @@ if (empty($reshook)) $contact->cp=$object->cp; $contact->town=$object->town; $contact->ville=$object->ville; - $contact->fk_pays=$object->fk_pays; + $contact->fk_departement=$object->departement_id; + $contact->fk_pays=$object->pays_id; $contact->socid=$object->id; // fk_soc $contact->status=1; $contact->email=$object->email; + $contact->phone_pro=$object->tel; + $contact->fax=$object->fax; $contact->priv=0; $result=$contact->create($user); @@ -1965,5 +1968,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/18 16:37:14 $ - $Revision: 1.122 $'); +llxFooter('$Date: 2011/07/18 16:48:26 $ - $Revision: 1.123 $'); ?> \ No newline at end of file From fa278810ebcea69e63960009b1b6e8433d2a34ee Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 17:54:09 +0000 Subject: [PATCH 028/166] Fix: Translation of id prof From e4f973d79df4aa6f62e4713b258cef8ff628f4ab Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:07:36 +0000 Subject: [PATCH 029/166] Fix: encoding From dc81f9fb9a9a1f2fd46a86947fd3bbf6f3689221 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:08:35 +0000 Subject: [PATCH 030/166] Enable SMS menu --- htdocs/includes/menus/init_menu_auguria.sql | 8 ++++---- htdocs/includes/menus/standard/eldy.lib.php | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql index 1f864826999..7d9b48b817b 100644 --- a/htdocs/includes/menus/init_menu_auguria.sql +++ b/htdocs/includes/menus/init_menu_auguria.sql @@ -1,6 +1,6 @@ -- --- $Id: init_menu_auguria.sql,v 1.123 2011/07/18 19:25:48 eldy Exp $ --- $Revision: 1.123 $ +-- $Id: init_menu_auguria.sql,v 1.122 2011/07/18 18:08:35 eldy Exp $ +-- $Revision: 1.122 $ -- -- Menu base entries -- This file is loaded when a menu handler base is activated (auguria, etc..) @@ -254,7 +254,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4205__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=outofdate', 'MenuMembersNotUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 4, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4206__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=uptodate', 'MenuMembersUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4208__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersStats', 1, 'members', '$user->rights->adherent->lire', '', 2, 7, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); -- Members - Subscriptions insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4300__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/index.php?leftmenu=accountancy&mainmenu=members', 'Subscriptions', 0, 'compta', '$user->rights->adherent->cotisation->lire', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4301__+MAX_llx_menu__, 'members', '', 4300__+MAX_llx_menu__, '/adherents/liste.php?statut=-1&leftmenu=accountancy&mainmenu=members', 'NewSubscription', 1, 'compta', '$user->rights->adherent->cotisation->creer', '', 2, 0, __ENTITY__); @@ -263,7 +263,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled && $conf->export->enabled', __HANDLER__, 'left', 4501__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/exports/index.php?leftmenu=export', 'Datas', 1, 'members', '$user->rights->adherent->export', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4502__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/htpasswd.php?leftmenu=export', 'Filehtpasswd', 1, 'members', '$user->rights->adherent->export', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4503__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/cartes/carte.php?leftmenu=export', 'MembersCards', 1, 'members', '$user->rights->adherent->export', '', 2, 2, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersTypes', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersType', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4701__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members&action=create', 'New', 1, 'members', '$user->rights->adherent->configurer', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4702__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'List', 1, 'members', '$user->rights->adherent->configurer', '', 2, 1, __ENTITY__); -- Members - Category member diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php index 8c81bf6ea3a..893899ae5cd 100644 --- a/htdocs/includes/menus/standard/eldy.lib.php +++ b/htdocs/includes/menus/standard/eldy.lib.php @@ -21,7 +21,7 @@ /** * \file htdocs/includes/menus/standard/eldy.lib.php * \brief Library for file eldy menus - * \version $Id: eldy.lib.php,v 1.60 2011/07/18 20:19:41 eldy Exp $ + * \version $Id: eldy.lib.php,v 1.59 2011/07/18 18:08:35 eldy Exp $ */ @@ -460,13 +460,13 @@ function print_eldy_menu($db,$atarget,$type_user) else { $url=dol_buildpath($newTabMenu[$i]['url'],1); + if (! preg_match('/\?/',$url)) $url.='?'; + else $url.='&'; if (! preg_match('/mainmenu/i',$url) || ! preg_match('/leftmenu/i',$url)) { - if (! preg_match('/\?/',$url)) $url.='?'; - else $url.='&'; - $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu='; + $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=&'; } - //$url.="idmenu=".$newTabMenu[$i]['rowid']; // Already done by menuLoad + $url.="idmenu=".$newTabMenu[$i]['rowid']; } $url=preg_replace('/__LOGIN__/',$user->login,$url); From 0f711f2946ebe206f28668223ecbc9533bb4f27e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:09:04 +0000 Subject: [PATCH 031/166] Uniformize code From c3db7458a2350220eca1f9f1b6f4fd61c2cb590a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:10:28 +0000 Subject: [PATCH 032/166] Prepare 3.1.0 From 34d2b8b18f6d2ff49a92f6f6fb6076cb13ac54eb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:31:53 +0000 Subject: [PATCH 033/166] Prepare 3.1.0 From 2982129f32ff2298b9ef42b3a2daf32d99b62f6e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 19:25:46 +0000 Subject: [PATCH 034/166] Fix: Debug new features --- htdocs/includes/menus/init_menu_auguria.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql index 7d9b48b817b..1f864826999 100644 --- a/htdocs/includes/menus/init_menu_auguria.sql +++ b/htdocs/includes/menus/init_menu_auguria.sql @@ -1,6 +1,6 @@ -- --- $Id: init_menu_auguria.sql,v 1.122 2011/07/18 18:08:35 eldy Exp $ --- $Revision: 1.122 $ +-- $Id: init_menu_auguria.sql,v 1.123 2011/07/18 19:25:48 eldy Exp $ +-- $Revision: 1.123 $ -- -- Menu base entries -- This file is loaded when a menu handler base is activated (auguria, etc..) @@ -254,7 +254,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4205__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=outofdate', 'MenuMembersNotUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 4, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4206__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=uptodate', 'MenuMembersUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4208__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersStats', 1, 'members', '$user->rights->adherent->lire', '', 2, 7, __ENTITY__); -- Members - Subscriptions insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4300__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/index.php?leftmenu=accountancy&mainmenu=members', 'Subscriptions', 0, 'compta', '$user->rights->adherent->cotisation->lire', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4301__+MAX_llx_menu__, 'members', '', 4300__+MAX_llx_menu__, '/adherents/liste.php?statut=-1&leftmenu=accountancy&mainmenu=members', 'NewSubscription', 1, 'compta', '$user->rights->adherent->cotisation->creer', '', 2, 0, __ENTITY__); @@ -263,7 +263,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled && $conf->export->enabled', __HANDLER__, 'left', 4501__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/exports/index.php?leftmenu=export', 'Datas', 1, 'members', '$user->rights->adherent->export', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4502__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/htpasswd.php?leftmenu=export', 'Filehtpasswd', 1, 'members', '$user->rights->adherent->export', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4503__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/cartes/carte.php?leftmenu=export', 'MembersCards', 1, 'members', '$user->rights->adherent->export', '', 2, 2, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersType', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersTypes', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4701__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members&action=create', 'New', 1, 'members', '$user->rights->adherent->configurer', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4702__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'List', 1, 'members', '$user->rights->adherent->configurer', '', 2, 1, __ENTITY__); -- Members - Category member From 497bc81ffbea304e55abf817b737897eb91809e0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 20:03:42 +0000 Subject: [PATCH 035/166] Update screenshots From c0aedebf45e13851ad38c756bfaeac9857b052ce Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 20:19:41 +0000 Subject: [PATCH 036/166] Try a better fix to avoid duplicate idmenu into url --- htdocs/includes/menus/standard/eldy.lib.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php index 893899ae5cd..8c81bf6ea3a 100644 --- a/htdocs/includes/menus/standard/eldy.lib.php +++ b/htdocs/includes/menus/standard/eldy.lib.php @@ -21,7 +21,7 @@ /** * \file htdocs/includes/menus/standard/eldy.lib.php * \brief Library for file eldy menus - * \version $Id: eldy.lib.php,v 1.59 2011/07/18 18:08:35 eldy Exp $ + * \version $Id: eldy.lib.php,v 1.60 2011/07/18 20:19:41 eldy Exp $ */ @@ -460,13 +460,13 @@ function print_eldy_menu($db,$atarget,$type_user) else { $url=dol_buildpath($newTabMenu[$i]['url'],1); - if (! preg_match('/\?/',$url)) $url.='?'; - else $url.='&'; if (! preg_match('/mainmenu/i',$url) || ! preg_match('/leftmenu/i',$url)) { - $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=&'; + if (! preg_match('/\?/',$url)) $url.='?'; + else $url.='&'; + $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu='; } - $url.="idmenu=".$newTabMenu[$i]['rowid']; + //$url.="idmenu=".$newTabMenu[$i]['rowid']; // Already done by menuLoad } $url=preg_replace('/__LOGIN__/',$user->login,$url); From 9a22c855b5dda77fb9f6cc8a76af2b93425b6bbe Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 21:08:46 +0000 Subject: [PATCH 037/166] Fix: Trans From 21cd83c4873cabbf0c69b0de3aa656e811132b25 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:28:30 +0000 Subject: [PATCH 038/166] Delete of security event keep add a delete event From 01e86a34dbaeb33eb07630f545719731aa6e9379 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:35:06 +0000 Subject: [PATCH 039/166] Doxygen From 2c7514d0ca937185b86d7e4fa844abb3c1646801 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:37:03 +0000 Subject: [PATCH 040/166] Nicer look From af36296de87cd2a04528ef21f8481cfcacc5afed Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 03:49:10 +0000 Subject: [PATCH 041/166] Fix: img extension was not correctly managed From 8489471c3193c156818b123c26f764519db60944 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 18 Jul 2011 08:59:42 +0000 Subject: [PATCH 042/166] Fix: uniformize code From e41fe5a5737b9ec210a2c4e083bbe0d370af5207 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 18 Jul 2011 10:22:22 +0000 Subject: [PATCH 043/166] Fix: bad gmap mode From 098837d239e89203e38c5c9cb45f2333aab081c3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 11:11:19 +0000 Subject: [PATCH 044/166] Fix: Several fix in vat calculation. Add warning to say deposit invoices are not included. From 3ef6cd3d9d18e56113fe292657b849ad3dbbf62b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 11:31:53 +0000 Subject: [PATCH 045/166] Fix: SMS setup From 9c753335a7efb38ad59c27b51949e25551011c06 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 18 Jul 2011 16:37:14 +0000 Subject: [PATCH 046/166] Fix: Show LastName or ThirdPartyName label correctly (very important for the Hispanic community) --- htdocs/societe/soc.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 93ba18473fa..f843e20558c 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -26,7 +26,7 @@ * \file htdocs/societe/soc.php * \ingroup societe * \brief Third party card page - * \version $Id: soc.php,v 1.123 2011/07/18 16:48:26 simnandez Exp $ + * \version $Id: soc.php,v 1.122 2011/07/18 16:37:14 simnandez Exp $ */ require("../main.inc.php"); @@ -275,7 +275,7 @@ if (empty($reshook)) dol_syslog("This thirdparty is a personal people",LOG_DEBUG); $contact=new Contact($db); - $contact->civilite_id=$object->civilite_id; + $contact->civilite_id = $object->civilite_id; $contact->name=$object->nom_particulier; $contact->firstname=$object->prenom; $contact->address=$object->address; @@ -283,13 +283,10 @@ if (empty($reshook)) $contact->cp=$object->cp; $contact->town=$object->town; $contact->ville=$object->ville; - $contact->fk_departement=$object->departement_id; - $contact->fk_pays=$object->pays_id; + $contact->fk_pays=$object->fk_pays; $contact->socid=$object->id; // fk_soc $contact->status=1; $contact->email=$object->email; - $contact->phone_pro=$object->tel; - $contact->fax=$object->fax; $contact->priv=0; $result=$contact->create($user); @@ -1968,5 +1965,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/18 16:48:26 $ - $Revision: 1.123 $'); +llxFooter('$Date: 2011/07/18 16:37:14 $ - $Revision: 1.122 $'); ?> \ No newline at end of file From bbeb19c13c93f132b70d6c068f22aedc249a78bb Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 18 Jul 2011 16:48:26 +0000 Subject: [PATCH 047/166] Fix: Correct and add more data to the contact into Private individual creation --- htdocs/societe/soc.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index f843e20558c..93ba18473fa 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -26,7 +26,7 @@ * \file htdocs/societe/soc.php * \ingroup societe * \brief Third party card page - * \version $Id: soc.php,v 1.122 2011/07/18 16:37:14 simnandez Exp $ + * \version $Id: soc.php,v 1.123 2011/07/18 16:48:26 simnandez Exp $ */ require("../main.inc.php"); @@ -275,7 +275,7 @@ if (empty($reshook)) dol_syslog("This thirdparty is a personal people",LOG_DEBUG); $contact=new Contact($db); - $contact->civilite_id = $object->civilite_id; + $contact->civilite_id=$object->civilite_id; $contact->name=$object->nom_particulier; $contact->firstname=$object->prenom; $contact->address=$object->address; @@ -283,10 +283,13 @@ if (empty($reshook)) $contact->cp=$object->cp; $contact->town=$object->town; $contact->ville=$object->ville; - $contact->fk_pays=$object->fk_pays; + $contact->fk_departement=$object->departement_id; + $contact->fk_pays=$object->pays_id; $contact->socid=$object->id; // fk_soc $contact->status=1; $contact->email=$object->email; + $contact->phone_pro=$object->tel; + $contact->fax=$object->fax; $contact->priv=0; $result=$contact->create($user); @@ -1965,5 +1968,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/18 16:37:14 $ - $Revision: 1.122 $'); +llxFooter('$Date: 2011/07/18 16:48:26 $ - $Revision: 1.123 $'); ?> \ No newline at end of file From 72a8899529e77258aa78cdebc2e457f2fca7f79b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 17:54:09 +0000 Subject: [PATCH 048/166] Fix: Translation of id prof From d16d5c87b00c879f9f022150176470b9e880d14e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:07:36 +0000 Subject: [PATCH 049/166] Fix: encoding From 7243302e107377fd488fee7dad1c8b83eef38bb6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:08:35 +0000 Subject: [PATCH 050/166] Enable SMS menu --- htdocs/includes/menus/init_menu_auguria.sql | 8 ++++---- htdocs/includes/menus/standard/eldy.lib.php | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql index 1f864826999..7d9b48b817b 100644 --- a/htdocs/includes/menus/init_menu_auguria.sql +++ b/htdocs/includes/menus/init_menu_auguria.sql @@ -1,6 +1,6 @@ -- --- $Id: init_menu_auguria.sql,v 1.123 2011/07/18 19:25:48 eldy Exp $ --- $Revision: 1.123 $ +-- $Id: init_menu_auguria.sql,v 1.122 2011/07/18 18:08:35 eldy Exp $ +-- $Revision: 1.122 $ -- -- Menu base entries -- This file is loaded when a menu handler base is activated (auguria, etc..) @@ -254,7 +254,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4205__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=outofdate', 'MenuMembersNotUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 4, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4206__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=uptodate', 'MenuMembersUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4208__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersStats', 1, 'members', '$user->rights->adherent->lire', '', 2, 7, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); -- Members - Subscriptions insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4300__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/index.php?leftmenu=accountancy&mainmenu=members', 'Subscriptions', 0, 'compta', '$user->rights->adherent->cotisation->lire', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4301__+MAX_llx_menu__, 'members', '', 4300__+MAX_llx_menu__, '/adherents/liste.php?statut=-1&leftmenu=accountancy&mainmenu=members', 'NewSubscription', 1, 'compta', '$user->rights->adherent->cotisation->creer', '', 2, 0, __ENTITY__); @@ -263,7 +263,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled && $conf->export->enabled', __HANDLER__, 'left', 4501__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/exports/index.php?leftmenu=export', 'Datas', 1, 'members', '$user->rights->adherent->export', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4502__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/htpasswd.php?leftmenu=export', 'Filehtpasswd', 1, 'members', '$user->rights->adherent->export', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4503__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/cartes/carte.php?leftmenu=export', 'MembersCards', 1, 'members', '$user->rights->adherent->export', '', 2, 2, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersTypes', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersType', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4701__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members&action=create', 'New', 1, 'members', '$user->rights->adherent->configurer', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4702__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'List', 1, 'members', '$user->rights->adherent->configurer', '', 2, 1, __ENTITY__); -- Members - Category member diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php index 8c81bf6ea3a..893899ae5cd 100644 --- a/htdocs/includes/menus/standard/eldy.lib.php +++ b/htdocs/includes/menus/standard/eldy.lib.php @@ -21,7 +21,7 @@ /** * \file htdocs/includes/menus/standard/eldy.lib.php * \brief Library for file eldy menus - * \version $Id: eldy.lib.php,v 1.60 2011/07/18 20:19:41 eldy Exp $ + * \version $Id: eldy.lib.php,v 1.59 2011/07/18 18:08:35 eldy Exp $ */ @@ -460,13 +460,13 @@ function print_eldy_menu($db,$atarget,$type_user) else { $url=dol_buildpath($newTabMenu[$i]['url'],1); + if (! preg_match('/\?/',$url)) $url.='?'; + else $url.='&'; if (! preg_match('/mainmenu/i',$url) || ! preg_match('/leftmenu/i',$url)) { - if (! preg_match('/\?/',$url)) $url.='?'; - else $url.='&'; - $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu='; + $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=&'; } - //$url.="idmenu=".$newTabMenu[$i]['rowid']; // Already done by menuLoad + $url.="idmenu=".$newTabMenu[$i]['rowid']; } $url=preg_replace('/__LOGIN__/',$user->login,$url); From bdda992dd43409a5039f3c20d2228fd420d4b42f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:09:04 +0000 Subject: [PATCH 051/166] Uniformize code From 977c622e2251519aa2784b6feb5abad6a021ef55 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:10:28 +0000 Subject: [PATCH 052/166] Prepare 3.1.0 From a9c543cc0c3906582b634728ee6ecfece95f06f7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:31:53 +0000 Subject: [PATCH 053/166] Prepare 3.1.0 From df664ef18e7df8cb32dc6323119a200cf30fb95c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 19:25:46 +0000 Subject: [PATCH 054/166] Fix: Debug new features --- htdocs/includes/menus/init_menu_auguria.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql index 7d9b48b817b..1f864826999 100644 --- a/htdocs/includes/menus/init_menu_auguria.sql +++ b/htdocs/includes/menus/init_menu_auguria.sql @@ -1,6 +1,6 @@ -- --- $Id: init_menu_auguria.sql,v 1.122 2011/07/18 18:08:35 eldy Exp $ --- $Revision: 1.122 $ +-- $Id: init_menu_auguria.sql,v 1.123 2011/07/18 19:25:48 eldy Exp $ +-- $Revision: 1.123 $ -- -- Menu base entries -- This file is loaded when a menu handler base is activated (auguria, etc..) @@ -254,7 +254,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4205__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=outofdate', 'MenuMembersNotUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 4, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4206__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=uptodate', 'MenuMembersUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4208__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersStats', 1, 'members', '$user->rights->adherent->lire', '', 2, 7, __ENTITY__); -- Members - Subscriptions insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4300__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/index.php?leftmenu=accountancy&mainmenu=members', 'Subscriptions', 0, 'compta', '$user->rights->adherent->cotisation->lire', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4301__+MAX_llx_menu__, 'members', '', 4300__+MAX_llx_menu__, '/adherents/liste.php?statut=-1&leftmenu=accountancy&mainmenu=members', 'NewSubscription', 1, 'compta', '$user->rights->adherent->cotisation->creer', '', 2, 0, __ENTITY__); @@ -263,7 +263,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled && $conf->export->enabled', __HANDLER__, 'left', 4501__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/exports/index.php?leftmenu=export', 'Datas', 1, 'members', '$user->rights->adherent->export', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4502__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/htpasswd.php?leftmenu=export', 'Filehtpasswd', 1, 'members', '$user->rights->adherent->export', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4503__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/cartes/carte.php?leftmenu=export', 'MembersCards', 1, 'members', '$user->rights->adherent->export', '', 2, 2, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersType', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersTypes', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4701__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members&action=create', 'New', 1, 'members', '$user->rights->adherent->configurer', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4702__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'List', 1, 'members', '$user->rights->adherent->configurer', '', 2, 1, __ENTITY__); -- Members - Category member From 8a5ceb5b8ed29481ce05347fea49fef3a598ec4f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 20:03:42 +0000 Subject: [PATCH 055/166] Update screenshots From 476443ef3aa31d516289066c2317bf34d7362cb3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 20:19:41 +0000 Subject: [PATCH 056/166] Try a better fix to avoid duplicate idmenu into url --- htdocs/includes/menus/standard/eldy.lib.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php index 893899ae5cd..8c81bf6ea3a 100644 --- a/htdocs/includes/menus/standard/eldy.lib.php +++ b/htdocs/includes/menus/standard/eldy.lib.php @@ -21,7 +21,7 @@ /** * \file htdocs/includes/menus/standard/eldy.lib.php * \brief Library for file eldy menus - * \version $Id: eldy.lib.php,v 1.59 2011/07/18 18:08:35 eldy Exp $ + * \version $Id: eldy.lib.php,v 1.60 2011/07/18 20:19:41 eldy Exp $ */ @@ -460,13 +460,13 @@ function print_eldy_menu($db,$atarget,$type_user) else { $url=dol_buildpath($newTabMenu[$i]['url'],1); - if (! preg_match('/\?/',$url)) $url.='?'; - else $url.='&'; if (! preg_match('/mainmenu/i',$url) || ! preg_match('/leftmenu/i',$url)) { - $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=&'; + if (! preg_match('/\?/',$url)) $url.='?'; + else $url.='&'; + $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu='; } - $url.="idmenu=".$newTabMenu[$i]['rowid']; + //$url.="idmenu=".$newTabMenu[$i]['rowid']; // Already done by menuLoad } $url=preg_replace('/__LOGIN__/',$user->login,$url); From 2a217f8c9382bfe8333db98395b4db038129bd68 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 21:08:46 +0000 Subject: [PATCH 057/166] Fix: Trans From a65b55a0122b8c7cdff16bd50a42fd2dd899e9f4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:28:30 +0000 Subject: [PATCH 058/166] Delete of security event keep add a delete event From cbdb9c8fdb76cd20b1fd3dc7a5799668b7d4769d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:35:06 +0000 Subject: [PATCH 059/166] Doxygen From 8e9fb3d7117ede6cc01d6482933059569291c1c4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:37:03 +0000 Subject: [PATCH 060/166] Nicer look From 6b7337c2040e3c7db0b74435f4879389b92f0273 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 03:49:10 +0000 Subject: [PATCH 061/166] Fix: img extension was not correctly managed From 20bafc786063782651d9034720a3dc7c9ca93228 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 18 Jul 2011 08:59:42 +0000 Subject: [PATCH 062/166] Fix: uniformize code From a9ded93b2465c9f7bee0239da6d1f18b0259fdb0 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 18 Jul 2011 10:22:22 +0000 Subject: [PATCH 063/166] Fix: bad gmap mode From cfbf416fec7e6bc740df2f2901395f1ae4edc1bf Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 11:11:19 +0000 Subject: [PATCH 064/166] Fix: Several fix in vat calculation. Add warning to say deposit invoices are not included. From acbeec86bcb6bd86b7c9bca0d9f01a5108bacddc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 11:31:53 +0000 Subject: [PATCH 065/166] Fix: SMS setup From 23fd49c5ec5378440b6ced647762481c3a2e720a Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 18 Jul 2011 16:37:14 +0000 Subject: [PATCH 066/166] Fix: Show LastName or ThirdPartyName label correctly (very important for the Hispanic community) --- htdocs/societe/soc.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 93ba18473fa..f843e20558c 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -26,7 +26,7 @@ * \file htdocs/societe/soc.php * \ingroup societe * \brief Third party card page - * \version $Id: soc.php,v 1.123 2011/07/18 16:48:26 simnandez Exp $ + * \version $Id: soc.php,v 1.122 2011/07/18 16:37:14 simnandez Exp $ */ require("../main.inc.php"); @@ -275,7 +275,7 @@ if (empty($reshook)) dol_syslog("This thirdparty is a personal people",LOG_DEBUG); $contact=new Contact($db); - $contact->civilite_id=$object->civilite_id; + $contact->civilite_id = $object->civilite_id; $contact->name=$object->nom_particulier; $contact->firstname=$object->prenom; $contact->address=$object->address; @@ -283,13 +283,10 @@ if (empty($reshook)) $contact->cp=$object->cp; $contact->town=$object->town; $contact->ville=$object->ville; - $contact->fk_departement=$object->departement_id; - $contact->fk_pays=$object->pays_id; + $contact->fk_pays=$object->fk_pays; $contact->socid=$object->id; // fk_soc $contact->status=1; $contact->email=$object->email; - $contact->phone_pro=$object->tel; - $contact->fax=$object->fax; $contact->priv=0; $result=$contact->create($user); @@ -1968,5 +1965,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/18 16:48:26 $ - $Revision: 1.123 $'); +llxFooter('$Date: 2011/07/18 16:37:14 $ - $Revision: 1.122 $'); ?> \ No newline at end of file From 07be793653edd9d0be5d78bea2d99c0d4b57b832 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 18 Jul 2011 16:48:26 +0000 Subject: [PATCH 067/166] Fix: Correct and add more data to the contact into Private individual creation --- htdocs/societe/soc.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index f843e20558c..93ba18473fa 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -26,7 +26,7 @@ * \file htdocs/societe/soc.php * \ingroup societe * \brief Third party card page - * \version $Id: soc.php,v 1.122 2011/07/18 16:37:14 simnandez Exp $ + * \version $Id: soc.php,v 1.123 2011/07/18 16:48:26 simnandez Exp $ */ require("../main.inc.php"); @@ -275,7 +275,7 @@ if (empty($reshook)) dol_syslog("This thirdparty is a personal people",LOG_DEBUG); $contact=new Contact($db); - $contact->civilite_id = $object->civilite_id; + $contact->civilite_id=$object->civilite_id; $contact->name=$object->nom_particulier; $contact->firstname=$object->prenom; $contact->address=$object->address; @@ -283,10 +283,13 @@ if (empty($reshook)) $contact->cp=$object->cp; $contact->town=$object->town; $contact->ville=$object->ville; - $contact->fk_pays=$object->fk_pays; + $contact->fk_departement=$object->departement_id; + $contact->fk_pays=$object->pays_id; $contact->socid=$object->id; // fk_soc $contact->status=1; $contact->email=$object->email; + $contact->phone_pro=$object->tel; + $contact->fax=$object->fax; $contact->priv=0; $result=$contact->create($user); @@ -1965,5 +1968,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/18 16:37:14 $ - $Revision: 1.122 $'); +llxFooter('$Date: 2011/07/18 16:48:26 $ - $Revision: 1.123 $'); ?> \ No newline at end of file From 40db4d6f9019c2241bd2938b882038bc266ef265 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 17:54:09 +0000 Subject: [PATCH 068/166] Fix: Translation of id prof From 0906009605d096d183b268fc6048cec2f201e0c7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:07:36 +0000 Subject: [PATCH 069/166] Fix: encoding From c93cafd36b9ea3e8ad8b40fc3b6136ef89f7430a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:08:35 +0000 Subject: [PATCH 070/166] Enable SMS menu --- htdocs/includes/menus/init_menu_auguria.sql | 8 ++++---- htdocs/includes/menus/standard/eldy.lib.php | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql index 1f864826999..7d9b48b817b 100644 --- a/htdocs/includes/menus/init_menu_auguria.sql +++ b/htdocs/includes/menus/init_menu_auguria.sql @@ -1,6 +1,6 @@ -- --- $Id: init_menu_auguria.sql,v 1.123 2011/07/18 19:25:48 eldy Exp $ --- $Revision: 1.123 $ +-- $Id: init_menu_auguria.sql,v 1.122 2011/07/18 18:08:35 eldy Exp $ +-- $Revision: 1.122 $ -- -- Menu base entries -- This file is loaded when a menu handler base is activated (auguria, etc..) @@ -254,7 +254,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4205__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=outofdate', 'MenuMembersNotUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 4, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4206__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=uptodate', 'MenuMembersUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4208__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersStats', 1, 'members', '$user->rights->adherent->lire', '', 2, 7, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); -- Members - Subscriptions insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4300__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/index.php?leftmenu=accountancy&mainmenu=members', 'Subscriptions', 0, 'compta', '$user->rights->adherent->cotisation->lire', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4301__+MAX_llx_menu__, 'members', '', 4300__+MAX_llx_menu__, '/adherents/liste.php?statut=-1&leftmenu=accountancy&mainmenu=members', 'NewSubscription', 1, 'compta', '$user->rights->adherent->cotisation->creer', '', 2, 0, __ENTITY__); @@ -263,7 +263,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled && $conf->export->enabled', __HANDLER__, 'left', 4501__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/exports/index.php?leftmenu=export', 'Datas', 1, 'members', '$user->rights->adherent->export', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4502__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/htpasswd.php?leftmenu=export', 'Filehtpasswd', 1, 'members', '$user->rights->adherent->export', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4503__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/cartes/carte.php?leftmenu=export', 'MembersCards', 1, 'members', '$user->rights->adherent->export', '', 2, 2, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersTypes', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersType', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4701__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members&action=create', 'New', 1, 'members', '$user->rights->adherent->configurer', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4702__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'List', 1, 'members', '$user->rights->adherent->configurer', '', 2, 1, __ENTITY__); -- Members - Category member diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php index 8c81bf6ea3a..893899ae5cd 100644 --- a/htdocs/includes/menus/standard/eldy.lib.php +++ b/htdocs/includes/menus/standard/eldy.lib.php @@ -21,7 +21,7 @@ /** * \file htdocs/includes/menus/standard/eldy.lib.php * \brief Library for file eldy menus - * \version $Id: eldy.lib.php,v 1.60 2011/07/18 20:19:41 eldy Exp $ + * \version $Id: eldy.lib.php,v 1.59 2011/07/18 18:08:35 eldy Exp $ */ @@ -460,13 +460,13 @@ function print_eldy_menu($db,$atarget,$type_user) else { $url=dol_buildpath($newTabMenu[$i]['url'],1); + if (! preg_match('/\?/',$url)) $url.='?'; + else $url.='&'; if (! preg_match('/mainmenu/i',$url) || ! preg_match('/leftmenu/i',$url)) { - if (! preg_match('/\?/',$url)) $url.='?'; - else $url.='&'; - $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu='; + $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=&'; } - //$url.="idmenu=".$newTabMenu[$i]['rowid']; // Already done by menuLoad + $url.="idmenu=".$newTabMenu[$i]['rowid']; } $url=preg_replace('/__LOGIN__/',$user->login,$url); From 0d4f03ab735db792318622753fc79a706bafc0f7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:09:04 +0000 Subject: [PATCH 071/166] Uniformize code From 24f57ac9b4e875bec11903a9012100d122f8aac1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:10:28 +0000 Subject: [PATCH 072/166] Prepare 3.1.0 From 433ed573ddd37f2a024d59e563a1f7c3f97ded9d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:31:53 +0000 Subject: [PATCH 073/166] Prepare 3.1.0 From 827d20757579986e661b02d61c7a8334be6f21c8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 19:25:46 +0000 Subject: [PATCH 074/166] Fix: Debug new features --- htdocs/includes/menus/init_menu_auguria.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql index 7d9b48b817b..1f864826999 100644 --- a/htdocs/includes/menus/init_menu_auguria.sql +++ b/htdocs/includes/menus/init_menu_auguria.sql @@ -1,6 +1,6 @@ -- --- $Id: init_menu_auguria.sql,v 1.122 2011/07/18 18:08:35 eldy Exp $ --- $Revision: 1.122 $ +-- $Id: init_menu_auguria.sql,v 1.123 2011/07/18 19:25:48 eldy Exp $ +-- $Revision: 1.123 $ -- -- Menu base entries -- This file is loaded when a menu handler base is activated (auguria, etc..) @@ -254,7 +254,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4205__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=outofdate', 'MenuMembersNotUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 4, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4206__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=uptodate', 'MenuMembersUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4208__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersStats', 1, 'members', '$user->rights->adherent->lire', '', 2, 7, __ENTITY__); -- Members - Subscriptions insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4300__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/index.php?leftmenu=accountancy&mainmenu=members', 'Subscriptions', 0, 'compta', '$user->rights->adherent->cotisation->lire', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4301__+MAX_llx_menu__, 'members', '', 4300__+MAX_llx_menu__, '/adherents/liste.php?statut=-1&leftmenu=accountancy&mainmenu=members', 'NewSubscription', 1, 'compta', '$user->rights->adherent->cotisation->creer', '', 2, 0, __ENTITY__); @@ -263,7 +263,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled && $conf->export->enabled', __HANDLER__, 'left', 4501__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/exports/index.php?leftmenu=export', 'Datas', 1, 'members', '$user->rights->adherent->export', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4502__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/htpasswd.php?leftmenu=export', 'Filehtpasswd', 1, 'members', '$user->rights->adherent->export', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4503__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/cartes/carte.php?leftmenu=export', 'MembersCards', 1, 'members', '$user->rights->adherent->export', '', 2, 2, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersType', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersTypes', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4701__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members&action=create', 'New', 1, 'members', '$user->rights->adherent->configurer', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4702__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'List', 1, 'members', '$user->rights->adherent->configurer', '', 2, 1, __ENTITY__); -- Members - Category member From 38f8d391030459ff754d5b476f30cbcc00152224 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 20:03:42 +0000 Subject: [PATCH 075/166] Update screenshots From d056b1fa3307039d2074ff74e38643fd437a9223 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 20:19:41 +0000 Subject: [PATCH 076/166] Try a better fix to avoid duplicate idmenu into url --- htdocs/includes/menus/standard/eldy.lib.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php index 893899ae5cd..8c81bf6ea3a 100644 --- a/htdocs/includes/menus/standard/eldy.lib.php +++ b/htdocs/includes/menus/standard/eldy.lib.php @@ -21,7 +21,7 @@ /** * \file htdocs/includes/menus/standard/eldy.lib.php * \brief Library for file eldy menus - * \version $Id: eldy.lib.php,v 1.59 2011/07/18 18:08:35 eldy Exp $ + * \version $Id: eldy.lib.php,v 1.60 2011/07/18 20:19:41 eldy Exp $ */ @@ -460,13 +460,13 @@ function print_eldy_menu($db,$atarget,$type_user) else { $url=dol_buildpath($newTabMenu[$i]['url'],1); - if (! preg_match('/\?/',$url)) $url.='?'; - else $url.='&'; if (! preg_match('/mainmenu/i',$url) || ! preg_match('/leftmenu/i',$url)) { - $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=&'; + if (! preg_match('/\?/',$url)) $url.='?'; + else $url.='&'; + $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu='; } - $url.="idmenu=".$newTabMenu[$i]['rowid']; + //$url.="idmenu=".$newTabMenu[$i]['rowid']; // Already done by menuLoad } $url=preg_replace('/__LOGIN__/',$user->login,$url); From 455ff931411e6cbc81d4ef9f648370af6915122b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 21:08:46 +0000 Subject: [PATCH 077/166] Fix: Trans From 4f0b92b18a2c3b47a0b19f848a50d1e790a8ad61 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:28:30 +0000 Subject: [PATCH 078/166] Delete of security event keep add a delete event From 3526607cd0f2e6801aefff8e214b468f9408eef0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:35:06 +0000 Subject: [PATCH 079/166] Doxygen From e59dfee45d162e59033379715b324c93cc8f95e5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:37:03 +0000 Subject: [PATCH 080/166] Nicer look From dcdf9f502c67d9c5520a5729f38cf93039712a7c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 03:49:10 +0000 Subject: [PATCH 081/166] Fix: img extension was not correctly managed From bcc1b9b4fb4bf1ed97abd52bfc00e9e08a614836 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 18 Jul 2011 08:59:42 +0000 Subject: [PATCH 082/166] Fix: uniformize code From c1af3fa398e522f4b7fe646865a9bd77c27f959e Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 18 Jul 2011 10:22:22 +0000 Subject: [PATCH 083/166] Fix: bad gmap mode From 9a37910792f19ae6364ab3cd1d504d515c92e09e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 11:11:19 +0000 Subject: [PATCH 084/166] Fix: Several fix in vat calculation. Add warning to say deposit invoices are not included. From 7ded8ef27e9fd89b16f422d501e730782eac2c9d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 11:31:53 +0000 Subject: [PATCH 085/166] Fix: SMS setup From 088d815c7a5bfb47a06f3b944328d3bf370b74ef Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 18 Jul 2011 16:37:14 +0000 Subject: [PATCH 086/166] Fix: Show LastName or ThirdPartyName label correctly (very important for the Hispanic community) --- htdocs/societe/soc.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 93ba18473fa..f843e20558c 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -26,7 +26,7 @@ * \file htdocs/societe/soc.php * \ingroup societe * \brief Third party card page - * \version $Id: soc.php,v 1.123 2011/07/18 16:48:26 simnandez Exp $ + * \version $Id: soc.php,v 1.122 2011/07/18 16:37:14 simnandez Exp $ */ require("../main.inc.php"); @@ -275,7 +275,7 @@ if (empty($reshook)) dol_syslog("This thirdparty is a personal people",LOG_DEBUG); $contact=new Contact($db); - $contact->civilite_id=$object->civilite_id; + $contact->civilite_id = $object->civilite_id; $contact->name=$object->nom_particulier; $contact->firstname=$object->prenom; $contact->address=$object->address; @@ -283,13 +283,10 @@ if (empty($reshook)) $contact->cp=$object->cp; $contact->town=$object->town; $contact->ville=$object->ville; - $contact->fk_departement=$object->departement_id; - $contact->fk_pays=$object->pays_id; + $contact->fk_pays=$object->fk_pays; $contact->socid=$object->id; // fk_soc $contact->status=1; $contact->email=$object->email; - $contact->phone_pro=$object->tel; - $contact->fax=$object->fax; $contact->priv=0; $result=$contact->create($user); @@ -1968,5 +1965,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/18 16:48:26 $ - $Revision: 1.123 $'); +llxFooter('$Date: 2011/07/18 16:37:14 $ - $Revision: 1.122 $'); ?> \ No newline at end of file From 08e96137a20af26bc6876638edacdf0341361c57 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 18 Jul 2011 16:48:26 +0000 Subject: [PATCH 087/166] Fix: Correct and add more data to the contact into Private individual creation --- htdocs/societe/soc.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index f843e20558c..93ba18473fa 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -26,7 +26,7 @@ * \file htdocs/societe/soc.php * \ingroup societe * \brief Third party card page - * \version $Id: soc.php,v 1.122 2011/07/18 16:37:14 simnandez Exp $ + * \version $Id: soc.php,v 1.123 2011/07/18 16:48:26 simnandez Exp $ */ require("../main.inc.php"); @@ -275,7 +275,7 @@ if (empty($reshook)) dol_syslog("This thirdparty is a personal people",LOG_DEBUG); $contact=new Contact($db); - $contact->civilite_id = $object->civilite_id; + $contact->civilite_id=$object->civilite_id; $contact->name=$object->nom_particulier; $contact->firstname=$object->prenom; $contact->address=$object->address; @@ -283,10 +283,13 @@ if (empty($reshook)) $contact->cp=$object->cp; $contact->town=$object->town; $contact->ville=$object->ville; - $contact->fk_pays=$object->fk_pays; + $contact->fk_departement=$object->departement_id; + $contact->fk_pays=$object->pays_id; $contact->socid=$object->id; // fk_soc $contact->status=1; $contact->email=$object->email; + $contact->phone_pro=$object->tel; + $contact->fax=$object->fax; $contact->priv=0; $result=$contact->create($user); @@ -1965,5 +1968,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/18 16:37:14 $ - $Revision: 1.122 $'); +llxFooter('$Date: 2011/07/18 16:48:26 $ - $Revision: 1.123 $'); ?> \ No newline at end of file From 8a910381c5659722091e12920f8f56ba49aee3b1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 17:54:09 +0000 Subject: [PATCH 088/166] Fix: Translation of id prof From f9ff814b9d4e5f9b2ab716b7a71c6242dad941a2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:07:36 +0000 Subject: [PATCH 089/166] Fix: encoding From 9b9c36ca564a28198e2b5b173f009d4926461d1a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:08:35 +0000 Subject: [PATCH 090/166] Enable SMS menu --- htdocs/includes/menus/init_menu_auguria.sql | 8 ++++---- htdocs/includes/menus/standard/eldy.lib.php | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql index 1f864826999..7d9b48b817b 100644 --- a/htdocs/includes/menus/init_menu_auguria.sql +++ b/htdocs/includes/menus/init_menu_auguria.sql @@ -1,6 +1,6 @@ -- --- $Id: init_menu_auguria.sql,v 1.123 2011/07/18 19:25:48 eldy Exp $ --- $Revision: 1.123 $ +-- $Id: init_menu_auguria.sql,v 1.122 2011/07/18 18:08:35 eldy Exp $ +-- $Revision: 1.122 $ -- -- Menu base entries -- This file is loaded when a menu handler base is activated (auguria, etc..) @@ -254,7 +254,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4205__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=outofdate', 'MenuMembersNotUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 4, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4206__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=uptodate', 'MenuMembersUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4208__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersStats', 1, 'members', '$user->rights->adherent->lire', '', 2, 7, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); -- Members - Subscriptions insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4300__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/index.php?leftmenu=accountancy&mainmenu=members', 'Subscriptions', 0, 'compta', '$user->rights->adherent->cotisation->lire', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4301__+MAX_llx_menu__, 'members', '', 4300__+MAX_llx_menu__, '/adherents/liste.php?statut=-1&leftmenu=accountancy&mainmenu=members', 'NewSubscription', 1, 'compta', '$user->rights->adherent->cotisation->creer', '', 2, 0, __ENTITY__); @@ -263,7 +263,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled && $conf->export->enabled', __HANDLER__, 'left', 4501__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/exports/index.php?leftmenu=export', 'Datas', 1, 'members', '$user->rights->adherent->export', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4502__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/htpasswd.php?leftmenu=export', 'Filehtpasswd', 1, 'members', '$user->rights->adherent->export', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4503__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/cartes/carte.php?leftmenu=export', 'MembersCards', 1, 'members', '$user->rights->adherent->export', '', 2, 2, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersTypes', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersType', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4701__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members&action=create', 'New', 1, 'members', '$user->rights->adherent->configurer', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4702__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'List', 1, 'members', '$user->rights->adherent->configurer', '', 2, 1, __ENTITY__); -- Members - Category member diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php index 8c81bf6ea3a..893899ae5cd 100644 --- a/htdocs/includes/menus/standard/eldy.lib.php +++ b/htdocs/includes/menus/standard/eldy.lib.php @@ -21,7 +21,7 @@ /** * \file htdocs/includes/menus/standard/eldy.lib.php * \brief Library for file eldy menus - * \version $Id: eldy.lib.php,v 1.60 2011/07/18 20:19:41 eldy Exp $ + * \version $Id: eldy.lib.php,v 1.59 2011/07/18 18:08:35 eldy Exp $ */ @@ -460,13 +460,13 @@ function print_eldy_menu($db,$atarget,$type_user) else { $url=dol_buildpath($newTabMenu[$i]['url'],1); + if (! preg_match('/\?/',$url)) $url.='?'; + else $url.='&'; if (! preg_match('/mainmenu/i',$url) || ! preg_match('/leftmenu/i',$url)) { - if (! preg_match('/\?/',$url)) $url.='?'; - else $url.='&'; - $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu='; + $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=&'; } - //$url.="idmenu=".$newTabMenu[$i]['rowid']; // Already done by menuLoad + $url.="idmenu=".$newTabMenu[$i]['rowid']; } $url=preg_replace('/__LOGIN__/',$user->login,$url); From 315b6b6dba8be3b45da2745dafc64e22d9bd6477 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:09:04 +0000 Subject: [PATCH 091/166] Uniformize code From 25c8d23bdc268d1b64dd8794427e0a786b2f4229 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:10:28 +0000 Subject: [PATCH 092/166] Prepare 3.1.0 From 9e857522eb2a21d52ce9f9ee4336e82281f3b037 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:31:53 +0000 Subject: [PATCH 093/166] Prepare 3.1.0 From 2125d95d0682805205908220edaae60b678fa2da Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 19:25:46 +0000 Subject: [PATCH 094/166] Fix: Debug new features --- htdocs/includes/menus/init_menu_auguria.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql index 7d9b48b817b..1f864826999 100644 --- a/htdocs/includes/menus/init_menu_auguria.sql +++ b/htdocs/includes/menus/init_menu_auguria.sql @@ -1,6 +1,6 @@ -- --- $Id: init_menu_auguria.sql,v 1.122 2011/07/18 18:08:35 eldy Exp $ --- $Revision: 1.122 $ +-- $Id: init_menu_auguria.sql,v 1.123 2011/07/18 19:25:48 eldy Exp $ +-- $Revision: 1.123 $ -- -- Menu base entries -- This file is loaded when a menu handler base is activated (auguria, etc..) @@ -254,7 +254,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4205__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=outofdate', 'MenuMembersNotUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 4, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4206__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=uptodate', 'MenuMembersUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4208__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersStats', 1, 'members', '$user->rights->adherent->lire', '', 2, 7, __ENTITY__); -- Members - Subscriptions insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4300__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/index.php?leftmenu=accountancy&mainmenu=members', 'Subscriptions', 0, 'compta', '$user->rights->adherent->cotisation->lire', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4301__+MAX_llx_menu__, 'members', '', 4300__+MAX_llx_menu__, '/adherents/liste.php?statut=-1&leftmenu=accountancy&mainmenu=members', 'NewSubscription', 1, 'compta', '$user->rights->adherent->cotisation->creer', '', 2, 0, __ENTITY__); @@ -263,7 +263,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled && $conf->export->enabled', __HANDLER__, 'left', 4501__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/exports/index.php?leftmenu=export', 'Datas', 1, 'members', '$user->rights->adherent->export', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4502__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/htpasswd.php?leftmenu=export', 'Filehtpasswd', 1, 'members', '$user->rights->adherent->export', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4503__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/cartes/carte.php?leftmenu=export', 'MembersCards', 1, 'members', '$user->rights->adherent->export', '', 2, 2, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersType', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersTypes', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4701__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members&action=create', 'New', 1, 'members', '$user->rights->adherent->configurer', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4702__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'List', 1, 'members', '$user->rights->adherent->configurer', '', 2, 1, __ENTITY__); -- Members - Category member From e284d3d23f9ae662fe24ed81f6aafaa3126930b1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 20:03:42 +0000 Subject: [PATCH 095/166] Update screenshots From 728e1b69cf7f811b9863bfd630353c91c98dd803 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 20:19:41 +0000 Subject: [PATCH 096/166] Try a better fix to avoid duplicate idmenu into url --- htdocs/includes/menus/standard/eldy.lib.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php index 893899ae5cd..8c81bf6ea3a 100644 --- a/htdocs/includes/menus/standard/eldy.lib.php +++ b/htdocs/includes/menus/standard/eldy.lib.php @@ -21,7 +21,7 @@ /** * \file htdocs/includes/menus/standard/eldy.lib.php * \brief Library for file eldy menus - * \version $Id: eldy.lib.php,v 1.59 2011/07/18 18:08:35 eldy Exp $ + * \version $Id: eldy.lib.php,v 1.60 2011/07/18 20:19:41 eldy Exp $ */ @@ -460,13 +460,13 @@ function print_eldy_menu($db,$atarget,$type_user) else { $url=dol_buildpath($newTabMenu[$i]['url'],1); - if (! preg_match('/\?/',$url)) $url.='?'; - else $url.='&'; if (! preg_match('/mainmenu/i',$url) || ! preg_match('/leftmenu/i',$url)) { - $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=&'; + if (! preg_match('/\?/',$url)) $url.='?'; + else $url.='&'; + $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu='; } - $url.="idmenu=".$newTabMenu[$i]['rowid']; + //$url.="idmenu=".$newTabMenu[$i]['rowid']; // Already done by menuLoad } $url=preg_replace('/__LOGIN__/',$user->login,$url); From 6473b5d450b65629db64714621c8e6bf1223f3c1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 21:08:46 +0000 Subject: [PATCH 097/166] Fix: Trans From 7fdebbf9a72a197dfcd04d9df220f3dcd9469bd3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:28:30 +0000 Subject: [PATCH 098/166] Delete of security event keep add a delete event From 8ac1b457ad742ca48f96b33308c67914a9812d36 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:35:06 +0000 Subject: [PATCH 099/166] Doxygen From ef0edc7d24c060a93ea65a59e962cadf83ccf1bc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:37:03 +0000 Subject: [PATCH 100/166] Nicer look From 7df5d20337b3f7ca2bc778c4652478b26005d403 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 03:49:10 +0000 Subject: [PATCH 101/166] Fix: img extension was not correctly managed From e10542b22803b3f2dbe33c447255d05eb6efbee3 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 18 Jul 2011 08:59:42 +0000 Subject: [PATCH 102/166] Fix: uniformize code From b92568eb0b4be2e22d2b86076da027e24af898dd Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 18 Jul 2011 10:22:22 +0000 Subject: [PATCH 103/166] Fix: bad gmap mode From 94ae26f9f24f194020cdf8b50be8c96934f4926b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 11:11:19 +0000 Subject: [PATCH 104/166] Fix: Several fix in vat calculation. Add warning to say deposit invoices are not included. From ecc7268991f622a4df785275ee2b37cfbc29b335 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 11:31:53 +0000 Subject: [PATCH 105/166] Fix: SMS setup From abab3b32f811c872eccf1b548a07c368f4f293c1 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 18 Jul 2011 16:37:14 +0000 Subject: [PATCH 106/166] Fix: Show LastName or ThirdPartyName label correctly (very important for the Hispanic community) --- htdocs/societe/soc.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 93ba18473fa..f843e20558c 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -26,7 +26,7 @@ * \file htdocs/societe/soc.php * \ingroup societe * \brief Third party card page - * \version $Id: soc.php,v 1.123 2011/07/18 16:48:26 simnandez Exp $ + * \version $Id: soc.php,v 1.122 2011/07/18 16:37:14 simnandez Exp $ */ require("../main.inc.php"); @@ -275,7 +275,7 @@ if (empty($reshook)) dol_syslog("This thirdparty is a personal people",LOG_DEBUG); $contact=new Contact($db); - $contact->civilite_id=$object->civilite_id; + $contact->civilite_id = $object->civilite_id; $contact->name=$object->nom_particulier; $contact->firstname=$object->prenom; $contact->address=$object->address; @@ -283,13 +283,10 @@ if (empty($reshook)) $contact->cp=$object->cp; $contact->town=$object->town; $contact->ville=$object->ville; - $contact->fk_departement=$object->departement_id; - $contact->fk_pays=$object->pays_id; + $contact->fk_pays=$object->fk_pays; $contact->socid=$object->id; // fk_soc $contact->status=1; $contact->email=$object->email; - $contact->phone_pro=$object->tel; - $contact->fax=$object->fax; $contact->priv=0; $result=$contact->create($user); @@ -1968,5 +1965,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/18 16:48:26 $ - $Revision: 1.123 $'); +llxFooter('$Date: 2011/07/18 16:37:14 $ - $Revision: 1.122 $'); ?> \ No newline at end of file From d619b197ea12c4281390e0648c978d24eec9e952 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 18 Jul 2011 16:48:26 +0000 Subject: [PATCH 107/166] Fix: Correct and add more data to the contact into Private individual creation --- htdocs/societe/soc.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index f843e20558c..93ba18473fa 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -26,7 +26,7 @@ * \file htdocs/societe/soc.php * \ingroup societe * \brief Third party card page - * \version $Id: soc.php,v 1.122 2011/07/18 16:37:14 simnandez Exp $ + * \version $Id: soc.php,v 1.123 2011/07/18 16:48:26 simnandez Exp $ */ require("../main.inc.php"); @@ -275,7 +275,7 @@ if (empty($reshook)) dol_syslog("This thirdparty is a personal people",LOG_DEBUG); $contact=new Contact($db); - $contact->civilite_id = $object->civilite_id; + $contact->civilite_id=$object->civilite_id; $contact->name=$object->nom_particulier; $contact->firstname=$object->prenom; $contact->address=$object->address; @@ -283,10 +283,13 @@ if (empty($reshook)) $contact->cp=$object->cp; $contact->town=$object->town; $contact->ville=$object->ville; - $contact->fk_pays=$object->fk_pays; + $contact->fk_departement=$object->departement_id; + $contact->fk_pays=$object->pays_id; $contact->socid=$object->id; // fk_soc $contact->status=1; $contact->email=$object->email; + $contact->phone_pro=$object->tel; + $contact->fax=$object->fax; $contact->priv=0; $result=$contact->create($user); @@ -1965,5 +1968,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/18 16:37:14 $ - $Revision: 1.122 $'); +llxFooter('$Date: 2011/07/18 16:48:26 $ - $Revision: 1.123 $'); ?> \ No newline at end of file From 050f8252af3242162b185f64d19816aaf7150cf9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 17:54:09 +0000 Subject: [PATCH 108/166] Fix: Translation of id prof From a43fde111e95e87f6c3d4e6f02df94f674e329ae Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:07:36 +0000 Subject: [PATCH 109/166] Fix: encoding From e7df09a0b905109f16d45d3cda9663e4aa21b08e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:08:35 +0000 Subject: [PATCH 110/166] Enable SMS menu --- htdocs/includes/menus/init_menu_auguria.sql | 8 ++++---- htdocs/includes/menus/standard/eldy.lib.php | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql index 1f864826999..7d9b48b817b 100644 --- a/htdocs/includes/menus/init_menu_auguria.sql +++ b/htdocs/includes/menus/init_menu_auguria.sql @@ -1,6 +1,6 @@ -- --- $Id: init_menu_auguria.sql,v 1.123 2011/07/18 19:25:48 eldy Exp $ --- $Revision: 1.123 $ +-- $Id: init_menu_auguria.sql,v 1.122 2011/07/18 18:08:35 eldy Exp $ +-- $Revision: 1.122 $ -- -- Menu base entries -- This file is loaded when a menu handler base is activated (auguria, etc..) @@ -254,7 +254,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4205__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=outofdate', 'MenuMembersNotUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 4, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4206__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=uptodate', 'MenuMembersUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4208__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersStats', 1, 'members', '$user->rights->adherent->lire', '', 2, 7, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); -- Members - Subscriptions insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4300__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/index.php?leftmenu=accountancy&mainmenu=members', 'Subscriptions', 0, 'compta', '$user->rights->adherent->cotisation->lire', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4301__+MAX_llx_menu__, 'members', '', 4300__+MAX_llx_menu__, '/adherents/liste.php?statut=-1&leftmenu=accountancy&mainmenu=members', 'NewSubscription', 1, 'compta', '$user->rights->adherent->cotisation->creer', '', 2, 0, __ENTITY__); @@ -263,7 +263,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled && $conf->export->enabled', __HANDLER__, 'left', 4501__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/exports/index.php?leftmenu=export', 'Datas', 1, 'members', '$user->rights->adherent->export', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4502__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/htpasswd.php?leftmenu=export', 'Filehtpasswd', 1, 'members', '$user->rights->adherent->export', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4503__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/cartes/carte.php?leftmenu=export', 'MembersCards', 1, 'members', '$user->rights->adherent->export', '', 2, 2, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersTypes', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersType', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4701__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members&action=create', 'New', 1, 'members', '$user->rights->adherent->configurer', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4702__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'List', 1, 'members', '$user->rights->adherent->configurer', '', 2, 1, __ENTITY__); -- Members - Category member diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php index 8c81bf6ea3a..893899ae5cd 100644 --- a/htdocs/includes/menus/standard/eldy.lib.php +++ b/htdocs/includes/menus/standard/eldy.lib.php @@ -21,7 +21,7 @@ /** * \file htdocs/includes/menus/standard/eldy.lib.php * \brief Library for file eldy menus - * \version $Id: eldy.lib.php,v 1.60 2011/07/18 20:19:41 eldy Exp $ + * \version $Id: eldy.lib.php,v 1.59 2011/07/18 18:08:35 eldy Exp $ */ @@ -460,13 +460,13 @@ function print_eldy_menu($db,$atarget,$type_user) else { $url=dol_buildpath($newTabMenu[$i]['url'],1); + if (! preg_match('/\?/',$url)) $url.='?'; + else $url.='&'; if (! preg_match('/mainmenu/i',$url) || ! preg_match('/leftmenu/i',$url)) { - if (! preg_match('/\?/',$url)) $url.='?'; - else $url.='&'; - $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu='; + $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=&'; } - //$url.="idmenu=".$newTabMenu[$i]['rowid']; // Already done by menuLoad + $url.="idmenu=".$newTabMenu[$i]['rowid']; } $url=preg_replace('/__LOGIN__/',$user->login,$url); From efbe736597bfaea5616c7fbc6298b2484179f617 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:09:04 +0000 Subject: [PATCH 111/166] Uniformize code From eb80119604e681bb5a73e6b07f2ee117a2d26eba Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:10:28 +0000 Subject: [PATCH 112/166] Prepare 3.1.0 From 0d9009b8c8bc8ab03aca8a46b155a997de46ba93 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:31:53 +0000 Subject: [PATCH 113/166] Prepare 3.1.0 From 75627003dc0462208150a93e53964458112560f7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 19:25:46 +0000 Subject: [PATCH 114/166] Fix: Debug new features --- htdocs/includes/menus/init_menu_auguria.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql index 7d9b48b817b..1f864826999 100644 --- a/htdocs/includes/menus/init_menu_auguria.sql +++ b/htdocs/includes/menus/init_menu_auguria.sql @@ -1,6 +1,6 @@ -- --- $Id: init_menu_auguria.sql,v 1.122 2011/07/18 18:08:35 eldy Exp $ --- $Revision: 1.122 $ +-- $Id: init_menu_auguria.sql,v 1.123 2011/07/18 19:25:48 eldy Exp $ +-- $Revision: 1.123 $ -- -- Menu base entries -- This file is loaded when a menu handler base is activated (auguria, etc..) @@ -254,7 +254,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4205__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=outofdate', 'MenuMembersNotUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 4, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4206__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=uptodate', 'MenuMembersUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4208__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersStats', 1, 'members', '$user->rights->adherent->lire', '', 2, 7, __ENTITY__); -- Members - Subscriptions insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4300__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/index.php?leftmenu=accountancy&mainmenu=members', 'Subscriptions', 0, 'compta', '$user->rights->adherent->cotisation->lire', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4301__+MAX_llx_menu__, 'members', '', 4300__+MAX_llx_menu__, '/adherents/liste.php?statut=-1&leftmenu=accountancy&mainmenu=members', 'NewSubscription', 1, 'compta', '$user->rights->adherent->cotisation->creer', '', 2, 0, __ENTITY__); @@ -263,7 +263,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled && $conf->export->enabled', __HANDLER__, 'left', 4501__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/exports/index.php?leftmenu=export', 'Datas', 1, 'members', '$user->rights->adherent->export', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4502__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/htpasswd.php?leftmenu=export', 'Filehtpasswd', 1, 'members', '$user->rights->adherent->export', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4503__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/cartes/carte.php?leftmenu=export', 'MembersCards', 1, 'members', '$user->rights->adherent->export', '', 2, 2, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersType', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersTypes', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4701__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members&action=create', 'New', 1, 'members', '$user->rights->adherent->configurer', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4702__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'List', 1, 'members', '$user->rights->adherent->configurer', '', 2, 1, __ENTITY__); -- Members - Category member From c9627f9d0b46df77ded1216628e1f5fc0963e2a4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 20:03:42 +0000 Subject: [PATCH 115/166] Update screenshots From 68c74bab3b4f5e7e8ac9cf54b7bc44f9abd182b3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 20:19:41 +0000 Subject: [PATCH 116/166] Try a better fix to avoid duplicate idmenu into url --- htdocs/includes/menus/standard/eldy.lib.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php index 893899ae5cd..8c81bf6ea3a 100644 --- a/htdocs/includes/menus/standard/eldy.lib.php +++ b/htdocs/includes/menus/standard/eldy.lib.php @@ -21,7 +21,7 @@ /** * \file htdocs/includes/menus/standard/eldy.lib.php * \brief Library for file eldy menus - * \version $Id: eldy.lib.php,v 1.59 2011/07/18 18:08:35 eldy Exp $ + * \version $Id: eldy.lib.php,v 1.60 2011/07/18 20:19:41 eldy Exp $ */ @@ -460,13 +460,13 @@ function print_eldy_menu($db,$atarget,$type_user) else { $url=dol_buildpath($newTabMenu[$i]['url'],1); - if (! preg_match('/\?/',$url)) $url.='?'; - else $url.='&'; if (! preg_match('/mainmenu/i',$url) || ! preg_match('/leftmenu/i',$url)) { - $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=&'; + if (! preg_match('/\?/',$url)) $url.='?'; + else $url.='&'; + $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu='; } - $url.="idmenu=".$newTabMenu[$i]['rowid']; + //$url.="idmenu=".$newTabMenu[$i]['rowid']; // Already done by menuLoad } $url=preg_replace('/__LOGIN__/',$user->login,$url); From 9aacadea97e0f28ef0776f32a0771dc95a2d518e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 21:08:46 +0000 Subject: [PATCH 117/166] Fix: Trans From ab11ecd867beec10cefa984c0cb1c928086777f5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:28:30 +0000 Subject: [PATCH 118/166] Delete of security event keep add a delete event From c4d24334025ca5149683dbc786547d555e298796 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:35:06 +0000 Subject: [PATCH 119/166] Doxygen From 847820ccae2370af0e1bdc213cbf91c25f88bd56 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:37:03 +0000 Subject: [PATCH 120/166] Nicer look From ad44b6f588bcccff7aba1fbdbb0a971e4ee99163 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 03:49:10 +0000 Subject: [PATCH 121/166] Fix: img extension was not correctly managed From b0558423b204d4ad6cb2155fc3977dc58bffb219 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 18 Jul 2011 08:59:42 +0000 Subject: [PATCH 122/166] Fix: uniformize code From d1aa830b41af7d66f35e76e34abc6b3bb24dfcc5 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 18 Jul 2011 10:22:22 +0000 Subject: [PATCH 123/166] Fix: bad gmap mode From fda74ee820563571e2567aaf0ac17a468b7da0b8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 11:11:19 +0000 Subject: [PATCH 124/166] Fix: Several fix in vat calculation. Add warning to say deposit invoices are not included. From b2ff7c9057f7f06dd94c555eac3f9b9105366186 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 11:31:53 +0000 Subject: [PATCH 125/166] Fix: SMS setup From 540cd011a8f45f3e2d9ba68d153cea9ed07854c5 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 18 Jul 2011 16:37:14 +0000 Subject: [PATCH 126/166] Fix: Show LastName or ThirdPartyName label correctly (very important for the Hispanic community) --- htdocs/societe/soc.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 93ba18473fa..f843e20558c 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -26,7 +26,7 @@ * \file htdocs/societe/soc.php * \ingroup societe * \brief Third party card page - * \version $Id: soc.php,v 1.123 2011/07/18 16:48:26 simnandez Exp $ + * \version $Id: soc.php,v 1.122 2011/07/18 16:37:14 simnandez Exp $ */ require("../main.inc.php"); @@ -275,7 +275,7 @@ if (empty($reshook)) dol_syslog("This thirdparty is a personal people",LOG_DEBUG); $contact=new Contact($db); - $contact->civilite_id=$object->civilite_id; + $contact->civilite_id = $object->civilite_id; $contact->name=$object->nom_particulier; $contact->firstname=$object->prenom; $contact->address=$object->address; @@ -283,13 +283,10 @@ if (empty($reshook)) $contact->cp=$object->cp; $contact->town=$object->town; $contact->ville=$object->ville; - $contact->fk_departement=$object->departement_id; - $contact->fk_pays=$object->pays_id; + $contact->fk_pays=$object->fk_pays; $contact->socid=$object->id; // fk_soc $contact->status=1; $contact->email=$object->email; - $contact->phone_pro=$object->tel; - $contact->fax=$object->fax; $contact->priv=0; $result=$contact->create($user); @@ -1968,5 +1965,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/18 16:48:26 $ - $Revision: 1.123 $'); +llxFooter('$Date: 2011/07/18 16:37:14 $ - $Revision: 1.122 $'); ?> \ No newline at end of file From 7d316e568b1aad9a4f6e25e92c3e0e0827632ab6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 03:49:10 +0000 Subject: [PATCH 127/166] Fix: img extension was not correctly managed From 69a735dfe7f07fa8b59e9980cb7e1daa94308e12 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 18 Jul 2011 08:59:42 +0000 Subject: [PATCH 128/166] Fix: uniformize code From f867561e33bfffc2f5b91845075ec7b6cc500767 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 18 Jul 2011 10:22:22 +0000 Subject: [PATCH 129/166] Fix: bad gmap mode From 4cf7c754d94d28f80b79d3cc3a3fd35f9c231daa Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 11:11:19 +0000 Subject: [PATCH 130/166] Fix: Several fix in vat calculation. Add warning to say deposit invoices are not included. From e7dffdba24c06be59d49ce26717b8a47b0b0fa14 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 11:31:53 +0000 Subject: [PATCH 131/166] Fix: SMS setup From 9ca8f8184b5f36c82a2e6b47cac6adc18a8c2bf8 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 18 Jul 2011 16:37:14 +0000 Subject: [PATCH 132/166] Fix: Show LastName or ThirdPartyName label correctly (very important for the Hispanic community) From 3a653121802baadcf42b9a77725b18d3652be822 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 18 Jul 2011 16:48:26 +0000 Subject: [PATCH 133/166] Fix: Correct and add more data to the contact into Private individual creation --- htdocs/societe/soc.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index f843e20558c..93ba18473fa 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -26,7 +26,7 @@ * \file htdocs/societe/soc.php * \ingroup societe * \brief Third party card page - * \version $Id: soc.php,v 1.122 2011/07/18 16:37:14 simnandez Exp $ + * \version $Id: soc.php,v 1.123 2011/07/18 16:48:26 simnandez Exp $ */ require("../main.inc.php"); @@ -275,7 +275,7 @@ if (empty($reshook)) dol_syslog("This thirdparty is a personal people",LOG_DEBUG); $contact=new Contact($db); - $contact->civilite_id = $object->civilite_id; + $contact->civilite_id=$object->civilite_id; $contact->name=$object->nom_particulier; $contact->firstname=$object->prenom; $contact->address=$object->address; @@ -283,10 +283,13 @@ if (empty($reshook)) $contact->cp=$object->cp; $contact->town=$object->town; $contact->ville=$object->ville; - $contact->fk_pays=$object->fk_pays; + $contact->fk_departement=$object->departement_id; + $contact->fk_pays=$object->pays_id; $contact->socid=$object->id; // fk_soc $contact->status=1; $contact->email=$object->email; + $contact->phone_pro=$object->tel; + $contact->fax=$object->fax; $contact->priv=0; $result=$contact->create($user); @@ -1965,5 +1968,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/18 16:37:14 $ - $Revision: 1.122 $'); +llxFooter('$Date: 2011/07/18 16:48:26 $ - $Revision: 1.123 $'); ?> \ No newline at end of file From 01875ed04df1cea33174f3f97a1dc461014faa08 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 17:54:09 +0000 Subject: [PATCH 134/166] Fix: Translation of id prof From 5ac9f6c9609c9274f8e67bee0db0b449d5d4d533 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:07:36 +0000 Subject: [PATCH 135/166] Fix: encoding From 32418a033871b639529b9e1d6d1adb5165583da2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:08:35 +0000 Subject: [PATCH 136/166] Enable SMS menu --- htdocs/includes/menus/init_menu_auguria.sql | 8 ++++---- htdocs/includes/menus/standard/eldy.lib.php | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql index 1f864826999..7d9b48b817b 100644 --- a/htdocs/includes/menus/init_menu_auguria.sql +++ b/htdocs/includes/menus/init_menu_auguria.sql @@ -1,6 +1,6 @@ -- --- $Id: init_menu_auguria.sql,v 1.123 2011/07/18 19:25:48 eldy Exp $ --- $Revision: 1.123 $ +-- $Id: init_menu_auguria.sql,v 1.122 2011/07/18 18:08:35 eldy Exp $ +-- $Revision: 1.122 $ -- -- Menu base entries -- This file is loaded when a menu handler base is activated (auguria, etc..) @@ -254,7 +254,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4205__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=outofdate', 'MenuMembersNotUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 4, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4206__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=uptodate', 'MenuMembersUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4208__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersStats', 1, 'members', '$user->rights->adherent->lire', '', 2, 7, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); -- Members - Subscriptions insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4300__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/index.php?leftmenu=accountancy&mainmenu=members', 'Subscriptions', 0, 'compta', '$user->rights->adherent->cotisation->lire', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4301__+MAX_llx_menu__, 'members', '', 4300__+MAX_llx_menu__, '/adherents/liste.php?statut=-1&leftmenu=accountancy&mainmenu=members', 'NewSubscription', 1, 'compta', '$user->rights->adherent->cotisation->creer', '', 2, 0, __ENTITY__); @@ -263,7 +263,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled && $conf->export->enabled', __HANDLER__, 'left', 4501__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/exports/index.php?leftmenu=export', 'Datas', 1, 'members', '$user->rights->adherent->export', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4502__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/htpasswd.php?leftmenu=export', 'Filehtpasswd', 1, 'members', '$user->rights->adherent->export', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4503__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/cartes/carte.php?leftmenu=export', 'MembersCards', 1, 'members', '$user->rights->adherent->export', '', 2, 2, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersTypes', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersType', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4701__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members&action=create', 'New', 1, 'members', '$user->rights->adherent->configurer', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4702__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'List', 1, 'members', '$user->rights->adherent->configurer', '', 2, 1, __ENTITY__); -- Members - Category member diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php index 8c81bf6ea3a..893899ae5cd 100644 --- a/htdocs/includes/menus/standard/eldy.lib.php +++ b/htdocs/includes/menus/standard/eldy.lib.php @@ -21,7 +21,7 @@ /** * \file htdocs/includes/menus/standard/eldy.lib.php * \brief Library for file eldy menus - * \version $Id: eldy.lib.php,v 1.60 2011/07/18 20:19:41 eldy Exp $ + * \version $Id: eldy.lib.php,v 1.59 2011/07/18 18:08:35 eldy Exp $ */ @@ -460,13 +460,13 @@ function print_eldy_menu($db,$atarget,$type_user) else { $url=dol_buildpath($newTabMenu[$i]['url'],1); + if (! preg_match('/\?/',$url)) $url.='?'; + else $url.='&'; if (! preg_match('/mainmenu/i',$url) || ! preg_match('/leftmenu/i',$url)) { - if (! preg_match('/\?/',$url)) $url.='?'; - else $url.='&'; - $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu='; + $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=&'; } - //$url.="idmenu=".$newTabMenu[$i]['rowid']; // Already done by menuLoad + $url.="idmenu=".$newTabMenu[$i]['rowid']; } $url=preg_replace('/__LOGIN__/',$user->login,$url); From ca3ddc3337097db84ceed5494c17f1238a2cc13d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:09:04 +0000 Subject: [PATCH 137/166] Uniformize code From 7e48af6796a0f9dd55e07b1ac30a430c5fabd5a9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:10:28 +0000 Subject: [PATCH 138/166] Prepare 3.1.0 From b475f2305d04ef10f5db738d21101767f7b51fd3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:31:53 +0000 Subject: [PATCH 139/166] Prepare 3.1.0 From 48496fec3a40d8fb9fac68181f30872929865b2b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 19:25:46 +0000 Subject: [PATCH 140/166] Fix: Debug new features --- htdocs/includes/menus/init_menu_auguria.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql index 7d9b48b817b..1f864826999 100644 --- a/htdocs/includes/menus/init_menu_auguria.sql +++ b/htdocs/includes/menus/init_menu_auguria.sql @@ -1,6 +1,6 @@ -- --- $Id: init_menu_auguria.sql,v 1.122 2011/07/18 18:08:35 eldy Exp $ --- $Revision: 1.122 $ +-- $Id: init_menu_auguria.sql,v 1.123 2011/07/18 19:25:48 eldy Exp $ +-- $Revision: 1.123 $ -- -- Menu base entries -- This file is loaded when a menu handler base is activated (auguria, etc..) @@ -254,7 +254,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4205__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=outofdate', 'MenuMembersNotUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 4, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4206__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=uptodate', 'MenuMembersUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4208__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersStats', 1, 'members', '$user->rights->adherent->lire', '', 2, 7, __ENTITY__); -- Members - Subscriptions insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4300__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/index.php?leftmenu=accountancy&mainmenu=members', 'Subscriptions', 0, 'compta', '$user->rights->adherent->cotisation->lire', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4301__+MAX_llx_menu__, 'members', '', 4300__+MAX_llx_menu__, '/adherents/liste.php?statut=-1&leftmenu=accountancy&mainmenu=members', 'NewSubscription', 1, 'compta', '$user->rights->adherent->cotisation->creer', '', 2, 0, __ENTITY__); @@ -263,7 +263,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled && $conf->export->enabled', __HANDLER__, 'left', 4501__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/exports/index.php?leftmenu=export', 'Datas', 1, 'members', '$user->rights->adherent->export', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4502__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/htpasswd.php?leftmenu=export', 'Filehtpasswd', 1, 'members', '$user->rights->adherent->export', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4503__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/cartes/carte.php?leftmenu=export', 'MembersCards', 1, 'members', '$user->rights->adherent->export', '', 2, 2, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersType', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersTypes', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4701__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members&action=create', 'New', 1, 'members', '$user->rights->adherent->configurer', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4702__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'List', 1, 'members', '$user->rights->adherent->configurer', '', 2, 1, __ENTITY__); -- Members - Category member From aed8e00a9c5bdc67b806736a08a1e447c24329eb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 20:03:42 +0000 Subject: [PATCH 141/166] Update screenshots From 6d3c142e1f5c4c5c2c5d1c53307bb497e552849e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 20:19:41 +0000 Subject: [PATCH 142/166] Try a better fix to avoid duplicate idmenu into url --- htdocs/includes/menus/standard/eldy.lib.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php index 893899ae5cd..8c81bf6ea3a 100644 --- a/htdocs/includes/menus/standard/eldy.lib.php +++ b/htdocs/includes/menus/standard/eldy.lib.php @@ -21,7 +21,7 @@ /** * \file htdocs/includes/menus/standard/eldy.lib.php * \brief Library for file eldy menus - * \version $Id: eldy.lib.php,v 1.59 2011/07/18 18:08:35 eldy Exp $ + * \version $Id: eldy.lib.php,v 1.60 2011/07/18 20:19:41 eldy Exp $ */ @@ -460,13 +460,13 @@ function print_eldy_menu($db,$atarget,$type_user) else { $url=dol_buildpath($newTabMenu[$i]['url'],1); - if (! preg_match('/\?/',$url)) $url.='?'; - else $url.='&'; if (! preg_match('/mainmenu/i',$url) || ! preg_match('/leftmenu/i',$url)) { - $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=&'; + if (! preg_match('/\?/',$url)) $url.='?'; + else $url.='&'; + $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu='; } - $url.="idmenu=".$newTabMenu[$i]['rowid']; + //$url.="idmenu=".$newTabMenu[$i]['rowid']; // Already done by menuLoad } $url=preg_replace('/__LOGIN__/',$user->login,$url); From 93970e350de28f19b4506f5d474a477c78c45741 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 21:08:46 +0000 Subject: [PATCH 143/166] Fix: Trans From 507ad687643fd153ab5690ca5e3b67b356f37c75 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:28:30 +0000 Subject: [PATCH 144/166] Delete of security event keep add a delete event From 5dd5c7ab72d07862e073f5d70a44dfdfb7356171 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:35:06 +0000 Subject: [PATCH 145/166] Doxygen From 0ca9b5f2a9ed148e221e25e430e19128c9a39303 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:37:03 +0000 Subject: [PATCH 146/166] Nicer look From 13724958c2ebe5a9f635faa5f918a86806ef590a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 03:49:10 +0000 Subject: [PATCH 147/166] Fix: img extension was not correctly managed From 58d73fa67f2d52f72ef07a0645c4665ec3f4d7a6 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 18 Jul 2011 08:59:42 +0000 Subject: [PATCH 148/166] Fix: uniformize code From aa5e8600cc8b7e4bb2026c35a810996bcdee91db Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 18 Jul 2011 10:22:22 +0000 Subject: [PATCH 149/166] Fix: bad gmap mode From ce9acc1cc2cf08a882567022cfb175855c3fce7e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 11:11:19 +0000 Subject: [PATCH 150/166] Fix: Several fix in vat calculation. Add warning to say deposit invoices are not included. From 17a6f1c8bc43e7d5c53782579277c075f22afccf Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 11:31:53 +0000 Subject: [PATCH 151/166] Fix: SMS setup From 27a293ea2c1ef70215140bc9f796e95e32a29d80 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 18 Jul 2011 16:37:14 +0000 Subject: [PATCH 152/166] Fix: Show LastName or ThirdPartyName label correctly (very important for the Hispanic community) --- htdocs/societe/soc.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 93ba18473fa..f843e20558c 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -26,7 +26,7 @@ * \file htdocs/societe/soc.php * \ingroup societe * \brief Third party card page - * \version $Id: soc.php,v 1.123 2011/07/18 16:48:26 simnandez Exp $ + * \version $Id: soc.php,v 1.122 2011/07/18 16:37:14 simnandez Exp $ */ require("../main.inc.php"); @@ -275,7 +275,7 @@ if (empty($reshook)) dol_syslog("This thirdparty is a personal people",LOG_DEBUG); $contact=new Contact($db); - $contact->civilite_id=$object->civilite_id; + $contact->civilite_id = $object->civilite_id; $contact->name=$object->nom_particulier; $contact->firstname=$object->prenom; $contact->address=$object->address; @@ -283,13 +283,10 @@ if (empty($reshook)) $contact->cp=$object->cp; $contact->town=$object->town; $contact->ville=$object->ville; - $contact->fk_departement=$object->departement_id; - $contact->fk_pays=$object->pays_id; + $contact->fk_pays=$object->fk_pays; $contact->socid=$object->id; // fk_soc $contact->status=1; $contact->email=$object->email; - $contact->phone_pro=$object->tel; - $contact->fax=$object->fax; $contact->priv=0; $result=$contact->create($user); @@ -1968,5 +1965,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/18 16:48:26 $ - $Revision: 1.123 $'); +llxFooter('$Date: 2011/07/18 16:37:14 $ - $Revision: 1.122 $'); ?> \ No newline at end of file From e56c789f4e1cfcdc943a78a5548099968e9c4063 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 18 Jul 2011 16:48:26 +0000 Subject: [PATCH 153/166] Fix: Correct and add more data to the contact into Private individual creation --- htdocs/societe/soc.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index f843e20558c..93ba18473fa 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -26,7 +26,7 @@ * \file htdocs/societe/soc.php * \ingroup societe * \brief Third party card page - * \version $Id: soc.php,v 1.122 2011/07/18 16:37:14 simnandez Exp $ + * \version $Id: soc.php,v 1.123 2011/07/18 16:48:26 simnandez Exp $ */ require("../main.inc.php"); @@ -275,7 +275,7 @@ if (empty($reshook)) dol_syslog("This thirdparty is a personal people",LOG_DEBUG); $contact=new Contact($db); - $contact->civilite_id = $object->civilite_id; + $contact->civilite_id=$object->civilite_id; $contact->name=$object->nom_particulier; $contact->firstname=$object->prenom; $contact->address=$object->address; @@ -283,10 +283,13 @@ if (empty($reshook)) $contact->cp=$object->cp; $contact->town=$object->town; $contact->ville=$object->ville; - $contact->fk_pays=$object->fk_pays; + $contact->fk_departement=$object->departement_id; + $contact->fk_pays=$object->pays_id; $contact->socid=$object->id; // fk_soc $contact->status=1; $contact->email=$object->email; + $contact->phone_pro=$object->tel; + $contact->fax=$object->fax; $contact->priv=0; $result=$contact->create($user); @@ -1965,5 +1968,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/18 16:37:14 $ - $Revision: 1.122 $'); +llxFooter('$Date: 2011/07/18 16:48:26 $ - $Revision: 1.123 $'); ?> \ No newline at end of file From 20db25d47df5f3d3d7a6c29de3b48595a55a56ff Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 17:54:09 +0000 Subject: [PATCH 154/166] Fix: Translation of id prof From 931aab80709d2cbbde98a8fdcb17ff6e6c97873b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:07:36 +0000 Subject: [PATCH 155/166] Fix: encoding From 4aeeb618efb0d73048e5e29e0576f1cfd22ceb21 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:08:35 +0000 Subject: [PATCH 156/166] Enable SMS menu --- htdocs/includes/menus/init_menu_auguria.sql | 8 ++++---- htdocs/includes/menus/standard/eldy.lib.php | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql index 1f864826999..7d9b48b817b 100644 --- a/htdocs/includes/menus/init_menu_auguria.sql +++ b/htdocs/includes/menus/init_menu_auguria.sql @@ -1,6 +1,6 @@ -- --- $Id: init_menu_auguria.sql,v 1.123 2011/07/18 19:25:48 eldy Exp $ --- $Revision: 1.123 $ +-- $Id: init_menu_auguria.sql,v 1.122 2011/07/18 18:08:35 eldy Exp $ +-- $Revision: 1.122 $ -- -- Menu base entries -- This file is loaded when a menu handler base is activated (auguria, etc..) @@ -254,7 +254,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4205__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=outofdate', 'MenuMembersNotUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 4, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4206__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=uptodate', 'MenuMembersUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4208__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersStats', 1, 'members', '$user->rights->adherent->lire', '', 2, 7, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); -- Members - Subscriptions insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4300__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/index.php?leftmenu=accountancy&mainmenu=members', 'Subscriptions', 0, 'compta', '$user->rights->adherent->cotisation->lire', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4301__+MAX_llx_menu__, 'members', '', 4300__+MAX_llx_menu__, '/adherents/liste.php?statut=-1&leftmenu=accountancy&mainmenu=members', 'NewSubscription', 1, 'compta', '$user->rights->adherent->cotisation->creer', '', 2, 0, __ENTITY__); @@ -263,7 +263,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled && $conf->export->enabled', __HANDLER__, 'left', 4501__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/exports/index.php?leftmenu=export', 'Datas', 1, 'members', '$user->rights->adherent->export', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4502__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/htpasswd.php?leftmenu=export', 'Filehtpasswd', 1, 'members', '$user->rights->adherent->export', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4503__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/cartes/carte.php?leftmenu=export', 'MembersCards', 1, 'members', '$user->rights->adherent->export', '', 2, 2, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersTypes', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersType', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4701__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members&action=create', 'New', 1, 'members', '$user->rights->adherent->configurer', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4702__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'List', 1, 'members', '$user->rights->adherent->configurer', '', 2, 1, __ENTITY__); -- Members - Category member diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php index 8c81bf6ea3a..893899ae5cd 100644 --- a/htdocs/includes/menus/standard/eldy.lib.php +++ b/htdocs/includes/menus/standard/eldy.lib.php @@ -21,7 +21,7 @@ /** * \file htdocs/includes/menus/standard/eldy.lib.php * \brief Library for file eldy menus - * \version $Id: eldy.lib.php,v 1.60 2011/07/18 20:19:41 eldy Exp $ + * \version $Id: eldy.lib.php,v 1.59 2011/07/18 18:08:35 eldy Exp $ */ @@ -460,13 +460,13 @@ function print_eldy_menu($db,$atarget,$type_user) else { $url=dol_buildpath($newTabMenu[$i]['url'],1); + if (! preg_match('/\?/',$url)) $url.='?'; + else $url.='&'; if (! preg_match('/mainmenu/i',$url) || ! preg_match('/leftmenu/i',$url)) { - if (! preg_match('/\?/',$url)) $url.='?'; - else $url.='&'; - $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu='; + $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=&'; } - //$url.="idmenu=".$newTabMenu[$i]['rowid']; // Already done by menuLoad + $url.="idmenu=".$newTabMenu[$i]['rowid']; } $url=preg_replace('/__LOGIN__/',$user->login,$url); From 93688c0794d93e7ec3801a0d7623d13ee0eb6317 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:09:04 +0000 Subject: [PATCH 157/166] Uniformize code From fd6257f0595a71ad4e8c392ccf230abd32cf7b95 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:10:28 +0000 Subject: [PATCH 158/166] Prepare 3.1.0 From 9b9fb8c5e96ef638dbe4265a90087a61d3c390f5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:31:53 +0000 Subject: [PATCH 159/166] Prepare 3.1.0 From 7d18a7fac38b6df0db52998f2cf89790e5b07133 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 19:25:46 +0000 Subject: [PATCH 160/166] Fix: Debug new features --- htdocs/includes/menus/init_menu_auguria.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql index 7d9b48b817b..1f864826999 100644 --- a/htdocs/includes/menus/init_menu_auguria.sql +++ b/htdocs/includes/menus/init_menu_auguria.sql @@ -1,6 +1,6 @@ -- --- $Id: init_menu_auguria.sql,v 1.122 2011/07/18 18:08:35 eldy Exp $ --- $Revision: 1.122 $ +-- $Id: init_menu_auguria.sql,v 1.123 2011/07/18 19:25:48 eldy Exp $ +-- $Revision: 1.123 $ -- -- Menu base entries -- This file is loaded when a menu handler base is activated (auguria, etc..) @@ -254,7 +254,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4205__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=outofdate', 'MenuMembersNotUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 4, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4206__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=uptodate', 'MenuMembersUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4208__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&statut=0', 'MenuMembersStats', 1, 'members', '$user->rights->adherent->lire', '', 2, 7, __ENTITY__); -- Members - Subscriptions insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4300__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/index.php?leftmenu=accountancy&mainmenu=members', 'Subscriptions', 0, 'compta', '$user->rights->adherent->cotisation->lire', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4301__+MAX_llx_menu__, 'members', '', 4300__+MAX_llx_menu__, '/adherents/liste.php?statut=-1&leftmenu=accountancy&mainmenu=members', 'NewSubscription', 1, 'compta', '$user->rights->adherent->cotisation->creer', '', 2, 0, __ENTITY__); @@ -263,7 +263,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled && $conf->export->enabled', __HANDLER__, 'left', 4501__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/exports/index.php?leftmenu=export', 'Datas', 1, 'members', '$user->rights->adherent->export', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4502__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/htpasswd.php?leftmenu=export', 'Filehtpasswd', 1, 'members', '$user->rights->adherent->export', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4503__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/cartes/carte.php?leftmenu=export', 'MembersCards', 1, 'members', '$user->rights->adherent->export', '', 2, 2, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersType', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'MembersTypes', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4701__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members&action=create', 'New', 1, 'members', '$user->rights->adherent->configurer', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4702__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'List', 1, 'members', '$user->rights->adherent->configurer', '', 2, 1, __ENTITY__); -- Members - Category member From 94c3807017f8c58258b29c44d3ef2bce836d0da4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 20:03:42 +0000 Subject: [PATCH 161/166] Update screenshots From 5355c2904f68479f2144b62ce80fbd32e110d1f3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 20:19:41 +0000 Subject: [PATCH 162/166] Try a better fix to avoid duplicate idmenu into url --- htdocs/includes/menus/standard/eldy.lib.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php index 893899ae5cd..8c81bf6ea3a 100644 --- a/htdocs/includes/menus/standard/eldy.lib.php +++ b/htdocs/includes/menus/standard/eldy.lib.php @@ -21,7 +21,7 @@ /** * \file htdocs/includes/menus/standard/eldy.lib.php * \brief Library for file eldy menus - * \version $Id: eldy.lib.php,v 1.59 2011/07/18 18:08:35 eldy Exp $ + * \version $Id: eldy.lib.php,v 1.60 2011/07/18 20:19:41 eldy Exp $ */ @@ -460,13 +460,13 @@ function print_eldy_menu($db,$atarget,$type_user) else { $url=dol_buildpath($newTabMenu[$i]['url'],1); - if (! preg_match('/\?/',$url)) $url.='?'; - else $url.='&'; if (! preg_match('/mainmenu/i',$url) || ! preg_match('/leftmenu/i',$url)) { - $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=&'; + if (! preg_match('/\?/',$url)) $url.='?'; + else $url.='&'; + $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu='; } - $url.="idmenu=".$newTabMenu[$i]['rowid']; + //$url.="idmenu=".$newTabMenu[$i]['rowid']; // Already done by menuLoad } $url=preg_replace('/__LOGIN__/',$user->login,$url); From 7c7bc42b6ef5896c6a9b38a2f888dcf4533bf291 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 21:08:46 +0000 Subject: [PATCH 163/166] Fix: Trans From 218075460645022d9c47158fb6198882a503086c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:28:30 +0000 Subject: [PATCH 164/166] Delete of security event keep add a delete event From 2974b8d479a46709bbd09dc7372faf8bd89acc69 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:35:06 +0000 Subject: [PATCH 165/166] Doxygen From 3a15d170774272f595a2310dc229830c5661a0a0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:37:03 +0000 Subject: [PATCH 166/166] Nicer look