lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.1-beta' of git@github.com:Dolibarr/dolibarr.git into 3.1-beta

Browse Source
This commit is contained in:
eldy 2011-08-29 19:26:03 +02:00
commit 06cd859529
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/propal/index.php
View File

@ -183,7 +183,7 @@ if ($conf->propal->enabled)
$obj = $db->fetch_object($resql);
print "<tr $bc[$var]>";
print '<td nowrap="nowrap">';
print "<a href=\"fiche.php?id=".$obj->rowid."\">".img_object($langs->trans("ShowPropal"),"propal").' '.$obj->ref."</a></td>";
print "<a href=".DOL_URL_ROOT."/comm/propal.php?id=".$obj->rowid.">".img_object($langs->trans("ShowPropal"),"propal").' '.$obj->ref."</a></td>";
print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).'</a></td></tr>';
$i++;
}

3
htdocs/install/mysql/migration/3.0.0-3.1.0.sql
View File

@ -484,3 +484,6 @@ ALTER TABLE llx_don ADD phone_mobile varchar(24) after email;
ALTER TABLE llx_don ADD phone varchar(24) after email;
ALTER TABLE llx_user ADD civilite varchar(6) after entity;
ALTER TABLE llx_element_element MODIFY sourcetype varchar(32) NOT NULL;
ALTER TABLE llx_element_element MODIFY targettype varchar(32) NOT NULL;

7
htdocs/install/mysql/tables/llx_element_element.sql
View File

@ -1,5 +1,6 @@
-- ============================================================================
-- Copyright (C) 2008 Laurent Destailleur <eldy@users.sourceforge.net>
-- Copyright (C) 2008-2011 Laurent Destailleur <eldy@users.sourceforge.net>
-- Copyright (C) 2011 Regis Houssin <regis@dolibarr.fr>
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
@ -24,8 +25,8 @@ create table llx_element_element
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
fk_source integer NOT NULL,
sourcetype varchar(16) NOT NULL,
sourcetype varchar(32) NOT NULL,
fk_target integer NOT NULL,
targettype varchar(16) NOT NULL
targettype varchar(32) NOT NULL
) ENGINE=innodb;