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

New: Can insert links into elements lines. Also reported into PDF.

Browse Source
This commit is contained in:
Laurent Destailleur 2012-06-09 13:16:55 +02:00
parent 931b1d3ab7
commit fd0450457d
7 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -15,6 +15,9 @@ For users:
- New: Cloning project allow to clones task, notes, files, contacts.
- New: Enhance default style.
- New: Can edit and resiliate member status from list.
- New: Can insert links into elements lines. Also reported into PDF.
- Fix: No images into product description lines as PDF generation does
not work with this.
For developers:
- New: A module can overwrite templates parts.

10
htdocs/product/fiche.php
View File

@ -251,7 +251,7 @@ if (empty($reshook))
if ($object->fetch($id,$ref))
{
$object->oldcopy=dol_clone($object);
$object->ref = $ref;
$object->libelle = $_POST["libelle"];
$object->description = dol_htmlcleanlastbr($_POST["desc"]);
@ -745,7 +745,7 @@ else
print '<tr><td valign="top">'.$langs->trans("Description").'</td><td>';
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$doleditor=new DolEditor('desc',$_POST["desc"],'',160,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,4,90);
$doleditor=new DolEditor('desc',$_POST["desc"],'',160,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,4,90);
$doleditor->Create();
print "</td></tr>";
@ -821,7 +821,7 @@ else
// Note (private, no output on invoices, propales...)
print '<tr><td valign="top">'.$langs->trans("NoteNotVisibleOnBill").'</td><td>';
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$doleditor=new DolEditor('note',$_POST["note"],'',180,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,8,70);
$doleditor=new DolEditor('note',$_POST["note"],'',180,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,8,70);
$doleditor->Create();
print "</td></tr>";
@ -932,7 +932,7 @@ else
// Description (used in invoice, propal...)
print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="2">';
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$doleditor=new DolEditor('desc',$object->description,'',160,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,4,90);
$doleditor=new DolEditor('desc',$object->description,'',160,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,4,90);
$doleditor->Create();
print "</td></tr>";
print "\n";
@ -1024,7 +1024,7 @@ else
// Note
print '<tr><td valign="top">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="2">';
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$doleditor=new DolEditor('note',$object->note,'',200,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,8,70);
$doleditor=new DolEditor('note',$object->note,'',200,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,8,70);
$doleditor->Create();
print "</td></tr>";
print '</table>';

2
htdocs/theme/auguria/ckeditor/config.js
View File

@ -77,6 +77,6 @@ CKEDITOR.editorConfig = function( config )
['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
['NumberedList','BulletedList','Outdent','Indent'],
['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
['SpecialChar']
['Link','Unlink','SpecialChar']
];
};

2
htdocs/theme/bureau2crea/ckeditor/config.js
View File

@ -77,6 +77,6 @@ CKEDITOR.editorConfig = function( config )
['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
['NumberedList','BulletedList','Outdent','Indent'],
['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
['SpecialChar']
['Link','Unlink','SpecialChar']
];
};

2
htdocs/theme/cameleo/ckeditor/config.js
View File

@ -77,6 +77,6 @@ CKEDITOR.editorConfig = function( config )
['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
['NumberedList','BulletedList','Outdent','Indent'],
['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
['SpecialChar']
['Link','Unlink','SpecialChar']
];
};

2
htdocs/theme/eldy/ckeditor/config.js
View File

@ -77,6 +77,6 @@ CKEDITOR.editorConfig = function( config )
['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
['NumberedList','BulletedList','Outdent','Indent'],
['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
['SpecialChar']
['Link','Unlink','SpecialChar']
];
};

2
htdocs/theme/eldy/fckeditor/fckconfig.js
View File

@ -128,7 +128,7 @@ FCKConfig.ToolbarSets["dolibarr_details"] = [
['Bold','Italic','Underline','StrikeThrough','Subscript','Superscript','-','TextColor','RemoveFormat'],
['OrderedList','UnorderedList','-','Outdent','Indent'],
['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'],
['SpecialChar'],
['Link','Unlink','SpecialChar'],
['FontSize']
] ;