From dd57df3ee77709fbdf7c8413b2ed6a556be110d3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 20:19:41 +0000 Subject: [PATCH 01/61] Try a better fix to avoid duplicate idmenu into url From b129ce713f5d0bd89e21a70343f951ed4409e947 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 21:08:46 +0000 Subject: [PATCH 02/61] Fix: Trans From 25b951bcbb9c339c49a2d86558cabbc9a2a223c1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:28:30 +0000 Subject: [PATCH 03/61] Delete of security event keep add a delete event From 6d3048eef488630ebea5281a61817f364a37001c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:35:06 +0000 Subject: [PATCH 04/61] Doxygen From a183d1de61fc982b1e662179728ad39636b390e5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:37:03 +0000 Subject: [PATCH 05/61] Nicer look From 83a2023a6358d0f893f045b1cb3ff6fd40fbc7b5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 17:54:09 +0000 Subject: [PATCH 06/61] Fix: Translation of id prof From 1011603c057ef6ad0f98ad45f513b291cf8e8e39 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:07:36 +0000 Subject: [PATCH 07/61] Fix: encoding From 3bdcd161a8dfa2f36bddbfbc1775cd24f59f499b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:08:35 +0000 Subject: [PATCH 08/61] 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 09280556eaa1cb6e287f78d71119833ccd3c9725 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:09:04 +0000 Subject: [PATCH 09/61] Uniformize code From 88005e6cf7799c763a044c4b9e01941e3df400d8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:10:28 +0000 Subject: [PATCH 10/61] Prepare 3.1.0 From 6de31ca88da34be19a38218b6d175cb87f5a4941 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:31:53 +0000 Subject: [PATCH 11/61] Prepare 3.1.0 From 688422c84df0b24aa9dbc2cd59b192827569a6c5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 19:25:46 +0000 Subject: [PATCH 12/61] 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 76dd648c8d7de699cb68b5d99487dc4680f8fa62 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 20:03:42 +0000 Subject: [PATCH 13/61] Update screenshots From 11c350d56862da2f66bf3f237b09ac45a42f9791 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 20:19:41 +0000 Subject: [PATCH 14/61] 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 cb930ca43d68a0b5478de2f235bfb3a0bd111f92 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 21:08:46 +0000 Subject: [PATCH 15/61] Fix: Trans From cf5353d71e87e919e5a5913418aa686a325096f5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:28:30 +0000 Subject: [PATCH 16/61] Delete of security event keep add a delete event From 60f9b59776626c1ab175b88eb943494c397164ed Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:35:06 +0000 Subject: [PATCH 17/61] Doxygen From 5f6b922b346ec7f2310c1061a5e08bd89e92d6d1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:37:03 +0000 Subject: [PATCH 18/61] Nicer look From 277c6978844b783173945fabe1a86e51d3b10a31 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:31:53 +0000 Subject: [PATCH 19/61] Prepare 3.1.0 From 5b7ee826c9978e9fbfae71fdf75297429d589885 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 19:25:46 +0000 Subject: [PATCH 20/61] Fix: Debug new features From 223b6f1820b8d657b1def8fc5d324b6724bb837a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 20:03:42 +0000 Subject: [PATCH 21/61] Update screenshots From a4fb732c671f8979f98592c7f97ef84975b5af3c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 20:19:41 +0000 Subject: [PATCH 22/61] Try a better fix to avoid duplicate idmenu into url From b29fa74a933a29c72c5a2c854e213652383f5f4f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 21:08:46 +0000 Subject: [PATCH 23/61] Fix: Trans From faef79f425a52c99864d21279b481b791b83f5d6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:28:30 +0000 Subject: [PATCH 24/61] Delete of security event keep add a delete event From dc91849d3fd597d60ebbf5e3fb8525500cc5d5b8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:35:06 +0000 Subject: [PATCH 25/61] Doxygen From da3c1b5bccce28786d70e7f1e523d0eef96d7a08 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:37:03 +0000 Subject: [PATCH 26/61] Nicer look From a232236cdb775e0eeb0b80a0ab7849f76fa03266 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 20:03:42 +0000 Subject: [PATCH 27/61] Update screenshots From 2777a7427363159ed9c4b5b2103af1c46f548225 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 20:19:41 +0000 Subject: [PATCH 28/61] Try a better fix to avoid duplicate idmenu into url From a681204d8f767d0ec8c1472cf1168a41d42cc81b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 21:08:46 +0000 Subject: [PATCH 29/61] Fix: Trans From 36432619bf6af849a8804abaa63d57d4414800c4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:28:30 +0000 Subject: [PATCH 30/61] Delete of security event keep add a delete event From 5980346d9ecf48ca861c7319221cf79179ce45fe Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:35:06 +0000 Subject: [PATCH 31/61] Doxygen From 91373e2bc5da8ed8c926d30dfe37c9392b772b6f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:37:03 +0000 Subject: [PATCH 32/61] Nicer look From eee5d509bb1b897c68b081dfb770a15cbecd0db0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:37:03 +0000 Subject: [PATCH 33/61] Nicer look From 4759a3722954b1a2a8180ec25018f75f3b61bf5e Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 18 Jul 2011 16:37:14 +0000 Subject: [PATCH 34/61] 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 40c3a5c5292d22425e6d40e12f1f36e4bc657448 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 18 Jul 2011 16:48:26 +0000 Subject: [PATCH 35/61] 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 a43185c795d3c2c119352d9d4d0671563871fffd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 17:54:09 +0000 Subject: [PATCH 36/61] Fix: Translation of id prof From 6b6931e87f23bf5deac432c869f0c6e87c394e13 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 17:54:09 +0000 Subject: [PATCH 37/61] Fix: Translation of id prof From 9051ae9201df5e5d85eda1d0496d86cf149b37fe Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:07:36 +0000 Subject: [PATCH 38/61] Fix: encoding From e35a7ecd4dece3373db8ccfad34f6db168a9aac9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:08:35 +0000 Subject: [PATCH 39/61] 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 e261f6b8718b7a4daedd08399998ead2c557d903 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:09:04 +0000 Subject: [PATCH 40/61] Uniformize code From 97cee23639bba1806899b6f96e5bc63b1c85faf1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:10:28 +0000 Subject: [PATCH 41/61] Prepare 3.1.0 From f81d5e41f463f19b0c7f8fd7458a9f0de71bed8c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 18:31:53 +0000 Subject: [PATCH 42/61] Prepare 3.1.0 From c92b8a281b4133e1807cdf6f0ca5b36408e40427 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 19:25:46 +0000 Subject: [PATCH 43/61] 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 6a50bf26048b48b1c1f30334adac24bf076590db Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 20:03:42 +0000 Subject: [PATCH 44/61] Update screenshots From 003abbdd1126ddbbaf5fadb9570888be75edbfa1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 20:19:41 +0000 Subject: [PATCH 45/61] 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 cd821607a469e44f5dbfe187bb4cf419f785676d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 21:08:46 +0000 Subject: [PATCH 46/61] Fix: Trans From d08eaa42f83aeecc806d71da5900a99037173a0a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:28:30 +0000 Subject: [PATCH 47/61] Delete of security event keep add a delete event From 012447ac635a23d6b19830dc9c37cae85e75e703 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:35:06 +0000 Subject: [PATCH 48/61] Doxygen From 636cb801c53789c744cc0afaf4dad18d0d79c3ac Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jul 2011 23:37:03 +0000 Subject: [PATCH 49/61] Nicer look From b78d4ab2d93bf0818087925064383389f5dc318d Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Tue, 19 Jul 2011 06:55:14 +0000 Subject: [PATCH 50/61] Trad:Several fix in vat calculation. Add warning to say deposit invoices are not included. --- htdocs/langs/ca_ES/compta.lang | 3 ++- htdocs/langs/es_ES/compta.lang | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang index 6af465d52a6..47edc1ef6f5 100644 --- a/htdocs/langs/ca_ES/compta.lang +++ b/htdocs/langs/ca_ES/compta.lang @@ -138,4 +138,5 @@ COMPTA_VAT_ACCOUNT=Codi comptable per defecte per l'IVA (si no està definit en COMPTA_ACCOUNT_CUSTOMER=Codi comptable per defecte de clients (si no està definit a la pestanya tercers) COMPTA_ACCOUNT_SUPPLIER=Codi comptable per defecte de proveïdors (si no està definit a la pestanya tercers) AddRemind=Desglossar import disponible -RemainToDivide=Resta a repartir : \ No newline at end of file +RemainToDivide=Resta a repartir : +WarningDepositsNotIncluded=Les factures de bestreta encara no estan incloses en aquesta versió en el mòdul de comptabilitat. \ No newline at end of file diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang index 47df458f6f0..94b82b26dc7 100644 --- a/htdocs/langs/es_ES/compta.lang +++ b/htdocs/langs/es_ES/compta.lang @@ -138,4 +138,5 @@ COMPTA_VAT_ACCOUNT=Código contable por defecto para el IVA (si no está definid COMPTA_ACCOUNT_CUSTOMER=Código contable por defecto de clientes (si no está definido en la pestaña terceros) COMPTA_ACCOUNT_SUPPLIER=Código contable por defecto de proveedores (si no está definido en la pestaña terceros) AddRemind=Desglosar importe disponible -RemainToDivide=Resto a repartir : \ No newline at end of file +RemainToDivide=Resto a repartir : +WarningDepositsNotIncluded=Las facturas de anticipo aún no están incluidas en esta versión en el módulo de contabilidad. \ No newline at end of file From 07baa8effa41810a3c1c302f10fa108c12267a47 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Tue, 19 Jul 2011 07:02:35 +0000 Subject: [PATCH 51/61] Trad: Fix: SMS setup --- htdocs/langs/ca_ES/admin.lang | 1 + htdocs/langs/es_ES/admin.lang | 1 + 2 files changed, 2 insertions(+) diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index b79ba3f2c77..40ea7f6e150 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -308,6 +308,7 @@ ResponseTimeout=Timeout de resposta SmsTestMessage=Missatge de prova de __PHONEFROM__ per __PHONETO__ ModuleMustBeEnabledFirst=Per utilitzar aquesta funció ha d'estar activat el mòdul %s. SecurityToken=Clau per encriptar urls +NoSmsEngine=No hi ha cap gestor d'enviament de SMS. Els gestors d'enviament de SMS no s'instal·len en estàndard (ja que depenen d'un proveïdor), però pot trobar a la plataforma http://www.dolistore.com # Modules Module0Name=Usuaris y grups Module0Desc=Gestió d'usuaris i grups diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index de8ec9133ef..77b9515000b 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -308,6 +308,7 @@ ResponseTimeout=Timeout de respuesta SmsTestMessage=Mensaje de prueba de __PHONEFROM__ para __PHONETO__ ModuleMustBeEnabledFirst=Para usar esta función debe estar activado el módulo %s. SecurityToken=Clave para encriptar urls +NoSmsEngine=No hay disponible ningún gestor de envío de SMS. Los gestores de envío de SMS no se instalan en estándar (ya que dependen de un proveedor), pero puede encontrar en la plataforma http://www.dolistore.com # Modules Module0Name=Usuarios y grupos Module0Desc=Gestión de usuarios y grupos From 83f457e65c6b2e369ad0ddb35f26f0f8a8e3e8a7 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Tue, 19 Jul 2011 07:33:23 +0000 Subject: [PATCH 52/61] Qual: Uniformize code --- htdocs/societe/soc.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 93ba18473fa..c6a9b4904e2 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.124 2011/07/19 07:33:23 simnandez Exp $ */ require("../main.inc.php"); @@ -702,14 +702,14 @@ else jQuery(".individualline").hide(); jQuery("#typent_id").val(0); jQuery("#effectif_id").val(0); - document.getElementById("TypeName").innerHTML=document.formsoc.ThirdPartyName.value; + jQuery("#TypeName").html(document.formsoc.ThirdPartyName.value); document.formsoc.private.value=0; }); jQuery("#radioprivate").click(function() { jQuery(".individualline").show(); jQuery("#typent_id").val(id_te_private); jQuery("#effectif_id").val(id_ef15); - document.getElementById("TypeName").innerHTML=document.formsoc.LastName.value; + jQuery("#TypeName").html(document.formsoc.LastName.value); document.formsoc.private.value=1; }); jQuery("#selectpays_id").change(function() { @@ -1968,5 +1968,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/18 16:48:26 $ - $Revision: 1.123 $'); +llxFooter('$Date: 2011/07/19 07:33:23 $ - $Revision: 1.124 $'); ?> \ No newline at end of file From 7002498dc98a337cdd813602f489b03246c19421 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 19 Jul 2011 17:14:07 +0000 Subject: [PATCH 53/61] Prepare 3.1.0 --- build/deb/apache.conf | 2 +- build/deb/changelog | 12 ++++++++---- build/deb/postinst | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/build/deb/apache.conf b/build/deb/apache.conf index fa29149ee59..a69e134b325 100644 --- a/build/deb/apache.conf +++ b/build/deb/apache.conf @@ -71,7 +71,7 @@ Alias /dolibarr /usr/share/dolibarr/htdocs Order deny,allow Allow from all - + AllowOverride All Order deny,allow Allow from all diff --git a/build/deb/changelog b/build/deb/changelog index d75fd100a60..b6470a07680 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -1,4 +1,8 @@ -dolibarr 3.1.0 unstable; urgency=low - * New 3.1.0 release - More information into /usr/share/dolibarr/ChangeLog file. - -- maintainer Laurent Destailleur 2011-07-09 \ No newline at end of file +dolibarr (3.1.0-1) unstable; urgency=low + + [ Laurent Destailleur ] + * New upstream release. + + -- Laurent Destailleur Mon, 18 Jul 2011 12:00:00 +0100 + +# More information into /usr/share/dolibarr/ChangeLog file. \ No newline at end of file diff --git a/build/deb/postinst b/build/deb/postinst index be9fb7521b7..650bbc741dc 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -62,8 +62,8 @@ case "$1" in then echo Create empty file /usr/share/dolibarr/htdocs/conf/conf.php touch /usr/share/dolibarr/htdocs/conf/conf.php - chown -R www-data:www-data /usr/share/dolibarr/htdocs/conf/conf.php - chmod -R 750 /usr/share/dolibarr/htdocs/conf/conf.php + chown -R root:www-data /usr/share/dolibarr/htdocs/conf/conf.php + chmod -R 660 /usr/share/dolibarr/htdocs/conf/conf.php fi #db_reset "dolibarr/webserver" From 415a419eb141d8869fa1c13410e49ec6e09482e9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 19 Jul 2011 22:34:31 +0000 Subject: [PATCH 54/61] Work on 3.1.0 packagings --- build/deb/README | 14 ++++++++++++++ build/deb/postinst | 5 +++-- build/deb/postrm | 6 +++--- build/rpm/README | 20 +++++++++++++++++++- 4 files changed, 39 insertions(+), 6 deletions(-) diff --git a/build/deb/README b/build/deb/README index e898dd43821..a3df01413da 100644 --- a/build/deb/README +++ b/build/deb/README @@ -7,6 +7,7 @@ This directory contains files used by makepack-dolibarr.pl script to build a package, ready to be distributed, with format .DEB (for Debian, Ubuntu, ...). + # This is standard command to work on Debian packaging: # # lintian package To test a package @@ -19,3 +20,16 @@ with format .DEB (for Debian, Ubuntu, ...). # # dpkg -L packagename List content of installed package # dpkg --purge Remove config files and interactive saved answers + + +To submit a package to Debian: + +- Post an ITP with reportbugs : +> reportbug -B debian --email username@domain.tld wnpp +See page http://www.debian.org/devel/wnpp/#l1 for example of ITP requests contents. + +- Wait until you received bug number + +- Add a line for upstream into file changelog with bug number + +- Call for a mentor on ML debian-mentors to upload packages diff --git a/build/deb/postinst b/build/deb/postinst index 650bbc741dc..80193b7d01b 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -39,8 +39,8 @@ case "$1" in superuserpassword='' if [ -f /etc/mysql/debian.cnf ] ; then # Load superuser login and pass - superuserlogin=$(/bin/grep --max-count=1 "user" /etc/mysql/debian.cnf | /bin/sed -e 's/^user[ =]*//g') - superuserpassword=$(/bin/grep --max-count=1 "password" /etc/mysql/debian.cnf | /bin/sed -e 's/^password[ =]*//g') + superuserlogin=$(grep --max-count=1 "user" /etc/mysql/debian.cnf | /bin/sed -e 's/^user[ =]*//g') + superuserpassword=$(grep --max-count=1 "password" /etc/mysql/debian.cnf | /bin/sed -e 's/^password[ =]*//g') fi echo Mysql superuser found to use is $superuserlogin if [ -z "$superuserlogin" ] ; then @@ -101,6 +101,7 @@ case "$1" in # not have the same user/group. # chown -R $webuser:$webgroup /usr/share/dolibarr + chown -R root:$webgroup /usr/share/dolibarr/htdocs/conf/conf.php # Add link to config file echo Setup web server $server to add dolibarr config file diff --git a/build/deb/postrm b/build/deb/postrm index c4d1c790e5d..78219066f9a 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -59,15 +59,15 @@ case "$1" in echo postrm Mysql database deletion # Get database configuration dbserver="localhost" - dbname="dolibarr" + dbname="dolibarrmysql" #db_get "dolibarr/db/name" #dbname="$RET" superuserlogin='' superuserpassword='' if [ -f /etc/mysql/debian.cnf ] ; then # Load superuser login and pass - superuserlogin=$(/bin/grep --max-count=1 "user" /etc/mysql/debian.cnf | /bin/sed -e 's/^user[ =]*//g') - superuserpassword=$(/bin/grep --max-count=1 "password" /etc/mysql/debian.cnf | /bin/sed -e 's/^password[ =]*//g') + superuserlogin=$(grep --max-count=1 "user" /etc/mysql/debian.cnf | /bin/sed -e 's/^user[ =]*//g') + superuserpassword=$(grep --max-count=1 "password" /etc/mysql/debian.cnf | /bin/sed -e 's/^password[ =]*//g') fi echo postrm Mysql superuser found to use is $superuserlogin dbadmin="$superuserlogin" diff --git a/build/rpm/README b/build/rpm/README index d868ed411b8..1e947a16435 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -21,4 +21,22 @@ with format RPM (for Redhat, Mandriva, ...). # # On Mageia (after su - root) # urpmi dolibarr-...rpm To install package and dependencies -# urpme dolibarr To remove package \ No newline at end of file +# urpme dolibarr To remove package + + +To submit a package to Fedora: + +- Create a bug with form https://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Fedora&format=fedora-review +This is example of content of review field (used for Bug 723326): +Spec URL: http://www.dolibarr.org/files/fedora/dolibarr.spec +SRPM URL: http://www.dolibarr.org/files/fedora/dolibarr-3.1.0-0.src.rpm +Description: Dolibarr ERP & CRM is an easy to use open source/free software +for small and medium companies, foundations or freelances. It includes +different features for Enterprise Resource Planning (ERP) and Customer +Relationship Management (CRM) but also for different other activities. +I am author of other already packaged OpenSources packages (awstats) but this +is my first package to maintain myself. So i'm seeking a sponsor. + +- Edit field "Block" and add FE-NEEDSPONSOR + + \ No newline at end of file From 31f558eef9bd2e0b0ea9df3d22bf186259430e52 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Tue, 19 Jul 2011 06:55:14 +0000 Subject: [PATCH 55/61] Trad:Several fix in vat calculation. Add warning to say deposit invoices are not included. From c5392b55869f1892b13ebaa128c6e9713cb029a8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 19 Jul 2011 22:41:43 +0000 Subject: [PATCH 56/61] Work on 3.1.0 packagings --- build/deb/README | 5 +++-- build/deb/changelog | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build/deb/README b/build/deb/README index a3df01413da..bac1945b426 100644 --- a/build/deb/README +++ b/build/deb/README @@ -28,8 +28,9 @@ To submit a package to Debian: > reportbug -B debian --email username@domain.tld wnpp See page http://www.debian.org/devel/wnpp/#l1 for example of ITP requests contents. -- Wait until you received bug number - +- Wait until you received bug number. +For first ITP submission of Dolibarr, bug id was 634783. + - Add a line for upstream into file changelog with bug number - Call for a mentor on ML debian-mentors to upload packages diff --git a/build/deb/changelog b/build/deb/changelog index b6470a07680..d4a628fbb4f 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -2,6 +2,7 @@ dolibarr (3.1.0-1) unstable; urgency=low [ Laurent Destailleur ] * New upstream release. + closes: bug#634783 -- Laurent Destailleur Mon, 18 Jul 2011 12:00:00 +0100 From e52115333f65794ffc615f5647a5ad155a48cc97 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Tue, 19 Jul 2011 07:02:35 +0000 Subject: [PATCH 57/61] Trad: Fix: SMS setup --- build/deb/README | 5 ++--- build/deb/changelog | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/build/deb/README b/build/deb/README index bac1945b426..a3df01413da 100644 --- a/build/deb/README +++ b/build/deb/README @@ -28,9 +28,8 @@ To submit a package to Debian: > reportbug -B debian --email username@domain.tld wnpp See page http://www.debian.org/devel/wnpp/#l1 for example of ITP requests contents. -- Wait until you received bug number. -For first ITP submission of Dolibarr, bug id was 634783. - +- Wait until you received bug number + - Add a line for upstream into file changelog with bug number - Call for a mentor on ML debian-mentors to upload packages diff --git a/build/deb/changelog b/build/deb/changelog index d4a628fbb4f..b6470a07680 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -2,7 +2,6 @@ dolibarr (3.1.0-1) unstable; urgency=low [ Laurent Destailleur ] * New upstream release. - closes: bug#634783 -- Laurent Destailleur Mon, 18 Jul 2011 12:00:00 +0100 From d3105da19a8ae16870871e7d2daae136ed257504 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Tue, 19 Jul 2011 07:33:23 +0000 Subject: [PATCH 58/61] Qual: Uniformize code From 207d0b6e09738775ee9af32319af604d33ba3250 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 19 Jul 2011 17:14:07 +0000 Subject: [PATCH 59/61] Prepare 3.1.0 --- build/deb/postinst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build/deb/postinst b/build/deb/postinst index 80193b7d01b..650bbc741dc 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -39,8 +39,8 @@ case "$1" in superuserpassword='' if [ -f /etc/mysql/debian.cnf ] ; then # Load superuser login and pass - superuserlogin=$(grep --max-count=1 "user" /etc/mysql/debian.cnf | /bin/sed -e 's/^user[ =]*//g') - superuserpassword=$(grep --max-count=1 "password" /etc/mysql/debian.cnf | /bin/sed -e 's/^password[ =]*//g') + superuserlogin=$(/bin/grep --max-count=1 "user" /etc/mysql/debian.cnf | /bin/sed -e 's/^user[ =]*//g') + superuserpassword=$(/bin/grep --max-count=1 "password" /etc/mysql/debian.cnf | /bin/sed -e 's/^password[ =]*//g') fi echo Mysql superuser found to use is $superuserlogin if [ -z "$superuserlogin" ] ; then @@ -101,7 +101,6 @@ case "$1" in # not have the same user/group. # chown -R $webuser:$webgroup /usr/share/dolibarr - chown -R root:$webgroup /usr/share/dolibarr/htdocs/conf/conf.php # Add link to config file echo Setup web server $server to add dolibarr config file From 5e01bf14605d468e2a6b3992e23cf9a22c7b44e5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 19 Jul 2011 22:34:31 +0000 Subject: [PATCH 60/61] Work on 3.1.0 packagings --- build/deb/postinst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build/deb/postinst b/build/deb/postinst index 650bbc741dc..80193b7d01b 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -39,8 +39,8 @@ case "$1" in superuserpassword='' if [ -f /etc/mysql/debian.cnf ] ; then # Load superuser login and pass - superuserlogin=$(/bin/grep --max-count=1 "user" /etc/mysql/debian.cnf | /bin/sed -e 's/^user[ =]*//g') - superuserpassword=$(/bin/grep --max-count=1 "password" /etc/mysql/debian.cnf | /bin/sed -e 's/^password[ =]*//g') + superuserlogin=$(grep --max-count=1 "user" /etc/mysql/debian.cnf | /bin/sed -e 's/^user[ =]*//g') + superuserpassword=$(grep --max-count=1 "password" /etc/mysql/debian.cnf | /bin/sed -e 's/^password[ =]*//g') fi echo Mysql superuser found to use is $superuserlogin if [ -z "$superuserlogin" ] ; then @@ -101,6 +101,7 @@ case "$1" in # not have the same user/group. # chown -R $webuser:$webgroup /usr/share/dolibarr + chown -R root:$webgroup /usr/share/dolibarr/htdocs/conf/conf.php # Add link to config file echo Setup web server $server to add dolibarr config file From d305d4c4ec866aa0e7e272f17bab638b6da009ec Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 19 Jul 2011 22:41:43 +0000 Subject: [PATCH 61/61] Work on 3.1.0 packagings --- build/deb/README | 5 +++-- build/deb/changelog | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build/deb/README b/build/deb/README index a3df01413da..bac1945b426 100644 --- a/build/deb/README +++ b/build/deb/README @@ -28,8 +28,9 @@ To submit a package to Debian: > reportbug -B debian --email username@domain.tld wnpp See page http://www.debian.org/devel/wnpp/#l1 for example of ITP requests contents. -- Wait until you received bug number - +- Wait until you received bug number. +For first ITP submission of Dolibarr, bug id was 634783. + - Add a line for upstream into file changelog with bug number - Call for a mentor on ML debian-mentors to upload packages diff --git a/build/deb/changelog b/build/deb/changelog index b6470a07680..d4a628fbb4f 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -2,6 +2,7 @@ dolibarr (3.1.0-1) unstable; urgency=low [ Laurent Destailleur ] * New upstream release. + closes: bug#634783 -- Laurent Destailleur Mon, 18 Jul 2011 12:00:00 +0100