From b8303bdd5f9cec21d919f6423779a8c417e9f952 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 29 Dec 2012 23:40:16 +0100 Subject: [PATCH 1/6] Fix: CSS --- htdocs/ecm/index.php | 2 +- htdocs/theme/eldy/style.css.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php index 304e9718637..3d15615cb21 100644 --- a/htdocs/ecm/index.php +++ b/htdocs/ecm/index.php @@ -412,7 +412,7 @@ else $classviewhide='visible'; // Start container of all panels ?>
-
+
background-image: -o-linear-gradient(bottom, rgb() 15%, rgb() 100%) !important; background-image: -moz-linear-gradient(bottom, rgb() 15%, rgb() 100%) !important; @@ -1009,7 +1009,9 @@ td.photo { box-shadow: 4px 4px 4px #EEE; padding: 0 4px 0 4px !important; +} +.toolbar { height: 34px !important; } From 3fb60304db6f9f7e6a137727547afff2db64dafc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 30 Dec 2012 12:02:54 +0100 Subject: [PATCH 2/6] Fix: Css for ecm module --- htdocs/theme/amarok/style.css.php | 39 +++++++++++++++++++------- htdocs/theme/auguria/style.css.php | 4 +-- htdocs/theme/bureau2crea/style.css.php | 2 +- htdocs/theme/cameleo/style.css.php | 4 +-- 4 files changed, 34 insertions(+), 15 deletions(-) diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php index 749e7a7f4d6..40585daf1da 100755 --- a/htdocs/theme/amarok/style.css.php +++ b/htdocs/theme/amarok/style.css.php @@ -95,7 +95,7 @@ body { color:#232323; font-size:px; font-family:; - + trans("DIRECTION").";\n"; ?> } @@ -215,19 +215,19 @@ form#login img#img_logo { border-bottom:solid 1px rgba(0,0,0,.3); box-shadow:1px 1px 6px rgba(0,0,0,.3) inset , 0 0 1px rgba(255,255,255,.6); } - + form#login input { padding:6px; font-size:120%; } - + form#login label, form#login td b { vertical-align:middle; line-height:40px; color:rgba(0,0,0,.4); text-shadow:1px 1px 1px rgba(255,255,255,.6); } - + form#login table.login_table { margin:10px 0px; border:none; @@ -277,7 +277,7 @@ table.login_table .button:hover { color-stop(0, rgba(0,0,0,.3)) ); } - + table.login_table .vmenu { color:rgba(0,0,0,.6); text-shadow:1px 1px 1px rgba(255,255,255,.6); @@ -370,7 +370,7 @@ div.tmenu li { div.tmenu li a {color:#cccccc;} div.tmenu li a:hover {color:rgba(255,255,255,.2);} - + div.tmenu ul li a.tmenusel {/* texte du menu principal sélectionné */ color:#ffffff; font-weight:bold; @@ -508,6 +508,25 @@ div.vmenu { /* Toolbar for ECM or Filemanager */ /* ============================================================================== */ + +.largebutton { + background-image: -o-linear-gradient(bottom, rgb() 15%, rgb() 100%) !important; + background-image: -moz-linear-gradient(bottom, rgb() 15%, rgb() 100%) !important; + background-image: -webkit-linear-gradient(bottom, rgb() 15%, rgb() 100%) !important; + background-image: -ms-linear-gradient(bottom, rgb() 15%, rgb() 100%) !important; + background-image: linear-gradient(bottom, rgb() 15%, rgb() 100%) !important; + border: 1px solid #CCC !important; + + -moz-border-radius: 5px 5px 5px 5px !important; + -webkit-border-radius: 5px 5px 5px 5px !important; + border-radius: 5px 5px 5px 5px !important; + -moz-box-shadow: 4px 4px 4px #EEE; + -webkit-box-shadow: 4px 4px 4px #EEE; + box-shadow: 4px 4px 4px #EEE; + + padding: 0 4px 0 4px !important; +} + .toolbar {} .toolbarbutton {} @@ -598,26 +617,26 @@ a.tabTitle img { -webkit-border-top-left-radius:6px; -webkit-border-top-right-radius:6px; } - + .tab#active { color:#232323; font-weight:bold; background-color:#ffffff; border-bottom:solid 1px #ffffff; } - + .tab:hover {color:#333333;} /* ============================================================================== */ /* Styles de positionnement des zones */ /* ============================================================================== */ - + div.fiche { margin-: browser->phone) || empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT))?'20':'24'; ?>px; margin-: browser->phone)?'12':'6'; ?>px; } - + div.fichecenter { width: 100%; clear: both; /* This is to have div fichecenter that are true rectangles */ diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index cac0c269e51..75004e8f6ca 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -755,7 +755,8 @@ a.toolbarbutton { background: #FFFFFF;*/ } img.toolbarbutton { - height: 28px; + margin-top: 2px; + height: 28px; } /* ============================================================================== */ @@ -919,7 +920,6 @@ img.toolbarbutton { } .ecm-layout-resizer { /* all 'resizer-bars' */ - background: #EEE; border: 1px solid #BBB; border-width: 0; } diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index 5543e69791c..12de15a702d 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -835,6 +835,7 @@ a.toolbarbutton { background: #FFFFFF;*/ } img.toolbarbutton { + margin-top: 2px; height: 28px; } @@ -994,7 +995,6 @@ img.toolbarbutton { } .ecm-layout-resizer { /* all 'resizer-bars' */ - background: #EEE; border: 1px solid #BBB; border-width: 0; } diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index 06811782e6b..14f3cb102b3 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -870,7 +870,8 @@ a.toolbarbutton { background: #FFFFFF;*/ } img.toolbarbutton { - height: 28px; + margin-top: 2px; + height: 28px; } @@ -1029,7 +1030,6 @@ img.toolbarbutton { } .ecm-layout-resizer { /* all 'resizer-bars' */ - background: #EEE; border: 1px solid #BBB; border-width: 0; } From ca2b3f11b166f395e11af74d825989737920e925 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 30 Dec 2012 12:24:53 +0100 Subject: [PATCH 3/6] Fix: Several fix in trigger names --- htdocs/commande/class/commande.class.php | 2 +- htdocs/contrat/class/contrat.class.php | 4 ++-- htdocs/user/class/usergroup.class.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 07050f41a01..c0fdce4b5c1 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -426,7 +426,7 @@ class Commande extends CommonOrder // Appel des triggers include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); - $result=$interface->run_triggers('BILL_REOPEN',$this,$user,$langs,$conf); + $result=$interface->run_triggers('ORDER_REOPEN',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } // Fin appel triggers } diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index 19e0130cf29..81f89ea1715 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -1112,7 +1112,7 @@ class Contrat extends CommonObject // Appel des triggers include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); - $result=$interface->run_triggers('CONTRACTLINE_DELETE',$this,$user,$langs,$conf); + $result=$interface->run_triggers('CONTRACT_LINE_DELETE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } // Fin appel triggers @@ -1940,7 +1940,7 @@ class ContratLigne // Appel des triggers include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); - $result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf); + $result=$interface->run_triggers('CONTRACT_LINE_MODIFY',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } // Fin appel triggers } diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php index d5170955162..9ed9c8eb4bf 100644 --- a/htdocs/user/class/usergroup.class.php +++ b/htdocs/user/class/usergroup.class.php @@ -532,7 +532,7 @@ class UserGroup extends CommonObject // Appel des triggers include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); - $result=$interface->run_triggers('USER_DELETE',$this,$user,$langs,$conf); + $result=$interface->run_triggers('GROUP_DELETE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } // Fin appel triggers From 717657dd05cef7cd72e33fb2fee6e0ed2b7eb316 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 30 Dec 2012 12:40:32 +0100 Subject: [PATCH 4/6] Fix: [ bug #654 ] Event rapport PDF showing ActionAC_OTH_AUTO --- htdocs/core/modules/action/rapport.pdf.php | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/htdocs/core/modules/action/rapport.pdf.php b/htdocs/core/modules/action/rapport.pdf.php index 39f84608864..e2b1a75c5e1 100644 --- a/htdocs/core/modules/action/rapport.pdf.php +++ b/htdocs/core/modules/action/rapport.pdf.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2008 Laurent Destailleur + * Copyright (C) 2004-2012 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; /** - * Classe permettant la generation des rapports d'actions + * Class to generate event report */ class CommActionRapport { @@ -217,24 +217,32 @@ class CommActionRapport } $y++; + // Date $pdf->SetXY($this->marge_gauche, $y); $pdf->MultiCell(22, $height, dol_print_date($this->db->jdate($obj->dp),"day")."\n".dol_print_date($this->db->jdate($obj->dp),"hour"), 0, 'L', 0); $y0 = $pdf->GetY(); + // Third party $pdf->SetXY(26, $y); $pdf->MultiCell(32, $height, dol_trunc($outputlangs->convToOutputCharset($obj->societe),32), 0, 'L', 0); $y1 = $pdf->GetY(); + // Action code + $code=$obj->code; + if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) + { + if ($code == 'AC_OTH') $code='AC_MANUAL'; + if ($code == 'AC_OTH_AUTO') $code='AC_AUTO'; + } $pdf->SetXY(60,$y); - $pdf->MultiCell(32, $height, dol_trunc($outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Action".$obj->code)),32), 0, 'L', 0); + $pdf->MultiCell(32, $height, dol_trunc($outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Action".$code)),32), 0, 'L', 0); $y2 = $pdf->GetY(); + // Description of event $pdf->SetXY(106,$y); $pdf->MultiCell(94, $height, $outputlangs->convToOutputCharset($text), 0, 'L', 0); $y3 = $pdf->GetY(); - //$pdf->MultiCell(94,2,"y=$y y3=$y3",0,'L',0); - $i++; } } From 201829e60c4eea15a61dcc8958b8c646dcab214d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 30 Dec 2012 13:49:37 +0100 Subject: [PATCH 5/6] Fix:[ bug #653 ] Error while creating additional attributes --- htdocs/comm/action/class/actioncomm.class.php | 16 +++++++++--- htdocs/comm/action/fiche.php | 10 +++---- .../install/mysql/migration/3.2.0-3.3.0.sql | 13 +++++++++- .../tables/llx_actioncomm_extrafields.key.sql | 20 ++++++++++++++ .../tables/llx_actioncomm_extrafields.sql | 26 +++++++++++++++++++ 5 files changed, 75 insertions(+), 10 deletions(-) create mode 100755 htdocs/install/mysql/tables/llx_actioncomm_extrafields.key.sql create mode 100755 htdocs/install/mysql/tables/llx_actioncomm_extrafields.sql diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 895fb425c05..b8c6cb63687 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -228,7 +228,7 @@ class ActionComm extends CommonObject } else if ($reshook < 0) $error++; - if (! $notrigger) + if (! $error && ! $notrigger) { // Appel des triggers include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; @@ -240,8 +240,16 @@ class ActionComm extends CommonObject // Fin appel triggers } - $this->db->commit(); - return $this->id; + if (! $error) + { + $this->db->commit(); + return $this->id; + } + else + { + $this->db->rollback(); + return -1; + } } else { @@ -591,7 +599,7 @@ class ActionComm extends CommonObject $now=dol_now(); $this->nbtodo=$this->nbtodolate=0; - + $sql = "SELECT a.id, a.datep as dp"; $sql.= " FROM (".MAIN_DB_PREFIX."actioncomm as a"; $sql.= ")"; diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index 8342613208e..21c887d285c 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -243,19 +243,19 @@ if ($action == 'add_action') } else { - // Si erreur + // If error $db->rollback(); - $id=$idaction; $langs->load("errors"); $error=$langs->trans($actioncomm->error); + $action = 'create'; } } else { $db->rollback(); - $id=$idaction; $langs->load("errors"); $error=$langs->trans($actioncomm->error); + $action = 'create'; } } } @@ -619,7 +619,7 @@ if ($action == 'create') print $extrafields->showInputField($key,$value); print ''."\n"; } - print '

'; + print '
'; } print '

'; @@ -632,7 +632,7 @@ if ($action == 'create') } // View or edit -if ($id) +if ($id > 0) { if ($error) { diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql index 1f8a79372df..7b55bcd164b 100755 --- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql +++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql @@ -264,9 +264,20 @@ create table llx_socpeople_extrafields fk_object integer NOT NULL, import_key varchar(14) -- import key ) ENGINE=innodb; - ALTER TABLE llx_socpeople_extrafields ADD INDEX idx_socpeople_extrafields (fk_object); +create table llx_actioncomm_extrafields +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + tms timestamp, + fk_object integer NOT NULL, + import_key varchar(14) -- import key +) ENGINE=innodb; +ALTER TABLE llx_actioncomm_extrafields ADD INDEX idx_actioncomm_extrafields (fk_object); + + + + UPDATE llx_c_actioncomm set type = 'systemauto' where code IN ('AC_PROP','AC_COM','AC_FAC','AC_SHIP','AC_SUP_ORD','AC_SUP_INV'); diff --git a/htdocs/install/mysql/tables/llx_actioncomm_extrafields.key.sql b/htdocs/install/mysql/tables/llx_actioncomm_extrafields.key.sql new file mode 100755 index 00000000000..239084c5f6b --- /dev/null +++ b/htdocs/install/mysql/tables/llx_actioncomm_extrafields.key.sql @@ -0,0 +1,20 @@ +-- =================================================================== +-- Copyright (C) 2011 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 2 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- =================================================================== + + +ALTER TABLE llx_actioncomm_extrafields ADD INDEX idx_actioncomm_extrafields (fk_object); diff --git a/htdocs/install/mysql/tables/llx_actioncomm_extrafields.sql b/htdocs/install/mysql/tables/llx_actioncomm_extrafields.sql new file mode 100755 index 00000000000..f0e2809ab64 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_actioncomm_extrafields.sql @@ -0,0 +1,26 @@ +-- ======================================================================== +-- Copyright (C) 2011 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 2 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- ======================================================================== + +create table llx_actioncomm_extrafields +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + tms timestamp, + fk_object integer NOT NULL, + import_key varchar(14) -- import key +) ENGINE=innodb; + From a1b0fbcc2c49f490e41bbae6fcd63ce91147b0b7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 30 Dec 2012 14:14:52 +0100 Subject: [PATCH 6/6] Fix: [ bug #659 ] Comment in recurrent invoices is not stored Fix: Missing payment mode --- htdocs/compta/facture/fiche-rec.php | 75 ++++++++++++++--------------- 1 file changed, 37 insertions(+), 38 deletions(-) diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index a0173e74fa4..84d4d68932c 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -72,7 +72,7 @@ if ($action == 'add') if (! $error) { $object->titre = GETPOST('titre', 'alpha'); - $object->note = GETPOST('comment'); + $object->note = GETPOST('note'); $object->usenewprice = GETPOST('usenewprice'); if ($object->create($user, $id) > 0) @@ -113,53 +113,60 @@ if ($action == 'create') { print_fiche_titre($langs->trans("CreateRepeatableInvoice")); - $invoice = new Facture($db); // Source invoice + $object = new Facture($db); // Source invoice $product_static = new Product($db); - if ($invoice->fetch($id) > 0) + if ($object->fetch($id) > 0) { print '
'; print ''; print ''; - print ''; + print ''; $rowspan=4; - if (! empty($conf->projet->enabled) && $invoice->fk_project > 0) $rowspan++; + if (! empty($conf->projet->enabled) && $object->fk_project > 0) $rowspan++; print ''; - $invoice->fetch_thirdparty(); + $object->fetch_thirdparty(); - print ''; + // Third party + print ''; print ''; + // Title print ''; + // Note print ''; + // Author print ""; + // Payment term print ""; + // Payment mode print ""; - if (! empty($conf->projet->enabled) && $invoice->fk_project > 0) + // Project + if (! empty($conf->projet->enabled) && $object->fk_project > 0) { print ""; @@ -194,7 +201,7 @@ if ($action == 'create') $sql.= ' p.description as product_desc'; $sql.= " FROM ".MAIN_DB_PREFIX."facturedet as l"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON l.fk_product = p.rowid"; - $sql.= " WHERE l.fk_facture = ".$invoice->id; + $sql.= " WHERE l.fk_facture = ".$object->id; $sql.= " ORDER BY l.rowid"; $result = $db->query($sql); @@ -339,7 +346,7 @@ if ($action == 'create') } else { - dol_print_error('',"Error, no invoice ".$invoice->id); + dol_print_error('',"Error, no invoice ".$object->id); } } else @@ -360,29 +367,13 @@ else print '
'.$langs->trans("Customer").''.$invoice->client->getNomUrl(1,'customer').'
'.$langs->trans("Customer").''.$object->client->getNomUrl(1,'customer').''; //print $langs->trans("NotePrivate"); print '
'.$langs->trans("Title").''; - print ''; + print ''; print ''; print ''; print '
".$langs->trans("Author")."".$user->getFullName($langs)."
".$langs->trans("PaymentConditions").""; - $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$invoice->id, $invoice->cond_reglement_id, 'none'); + $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none'); print "
".$langs->trans("PaymentMode").""; - $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$invoice->id, $facture->mode_reglement_id, 'none'); + $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none'); print "
".$langs->trans("Project").""; - if ($invoice->fk_project > 0) + if ($object->fk_project > 0) { $project = new Project($db); - $project->fetch($invoice->fk_project); + $project->fetch($object->fk_project); print $project->title; } print "
'; - print ''; + print ''; print ''; print ''; - print ''; - print ""; + print ''; - print ""; - - if ($object->remise_percent > 0) - { - print '"; + print ""; print ''; print ''; @@ -392,11 +383,19 @@ else print ''; print ''; print ''; - if ($object->note) - { - print '"; - } + // Payment term + print '"; + + // Payment mode + print '"; + + print '"; + print "
'.$langs->trans("Ref").'
'.$langs->trans("Ref").''.$object->titre.'
'.$langs->trans("Customer").''.$object->thirdparty->getNomUrl(1,'customer').'". $langs->trans("PaymentConditions") ." : "; - $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id,'none'); - print "
'.$object->thirdparty->getNomUrl(1,'customer').'
".$langs->trans("Author")."".$author->getFullName($langs)."'; - } - else - { - print ''; - } - - print $langs->trans("PaymentMode") ." : "; - $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id,'none'); - print "
".$langs->trans("Author").''.$author->getFullName($langs)."
'.$langs->trans("AmountHT").''.price($object->total_ht).''.$langs->trans("Currency".$conf->currency).'
'.$langs->trans("AmountTTC").''.price($object->total_ttc).''.$langs->trans("Currency".$conf->currency).'
'.$langs->trans("Note").' : '.nl2br($object->note)."
'.$langs->trans("PaymentConditions").''; + $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id,'none'); + print "
'.$langs->trans("PaymentMode").''; + $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id,'none'); + print "
'.$langs->trans("Note").''.nl2br($object->note)."
"; print '
';