diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index e7eea16f316..af81e797252 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -1056,7 +1056,7 @@ if ($action == 'create')
print '| ';
print $form->textwithpicto($langs->trans('NotePublic'), $htmltext, 1, 'help', '', 0, 2, 'notepublic');
print ' | ';
- print '';
+ print ' | ';
$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
print $doleditor->Create(1);
@@ -1067,7 +1067,7 @@ if ($action == 'create')
print ' | ';
print $form->textwithpicto($langs->trans('NotePrivate'), $htmltext, 1, 'help', '', 0, 2, 'noteprivate');
print ' | ';
- print '';
+ print ' | ';
$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
print $doleditor->Create(1);
// print '
@@ -1396,7 +1396,7 @@ else
// Note public
print ' | | ';
print $form->editfieldkey($form->textwithpicto($langs->trans('NotePublic'), $htmltext, 1, 'help', '', 0, 2, 'notepublic'), 'note_public', $object->note_public, $object, $user->rights->facture->creer);
- print ' | ';
+ print ' | ';
print $form->editfieldval($langs->trans("NotePublic"), 'note_public', $object->note_public, $object, $user->rights->facture->creer, 'textarea:'.ROWS_4.':90%', '', null, null, '', 1);
print ' | ';
print '
';
@@ -1404,7 +1404,7 @@ else
// Note private
print '| ';
print $form->editfieldkey($form->textwithpicto($langs->trans("NotePrivate"), $htmltext, 1, 'help', '', 0, 2, 'noteprivate'), 'note_private', $object->note_private, $object, $user->rights->facture->creer);
- print ' | ';
+ print ' | ';
print $form->editfieldval($langs->trans("NotePrivate"), 'note_private', $object->note_private, $object, $user->rights->facture->creer, 'textarea:'.ROWS_4.':90%', '', null, null, '', 1);
print ' | ';
print '
';
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 0c62c190992..4f1726a45c6 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -881,7 +881,8 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
$sql .= " WHERE t.fk_soc = ".$object->id;
if ($search_status!='' && $search_status != '-1') $sql .= " AND t.statut = ".$db->escape($search_status);
if ($search_name) $sql .= " AND (t.lastname LIKE '%".$db->escape($search_name)."%' OR t.firstname LIKE '%".$db->escape($search_name)."%')";
- $sql.= " ORDER BY $sortfield $sortorder";
+ if ($sortfield == "t.name") $sql.=" ORDER BY t.lastname $sortorder, t.firstname $sortorder";
+ else $sql.= " ORDER BY $sortfield $sortorder";
dol_syslog('core/lib/company.lib.php :: show_contacts', LOG_DEBUG);
$result = $db->query($sql);
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 9704f3df684..b9dff516bbd 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -176,13 +176,14 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1700__+MAX_llx_menu__, 'billing', 'customer_bills', 6__+MAX_llx_menu__, '/compta/facture/list.php?leftmenu=customers_bills', 'BillsCustomers', 0, 'bills', '$user->rights->facture->lire', '', 2, 3, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1701__+MAX_llx_menu__, 'billing', '', 1700__+MAX_llx_menu__, '/compta/facture/card.php?action=create&leftmenu=customers_bills', 'NewBill', 1, 'bills', '$user->rights->facture->creer', '', 2, 3, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1705__+MAX_llx_menu__, 'billing', '', 1700__+MAX_llx_menu__, '/compta/facture/list.php?leftmenu=customers_bills', 'List', 1, 'bills', '$user->rights->facture->lire', '', 2, 4, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1702__+MAX_llx_menu__, 'billing', '', 1700__+MAX_llx_menu__, '/compta/facture/invoicetemplate_list.php?leftmenu=customers_bills', 'ListOfTemplates', 1, 'bills', '$user->rights->facture->lire', '', 2, 5, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1720__+MAX_llx_menu__, 'billing', '', 1705__+MAX_llx_menu__, '/compta/facture/list.php?leftmenu=customers_bills_draft&search_status=0', 'BillShortStatusDraft', 2, 'bills', '$user->rights->facture->lire', '', 2, 1, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1721__+MAX_llx_menu__, 'billing', '', 1705__+MAX_llx_menu__, '/compta/facture/list.php?leftmenu=customers_bills_notpaid&search_status=1', 'BillShortStatusNotPaid', 2, 'bills', '$user->rights->facture->lire', '', 2, 2, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1722__+MAX_llx_menu__, 'billing', '', 1705__+MAX_llx_menu__, '/compta/facture/list.php?leftmenu=customers_bills_paid&search_status=2', 'BillShortStatusPaid', 2, 'bills', '$user->rights->facture->lire', '', 2, 3, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1723__+MAX_llx_menu__, 'billing', '', 1705__+MAX_llx_menu__, '/compta/facture/list.php?leftmenu=customers_bills_canceled&search_status=3', 'BillShortStatusCanceled', 2, 'bills', '$user->rights->facture->lire', '', 2, 4, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1702__+MAX_llx_menu__, 'billing', '', 1700__+MAX_llx_menu__, '/compta/facture/invoicetemplate_list.php?leftmenu=customers_bills', 'ListOfTemplates', 1, 'bills', '$user->rights->facture->lire', '', 2, 5, __ENTITY__);
+
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1704__+MAX_llx_menu__, 'billing', 'customers_bills_payment', 1700__+MAX_llx_menu__, '/compta/paiement/list.php?leftmenu=customers_bills_payment', 'Payments', 1, 'bills', '$user->rights->facture->lire', '', 2, 6, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1710__+MAX_llx_menu__, 'billing', 'customers_bills_reports', 1704__+MAX_llx_menu__, '/compta/paiement/rapport.php?leftmenu=customers_bills_reports', 'Reportings', 2, 'bills', '$user->rights->facture->lire', '', 2, 1, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1714__+MAX_llx_menu__, 'billing', 'customers_bills_stats', 1700__+MAX_llx_menu__, '/compta/facture/stats/index.php?leftmenu=customers_bills_stats', 'Statistics', 1, 'bills', '$user->rights->facture->lire', '', 2, 8, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 81791c993f2..d2dba66c53c 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -802,20 +802,20 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
$newmenu->add("/compta/facture/card.php?action=create",$langs->trans("NewBill"),1,$user->rights->facture->creer);
$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills",$langs->trans("List"),1,$user->rights->facture->lire, '', $mainmenu, 'customers_bills_list');
- if ($usemenuhider || empty($leftmenu) || preg_match('/customers_bills/', $leftmenu))
+ if ($usemenuhider || empty($leftmenu) || preg_match('/customers_bills(|draft|notpaid|paid|canceled)$/', $leftmenu))
{
$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_draft&search_status=0",$langs->trans("BillShortStatusDraft"),2,$user->rights->facture->lire);
$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_notpaid&search_status=1",$langs->trans("BillShortStatusNotPaid"),2,$user->rights->facture->lire);
$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_paid&search_status=2",$langs->trans("BillShortStatusPaid"),2,$user->rights->facture->lire);
$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_canceled&search_status=3",$langs->trans("BillShortStatusCanceled"),2,$user->rights->facture->lire);
}
- $newmenu->add("/compta/facture/invoicetemplate_list.php",$langs->trans("ListOfTemplates"),1,$user->rights->facture->creer); // No need to see recurring invoices, if user has no permission to create invoice.
+ $newmenu->add("/compta/facture/invoicetemplate_list.php?leftmenu=customers_bills_templates",$langs->trans("ListOfTemplates"),1,$user->rights->facture->creer,'',$mainmenu,'customers_bills_templates'); // No need to see recurring invoices, if user has no permission to create invoice.
$newmenu->add("/compta/paiement/list.php?leftmenu=customers_bills_payment",$langs->trans("Payments"),1,$user->rights->facture->lire,'',$mainmenu,'customers_bills_payment');
if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
{
- $newmenu->add("/compta/paiement/avalider.php",$langs->trans("MenuToValid"),2,$user->rights->facture->lire,'',$mainmenu,'customer_bills_tovalid');
+ $newmenu->add("/compta/paiement/avalider.php?leftmenu=customers_bills_tovalid",$langs->trans("MenuToValid"),2,$user->rights->facture->lire,'',$mainmenu,'customer_bills_tovalid');
}
$newmenu->add("/compta/paiement/rapport.php?leftmenu=customers_bills_reports",$langs->trans("Reportings"),2,$user->rights->facture->lire,'',$mainmenu,'customers_bills_reports');
@@ -827,7 +827,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
{
$langs->load("bills");
$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills", $langs->trans("BillsSuppliers"),0,$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills');
- $newmenu->add("/fourn/facture/card.php?action=create",$langs->trans("NewBill"),1,$user->rights->fournisseur->facture->creer, '', $mainmenu, 'suppliers_bills_create');
+ $newmenu->add("/fourn/facture/card.php?leftmenu=suppliers_bills&action=create",$langs->trans("NewBill"),1,$user->rights->fournisseur->facture->creer, '', $mainmenu, 'suppliers_bills_create');
$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills", $langs->trans("List"),1,$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_list');
if ($usemenuhider || empty($leftmenu) || preg_match('/suppliers_bills/', $leftmenu)) {
@@ -836,11 +836,11 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_paid&search_status=2", $langs->trans("BillShortStatusPaid"),2,$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_paid');
}
- $newmenu->add("/fourn/facture/paiement.php", $langs->trans("Payments"),1,$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_payment');
+ $newmenu->add("/fourn/facture/paiement.php?leftmenu=suppliers_bills_payment", $langs->trans("Payments"),1,$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_payment');
- $newmenu->add("/fourn/facture/rapport.php",$langs->trans("Reportings"),2,$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_report');
+ $newmenu->add("/fourn/facture/rapport.php?leftmenu=suppliers_bills_report",$langs->trans("Reportings"),2,$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_report');
- $newmenu->add("/compta/facture/stats/index.php?mode=supplier", $langs->trans("Statistics"),1,$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_stats');
+ $newmenu->add("/compta/facture/stats/index.php?mode=supplier&leftmenu=suppliers_bills_stats", $langs->trans("Statistics"),1,$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_stats');
}
// Orders
diff --git a/htdocs/core/modules/project/doc/pdf_baleine.modules.php b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
index 761bf3fcafd..66108da54f8 100644
--- a/htdocs/core/modules/project/doc/pdf_baleine.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
@@ -1,6 +1,7 @@
-
+ * Copyright (C) 2018 Laurent Destailleur
+ *
* 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
* the Free Software Foundation; either version 3 of the License, or
@@ -171,10 +172,10 @@ class pdf_baleine extends ModelePDFProjects
$task = new Task($this->db);
$tasksarray = $task->getTasksArray(0,0,$object->id);
- if (! $object->id > 0) // Special case when used with object = specimen, we may return all lines
- {
- $tasksarray=array_slice($tasksarray, 0, min(5, count($tasksarray)));
- }
+ if (! $object->id > 0) // Special case when used with object = specimen, we may return all lines
+ {
+ $tasksarray=array_slice($tasksarray, 0, min(5, count($tasksarray)));
+ }
$object->lines=$tasksarray;
$nblignes=count($object->lines);
@@ -223,7 +224,7 @@ class pdf_baleine extends ModelePDFProjects
// Rect prend une longueur en 3eme param
$pdf->SetDrawColor(192,192,192);
- $pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
+ $pdf->Rect($this->marge_gauche, $tab_top-2, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+2);
$tab_height = $tab_height - $height_note;
$tab_top = $nexY+6;
@@ -462,7 +463,7 @@ class pdf_baleine extends ModelePDFProjects
$heightoftitleline = 10;
- $default_font_size = pdf_getPDFFontSize($outputlangs);
+ $default_font_size = pdf_getPDFFontSize($outputlangs);
$pdf->SetDrawColor(128,128,128);
@@ -585,7 +586,6 @@ class pdf_baleine extends ModelePDFProjects
}
}
*/
-
}
/**
@@ -605,4 +605,3 @@ class pdf_baleine extends ModelePDFProjects
}
}
-
diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
index 8a288c547d5..f2d06d2ebb2 100644
--- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
@@ -1,7 +1,8 @@
* Copyright (C) 2015 Charlie Benke
-
+ * Copyright (C) 2018 Laurent Destailleur
+ *
* 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
* the Free Software Foundation; either version 3 of the License, or
@@ -48,7 +49,7 @@ if (! empty($conf->agenda->enabled)) require_once DOL_DOCUMENT_ROOT.'/com
/**
- * Classe permettant de generer les projets au modele Baleine
+ * Class to manage generation of project document Baleine
*/
class pdf_beluga extends ModelePDFProjects
@@ -98,6 +99,15 @@ class pdf_beluga extends ModelePDFProjects
$this->posxamountht=$this->marge_gauche+110;
$this->posxamountttc=$this->marge_gauche+135;
$this->posxstatut=$this->marge_gauche+165;
+ if ($this->page_largeur < 210) // To work with US executive format
+ {
+ $this->posxref-=20;
+ $this->posxdate-=20;
+ $this->posxsociete-=20;
+ $this->posxamountht-=20;
+ $this->posxamountttc-=20;
+ $this->posstatut-=20;
+ }
}
@@ -110,7 +120,7 @@ class pdf_beluga extends ModelePDFProjects
*/
function write_file($object,$outputlangs)
{
- global $user,$langs,$conf;
+ global $conf, $hookmanager, $langs, $user;
$formproject=new FormProjets($this->db);
@@ -154,12 +164,14 @@ class pdf_beluga extends ModelePDFProjects
global $action;
$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
- $pdf=pdf_getInstance($this->format);
- $default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
- $heightforinfotot = 50; // Height reserved to output the info and total part
+ // Create pdf instance
+ $pdf=pdf_getInstance($this->format);
+ $default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+ $pdf->SetAutoPageBreak(1,0);
+
+ $heightforinfotot = 40; // Height reserved to output the info and total part
$heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5); // Height reserved to output the free text on last page
$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
- $pdf->SetAutoPageBreak(1,0);
if (class_exists('TCPDF'))
{
@@ -167,11 +179,22 @@ class pdf_beluga extends ModelePDFProjects
$pdf->setPrintFooter(false);
}
$pdf->SetFont(pdf_getPDFFont($outputlangs));
+ // Set path to the background PDF File
+ if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+ {
+ $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+ $tplidx = $pdf->importPage(1);
+ }
// Complete object by loading several other informations
$task = new Task($this->db);
$tasksarray = $task->getTasksArray(0,0,$object->id);
+ if (! $object->id > 0) // Special case when used with object = specimen, we may return all lines
+ {
+ $tasksarray=array_slice($tasksarray, 0, min(5, count($tasksarray)));
+ }
+
$object->lines=$tasksarray;
$nblignes=count($object->lines);
@@ -190,6 +213,7 @@ class pdf_beluga extends ModelePDFProjects
// New page
$pdf->AddPage();
+ if (! empty($tplidx)) $pdf->useTemplate($tplidx);
$pagenb++;
$this->_pagehead($pdf, $object, 1, $outputlangs);
$pdf->SetFont('','', $default_font_size - 1);
@@ -197,21 +221,28 @@ class pdf_beluga extends ModelePDFProjects
$pdf->SetTextColor(0,0,0);
$tab_top = 50;
- $tab_height = 200;
- $tab_top_newpage = 40;
- $tab_height_newpage = 210;
+ $tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42:10);
+ $tab_height = 170;
+ $tab_height_newpage = 190;
- // Affiche notes
- if (! empty($object->note_public))
+ // Show public note
+ $notetoshow=empty($object->note_public)?'':$object->note_public;
+ if ($notetoshow)
{
+ $substitutionarray=pdf_getSubstitutionArray($outputlangs, null, $object);
+ complete_substitutions_array($substitutionarray, $outputlangs, $object);
+ $notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
+
+ $tab_top -= 2;
+
$pdf->SetFont('','', $default_font_size - 1);
- $pdf->writeHTMLCell(190, 3, $this->posxref-1, $tab_top-2, dol_htmlentitiesbr($object->note_public), 0, 1);
+ $pdf->writeHTMLCell(190, 3, $this->posxref-1, $tab_top-2, dol_htmlentitiesbr($notetoshow), 0, 1);
$nexY = $pdf->GetY();
- $height_note=$nexY-($tab_top-2);
+ $height_note=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
$pdf->SetDrawColor(192,192,192);
- $pdf->Rect($this->marge_gauche, $tab_top-3, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
+ $pdf->Rect($this->marge_gauche, $tab_top-2, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+2);
$tab_height = $tab_height - $height_note;
$tab_top = $nexY+6;
@@ -221,10 +252,11 @@ class pdf_beluga extends ModelePDFProjects
$height_note=0;
}
- $iniY = $tab_top + 7;
- $curY = $tab_top + 7;
- $nexY = $tab_top + 7;
-
+ $heightoftitleline = 10;
+ $iniY = $tab_top + $heightoftitleline + 1;
+ $curY = $tab_top + $heightoftitleline + 1;
+ $nexY = $tab_top + $heightoftitleline + 1;
+
$listofreferent=array(
'propal'=>array(
'name'=>"Proposals",
@@ -335,176 +367,286 @@ class pdf_beluga extends ModelePDFProjects
$langstoload=$value['lang'];
$langs->load($langstoload);
- if ($qualified)
+ if (! $qualified) continue;
+
+ //var_dump("$key, $tablename, $datefieldname, $dates, $datee");
+ $elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee);
+
+ if ($key == 'agenda')
{
- //var_dump("$key, $tablename, $datefieldname, $dates, $datee");
- $elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee);
- //var_dump($elementarray);
+// var_dump($elementarray);
+ }
- $num = count($elementarray);
- if ($num >= 0)
+ $num = count($elementarray);
+ if ($num >= 0)
+ {
+ $nexY = $pdf->GetY() + 5;
+
+ $curY = $nexY;
+ $pdf->SetFont('','', $default_font_size - 1); // Into loop to work with multipage
+ $pdf->SetTextColor(0,0,0);
+
+ $pdf->SetXY($this->posxref, $curY);
+ $pdf->MultiCell($this->posxstatut - $this->posxref, 3, $outputlangs->transnoentities($title), 0, 'L');
+
+ $selectList = $formproject->select_element($tablename, $project->thirdparty->id);
+ $nexY = $pdf->GetY() + 1;
+ $curY = $nexY;
+ $pdf->SetXY($this->posxref, $curY);
+ $pdf->MultiCell($this->posxdate - $this->posxref, 3, $outputlangs->transnoentities("Ref"), 1, 'L');
+ $pdf->SetXY($this->posxdate, $curY);
+ $pdf->MultiCell($this->posxsociety - $this->posxdate, 3, $outputlangs->transnoentities("Date"), 1, 'C');
+ $pdf->SetXY($this->posxsociety, $curY);
+ $titlethirdparty=$outputlangs->transnoentities("ThirdParty");
+ if ($classname == 'ExpenseReport') $titlethirdparty=$langs->trans("User");
+ $pdf->MultiCell($this->posxamountht - $this->posxsociety, 3, $titlethirdparty, 1, 'L');
+ if (empty($value['disableamount'])) {
+ $pdf->SetXY($this->posxamountht, $curY);
+ $pdf->MultiCell($this->posxamountttc - $this->posxamountht, 3, $outputlangs->transnoentities("AmountHTShort"), 1, 'R');
+ $pdf->SetXY($this->posxamountttc, $curY);
+ $pdf->MultiCell($this->posxstatut - $this->posxamountttc, 3, $outputlangs->transnoentities("AmountTTCShort"), 1, 'R');
+ } else {
+ $pdf->SetXY($this->posxamountht, $curY);
+ $pdf->MultiCell($this->posxstatut - $this->posxamountht, 3, "", 1, 'R');
+ }
+ $pdf->SetXY($this->posxstatut, $curY);
+ $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxstatut, 3, $outputlangs->transnoentities("Statut"), 1, 'R');
+
+ if (is_array($elementarray) && count($elementarray) > 0)
{
- $nexY = $pdf->GetY() + 5;
- $curY = $nexY;
- $pdf->SetXY($this->posxref, $curY);
- $pdf->MultiCell($this->posxstatut - $this->posxref, 3, $outputlangs->transnoentities($title), 0, 'L');
+ $nexY = $pdf->GetY();
- $selectList = $formproject->select_element($tablename, $project->thirdparty->id);
- $nexY = $pdf->GetY() + 1;
- $curY = $nexY;
- $pdf->SetXY($this->posxref, $curY);
- $pdf->MultiCell($this->posxdate - $this->posxref, 3, $outputlangs->transnoentities("Ref"), 1, 'L');
- $pdf->SetXY($this->posxdate, $curY);
- $pdf->MultiCell($this->posxsociety - $this->posxdate, 3, $outputlangs->transnoentities("Date"), 1, 'C');
- $pdf->SetXY($this->posxsociety, $curY);
- $titlethirdparty=$outputlangs->transnoentities("ThirdParty");
- if ($classname == 'ExpenseReport') $titlethirdparty=$langs->trans("User");
- $pdf->MultiCell($this->posxamountht - $this->posxsociety, 3, $titlethirdparty, 1, 'L');
- if (empty($value['disableamount'])) {
- $pdf->SetXY($this->posxamountht, $curY);
- $pdf->MultiCell($this->posxamountttc - $this->posxamountht, 3, $outputlangs->transnoentities("AmountHTShort"), 1, 'R');
- $pdf->SetXY($this->posxamountttc, $curY);
- $pdf->MultiCell($this->posxstatut - $this->posxamountttc, 3, $outputlangs->transnoentities("AmountTTCShort"), 1, 'R');
- } else {
- $pdf->SetXY($this->posxamountht, $curY);
- $pdf->MultiCell($this->posxstatut - $this->posxamountht, 3, "", 1, 'R');
- }
- $pdf->SetXY($this->posxstatut, $curY);
- $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxstatut, 3, $outputlangs->transnoentities("Statut"), 1, 'R');
+ $total_ht = 0;
+ $total_ttc = 0;
+ $num = count($elementarray);
- if (is_array($elementarray) && count($elementarray) > 0)
- {
+ // Loop on each lines
+ for ($i = 0; $i < $num; $i ++)
+ {
+ $curY = $nexY;
+ $pdf->SetFont('','', $default_font_size - 1); // Into loop to work with multipage
+ $pdf->SetTextColor(0,0,0);
+
+ $pdf->setTopMargin($tab_top_newpage);
+ $pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+ $pageposbefore=$pdf->getPage();
+
+ // Description of line
+ $idofelement=$elementarray[$i];
+ if ($classname == 'ExpenseReport')
+ {
+ // We get id of expense report
+ $expensereportline=new ExpenseReportLine($this->db);
+ $expensereportline->fetch($idofelement);
+ $idofelement = $expensereportline->fk_expensereport;
+ }
+
+ $element = new $classname($this->db);
+ $element->fetch($idofelement);
+ $element->fetch_thirdparty();
+ // print $classname;
+
+ $qualifiedfortotal = true;
+ if ($key == 'invoice') {
+ if ($element->close_code == 'replaced')
+ $qualifiedfortotal = false; // Replacement invoice
+ }
+
+ $showpricebeforepagebreak=1;
+
+ $pdf->startTransaction();
+ // Label
+ $pdf->SetXY($this->posxref, $curY);
+ $pdf->MultiCell($this->posxdate - $this->posxref, 3, $element->ref, 1, 'L');
+ $pageposafter=$pdf->getPage();
+ if ($pageposafter > $pageposbefore) // There is a pagebreak
+ {
+ $pdf->rollbackTransaction(true);
+ $pageposafter=$pageposbefore;
+ //print $pageposafter.'-'.$pageposbefore;exit;
+ $pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+ // Label
+ $pdf->SetXY($this->posxref, $curY);
+ $posybefore=$pdf->GetY();
+ $pdf->MultiCell($this->posxdate - $this->posxref, 3, $element->ref, 1, 'L');
+ $pageposafter=$pdf->getPage();
+ $posyafter=$pdf->GetY();
+ if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) // There is no space left for total+free text
+ {
+ if ($i == ($num-1)) // No more lines, and no space left to show total, so we create a new page
+ {
+ $pdf->AddPage('','',true);
+ if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+ if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+ $pdf->setPage($pageposafter+1);
+ }
+ }
+ else
+ {
+ // We found a page break
+ $showpricebeforepagebreak=0;
+ $forcedesconsamepage=1;
+ if ($forcedesconsamepage)
+ {
+ $pdf->rollbackTransaction(true);
+ $pageposafter=$pageposbefore;
+ $pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+
+ $pdf->AddPage('','',true);
+ if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+ if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+ $pdf->setPage($pageposafter+1);
+ $pdf->SetFont('','', $default_font_size - 1); // On repositionne la police par defaut
+ $pdf->MultiCell(0, 3, ''); // Set interline to 3
+ $pdf->SetTextColor(0,0,0);
+
+ $pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+ $curY = $tab_top_newpage + $heightoftitleline + 1;
+
+ // Label
+ $pdf->SetXY($this->posxref, $curY);
+ $posybefore=$pdf->GetY();
+ $pdf->MultiCell($this->posxdate - $this->posxref, 3, $element->ref, 1, 'L');
+ $pageposafter=$pdf->getPage();
+ $posyafter=$pdf->GetY();
+ }
+ }
+ //var_dump($i.' '.$posybefore.' '.$posyafter.' '.($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)).' '.$showpricebeforepagebreak);
+ }
+ else // No pagebreak
+ {
+ $pdf->commitTransaction();
+ }
+ $posYAfterDescription=$pdf->GetY();
+
+ $nexY = $pdf->GetY();
+ $pageposafter=$pdf->getPage();
+ $pdf->setPage($pageposbefore);
+ $pdf->setTopMargin($this->marge_haute);
+ $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+
+ // We suppose that a too long description is moved completely on next page
+ if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
+ //var_dump($pageposbefore.'-'.$pageposafter.'-'.$showpricebeforepagebreak);
+ $pdf->setPage($pageposafter); $curY = $tab_top_newpage + $heightoftitleline + 1;
+ }
+
+ $pdf->SetFont('','', $default_font_size - 1); // On repositionne la police par defaut
+
+ // Date
+ if ($tablename == 'commande_fournisseur' || $tablename == 'supplier_order')
+ $date = $element->date_commande;
+ else {
+ $date = $element->date;
+ if (empty($date))
+ $date = $element->datep;
+ if (empty($date))
+ $date = $element->date_contrat;
+ if (empty($date))
+ $date = $element->datev; // Fiche inter
+ }
+
+ $pdf->SetXY($this->posxdate, $curY);
+ $pdf->MultiCell($this->posxsociety - $this->posxdate, 3, dol_print_date($date, 'day'), 1, 'C');
+
+ $pdf->SetXY($this->posxsociety, $curY);
+ if ($classname == 'ExpenseReport')
+ {
+ $fuser=new User($this->db);
+ $fuser->fetch($element->fk_user_author);
+ $pdf->MultiCell($this->posxamountht - $this->posxsociety, 3, $fuser->getFullName($outputlangs), 1, 'L');
+ }
+ else
+ {
+ $pdf->MultiCell($this->posxamountht - $this->posxsociety, 3, (is_object($element->thirdparty)?$element->thirdparty->name:''), 1, 'L');
+ }
+
+ // Amount without tax
+ if (empty($value['disableamount'])) {
+ $pdf->SetXY($this->posxamountht, $curY);
+ $pdf->MultiCell($this->posxamountttc - $this->posxamountht, 3, (isset($element->total_ht) ? price($element->total_ht) : ' '), 1, 'R');
+ $pdf->SetXY($this->posxamountttc, $curY);
+ $pdf->MultiCell($this->posxstatut - $this->posxamountttc, 3, (isset($element->total_ttc) ? price($element->total_ttc) : ' '), 1, 'R');
+ } else {
+ $pdf->SetXY($this->posxamountht, $curY);
+ if ($key == 'agenda')
+ {
+ $textforamount = dol_trunc($element->label, 26);
+ $pdf->MultiCell($this->posxstatut - $this->posxamountht, 3, $textforamount, 1, 'L');
+ }
+ else
+ {
+ $pdf->MultiCell($this->posxstatut - $this->posxamountht, 3, "", 1, 'R');
+ }
+ }
+
+ // Status
+ if ($element instanceof CommonInvoice) {
+ // This applies for Facture and FactureFournisseur
+ $outputstatut = $element->getLibStatut(1, $element->getSommePaiement());
+ } else {
+ $outputstatut = $element->getLibStatut(1);
+ }
+ $pdf->SetXY($this->posxstatut, $curY);
+ $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxstatut, 3, $outputstatut, 1, 'R', false, 1, '', '', true, 0, true);
+
+ if ($qualifiedfortotal) {
+ $total_ht = $total_ht + $element->total_ht;
+ $total_ttc = $total_ttc + $element->total_ttc;
+ }
$nexY = $pdf->GetY();
$curY = $nexY;
-
- $total_ht = 0;
- $total_ttc = 0;
- $num = count($elementarray);
- for ($i = 0; $i < $num; $i ++) {
- $idofelement=$elementarray[$i];
- if ($classname == 'ExpenseReport')
- {
- // We get id of expense report
- $expensereportline=new ExpenseReportLine($this->db);
- $expensereportline->fetch($idofelement);
- $idofelement = $expensereportline->fk_expensereport;
- }
-
- $element = new $classname($this->db);
- $element->fetch($idofelement);
- $element->fetch_thirdparty();
- // print $classname;
-
- $qualifiedfortotal = true;
- if ($key == 'invoice') {
- if ($element->close_code == 'replaced')
- $qualifiedfortotal = false; // Replacement invoice
- }
-
- $pdf->SetXY($this->posxref, $curY);
- $pdf->MultiCell($this->posxdate - $this->posxref, 3, $element->ref, 1, 'L');
-
- // Date
- if ($tablename == 'commande_fournisseur' || $tablename == 'supplier_order')
- $date = $element->date_commande;
- else {
- $date = $element->date;
- if (empty($date))
- $date = $element->datep;
- if (empty($date))
- $date = $element->date_contrat;
- if (empty($date))
- $date = $element->datev; // Fiche inter
- }
-
- $pdf->SetXY($this->posxdate, $curY);
- $pdf->MultiCell($this->posxsociety - $this->posxdate, 3, dol_print_date($date, 'day'), 1, 'C');
-
- $pdf->SetXY($this->posxsociety, $curY);
- if (is_object($element->thirdparty))
- {
- $pdf->MultiCell($this->posxamountht - $this->posxsociety, 3, $element->thirdparty->name, 1, 'L');
- }
- elseif ($classname == 'ExpenseReport')
- {
- $fuser=new User($this->db);
- $fuser->fetch($element->fk_user_author);
- $pdf->MultiCell($this->posxamountht - $this->posxsociety, 3, $fuser->getFullName($outputlangs), 1, 'L');
- }
-
- // Amount without tax
- if (empty($value['disableamount'])) {
- $pdf->SetXY($this->posxamountht, $curY);
- $pdf->MultiCell($this->posxamountttc - $this->posxamountht, 3, (isset($element->total_ht) ? price($element->total_ht) : ' '), 1, 'R');
- $pdf->SetXY($this->posxamountttc, $curY);
- $pdf->MultiCell($this->posxstatut - $this->posxamountttc, 3, (isset($element->total_ttc) ? price($element->total_ttc) : ' '), 1, 'R');
- } else {
- $pdf->SetXY($this->posxamountht, $curY);
- $pdf->MultiCell($this->posxstatut - $this->posxamountht, 3, "", 1, 'R');
- }
-
- // Status
- if ($element instanceof CommonInvoice) {
- // This applies for Facture and FactureFournisseur
- $outputstatut = $element->getLibStatut(1, $element->getSommePaiement());
- } else {
- $outputstatut = $element->getLibStatut(1);
- }
- $pdf->SetXY($this->posxstatut, $curY);
- $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxstatut, 3, $outputstatut, 1, 'R', false, 1, '', '', true, 0, true);
-
- if ($qualifiedfortotal) {
- $total_ht = $total_ht + $element->total_ht;
- $total_ttc = $total_ttc + $element->total_ttc;
- }
- $nexY = $pdf->GetY();
- $curY = $nexY;
- }
-
- if (empty($value['disableamount'])) {
- $curY = $nexY;
- $pdf->SetXY($this->posxref, $curY);
- $pdf->MultiCell($this->posxamountttc - $this->posxref, 3, "TOTAL", 1, 'L');
- $pdf->SetXY($this->posxamountht, $curY);
- $pdf->MultiCell($this->posxamountttc - $this->posxamountht, 3, (isset($element->total_ht) ? price($total_ht) : ' '), 1, 'R');
- $pdf->SetXY($this->posxamountttc, $curY);
- $pdf->MultiCell($this->posxstatut - $this->posxamountttc, 3, (isset($element->total_ttc) ? price($total_ttc) : ' '), 1, 'R');
- $pdf->SetXY($this->posxstatut, $curY);
- $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxstatut, 3, $outputlangs->transnoentities("Nb") . " " . $num, 1, 'L');
- }
- $nexY = $pdf->GetY() + 5;
- $curY = $nexY;
}
+
+ if (empty($value['disableamount'])) {
+ $curY = $nexY;
+ $pdf->SetXY($this->posxref, $curY);
+ $pdf->MultiCell($this->posxamountttc - $this->posxref, 3, "TOTAL", 1, 'L');
+ $pdf->SetXY($this->posxamountht, $curY);
+ $pdf->MultiCell($this->posxamountttc - $this->posxamountht, 3, (isset($element->total_ht) ? price($total_ht) : ' '), 1, 'R');
+ $pdf->SetXY($this->posxamountttc, $curY);
+ $pdf->MultiCell($this->posxstatut - $this->posxamountttc, 3, (isset($element->total_ttc) ? price($total_ttc) : ' '), 1, 'R');
+ $pdf->SetXY($this->posxstatut, $curY);
+ $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxstatut, 3, $outputlangs->transnoentities("Nb") . " " . $num, 1, 'L');
+ }
+ $nexY = $pdf->GetY() + 5;
+ $curY = $nexY;
}
}
- }
+
+ $nexY+=2; // Passe espace entre les lignes
- /*
- * Pied de page
- */
- $this->_pagefoot($pdf,$object,$outputlangs);
- if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+ // Detect if some page were added automatically and output _tableau for past pages
+ while ($pagenb < $pageposafter)
+ {
+ $pdf->setPage($pagenb);
+ $this->_pagefoot($pdf,$object,$outputlangs,1);
+ $pagenb++;
+ $pdf->setPage($pagenb);
+ $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+ if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+ }
+ }
+
+ // Pied de page
+ $this->_pagefoot($pdf, $object, $outputlangs);
+ if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
$pdf->Close();
- $pdf->Output($file,'F');
+ $pdf->Output($file, 'F');
// Add pdfgeneration hook
- if (! is_object($hookmanager))
- {
- include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
- $hookmanager=new HookManager($this->db);
- }
$hookmanager->initHooks(array('pdfgeneration'));
- $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+ $parameters=array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
global $action;
- $reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
+ $reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if (! empty($conf->global->MAIN_UMASK))
- @chmod($file, octdec($conf->global->MAIN_UMASK));
+ @chmod($file, octdec($conf->global->MAIN_UMASK));
$this->result = array('fullpath'=>$file);
-
+
return 1; // Pas d'erreur
}
else
@@ -513,9 +655,11 @@ class pdf_beluga extends ModelePDFProjects
return 0;
}
}
-
- $this->error=$langs->transnoentities("ErrorConstantNotDefined","LIVRAISON_OUTPUTDIR");
- return 0;
+ else
+ {
+ $this->error=$langs->transnoentities("ErrorConstantNotDefined","PROJECT_OUTPUTDIR");
+ return 0;
+ }
}
@@ -535,14 +679,17 @@ class pdf_beluga extends ModelePDFProjects
{
global $conf,$mysoc;
- $default_font_size = pdf_getPDFFontSize($outputlangs);
+ $heightoftitleline = 10;
+
+ $default_font_size = pdf_getPDFFontSize($outputlangs);
$pdf->SetDrawColor(128,128,128);
- // Rect prend une longueur en 3eme param
+ // Draw rect of all tab (title + lines). Rect prend une longueur en 3eme param
$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height);
+
// line prend une position y en 3eme param
- $pdf->line($this->marge_gauche, $tab_top+6, $this->page_largeur-$this->marge_droite, $tab_top+6);
+ $pdf->line($this->marge_gauche, $tab_top+$heightoftitleline, $this->page_largeur-$this->marge_droite, $tab_top+$heightoftitleline);
$pdf->SetTextColor(0,0,0);
$pdf->SetFont('','', $default_font_size);
@@ -564,7 +711,6 @@ class pdf_beluga extends ModelePDFProjects
$pdf->SetXY($this->posxdateend, $tab_top+1);
$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxdatestart, 3, '', 0, 'C');
-
}
/**
@@ -621,12 +767,19 @@ class pdf_beluga extends ModelePDFProjects
$pdf->SetXY($posx,$posy);
$pdf->SetTextColor(0,0,60);
$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DateStart")." : " . dol_print_date($object->date_start,'day',false,$outputlangs,true), '', 'R');
+
$posy+=6;
$pdf->SetXY($posx,$posy);
$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DateEnd")." : " . dol_print_date($object->date_end,'day',false,$outputlangs,true), '', 'R');
+ if (is_object($object->thirdparty))
+ {
+ $posy+=6;
+ $pdf->SetXY($posx,$posy);
+ $pdf->MultiCell(100, 4, $outputlangs->transnoentities("ThirdParty")." : " . $object->thirdparty->getFullName($outputlangs), '', 'R');
+ }
+
$pdf->SetTextColor(0,0,60);
-
}
/**
@@ -644,4 +797,5 @@ class pdf_beluga extends ModelePDFProjects
$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
return pdf_pagefoot($pdf,$outputlangs,'PROJECT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
}
+
}
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index e54d613628e..632ef67feb9 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -1,5 +1,5 @@
# Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Billing / Payment
+MenuFinancial=Billing | Payment
TaxModuleSetupToModifyRules=Go to Taxes module setup to modify rules for calculation
TaxModuleSetupToModifyRulesLT=Go to Company setup to modify rules for calculation
OptionMode=Option for accountancy
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index b856b709acc..69038535669 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -589,6 +589,9 @@ textarea.centpercent {
.wordwrap {
word-wrap: break-word;
}
+.wordbreak {
+ word-break: break-all;
+}
.nobold {
font-weight: normal !important;
}
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index e86d85a2c34..3cb7ae4d7a9 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -591,6 +591,9 @@ textarea.centpercent {
.wordwrap {
word-wrap: break-word;
}
+.wordbreak {
+ word-break: break-all;
+}
.nobold {
font-weight: normal !important;
}