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

Fix multientity on overwritting translation not yet supported.

Browse Source
This commit is contained in:
Laurent Destailleur 2016-10-28 22:47:37 +02:00
parent 4f5c5a2b0e
commit 38e6c9cc57
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/admin/translation.php
View File

@ -222,7 +222,7 @@ if ($mode == 'overwrite')
print '<input type="text" class="quatrevingtpercent" name="transvalue" value="">'; print '<input type="text" class="quatrevingtpercent" name="transvalue" value="">';
print '</td>'; print '</td>';
// Limit to superadmin // Limit to superadmin
if (! empty($conf->multicompany->enabled) && !$user->entity) /*if (! empty($conf->multicompany->enabled) && !$user->entity)
{ {
print '<td>'; print '<td>';
print '<input type="text" class="flat" size="1" name="entity" value="'.$conf->entity.'">'; print '<input type="text" class="flat" size="1" name="entity" value="'.$conf->entity.'">';
@ -230,10 +230,10 @@ if ($mode == 'overwrite')
print '<td align="center">'; print '<td align="center">';
} }
else else
{ {*/
print '<td align="center">'; print '<td align="center">';
print '<input type="hidden" name="entity" value="'.$conf->entity.'">'; print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
} //}
print '<input type="submit" class="button" value="'.$langs->trans("Add").'" name="add">'; print '<input type="submit" class="button" value="'.$langs->trans("Add").'" name="add">';
print "</td>\n"; print "</td>\n";
print '</tr>'; print '</tr>';
@ -388,15 +388,15 @@ if ($mode == 'searchkey')
print '</td><td>'; print '</td><td>';
print '<input type="text" class="quatrevingtpercent" name="transvalue" value="'.$transvalue.'">'; print '<input type="text" class="quatrevingtpercent" name="transvalue" value="'.$transvalue.'">';
// Limit to superadmin // Limit to superadmin
if (! empty($conf->multicompany->enabled) && !$user->entity) /*if (! empty($conf->multicompany->enabled) && !$user->entity)
{ {
print '</td><td>'; print '</td><td>';
print '<input type="text" class="flat" size="1" name="entitysearch" value="'.$conf->entity.'">'; print '<input type="text" class="flat" size="1" name="entitysearch" value="'.$conf->entity.'">';
} }
else else
{ {*/
print '<input type="hidden" name="entitysearch" value="'.$conf->entity.'">'; print '<input type="hidden" name="entitysearch" value="'.$conf->entity.'">';
} //}
print '</td>'; print '</td>';
// Action column // Action column
print '<td class="liste_titre" align="middle">'; print '<td class="liste_titre" align="middle">';
@ -427,6 +427,10 @@ if ($mode == 'searchkey')
$htmltext = $langs->trans("OriginalValueWas", $newlangfileonly->tab_translate[$key]); $htmltext = $langs->trans("OriginalValueWas", $newlangfileonly->tab_translate[$key]);
print $form->textwithpicto('', $htmltext, 1, 'warning'); print $form->textwithpicto('', $htmltext, 1, 'warning');
} }
if (! empty($conf->multicompany->enabled) && !$user->entity)
{
print $val;
}
print '</td></tr>'."\n"; print '</td></tr>'."\n";
} }

2
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
View File

@ -173,3 +173,5 @@ ALTER TABLE llx_bank_account ADD COLUMN note_public text;
ALTER TABLE llx_bank_account ADD COLUMN model_pdf varchar(255); ALTER TABLE llx_bank_account ADD COLUMN model_pdf varchar(255);
ALTER TABLE llx_bank_account ADD COLUMN import_key varchar(14); ALTER TABLE llx_bank_account ADD COLUMN import_key varchar(14);
ALTER TABLE llx_overwrite_trans ADD COLUMN integer DEFAULT 1 NOT NULL;

1
htdocs/install/mysql/tables/llx_overwrite_trans.sql
View File

@ -19,6 +19,7 @@
create table llx_overwrite_trans create table llx_overwrite_trans
( (
rowid integer AUTO_INCREMENT PRIMARY KEY, rowid integer AUTO_INCREMENT PRIMARY KEY,
entity integer DEFAULT 1 NOT NULL, -- multi company id
lang varchar(5), -- en_US, fr_FR ... lang varchar(5), -- en_US, fr_FR ...
transkey varchar(128), transkey varchar(128),
transvalue text transvalue text