From ceac589a429e2fb59e9ef8ea5742e605707823a4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 14 Oct 2011 13:31:51 +0200 Subject: [PATCH 1/3] Fix: Keep value --- htdocs/adherents/admin/adherent_extrafields.php | 2 +- htdocs/societe/admin/societe_extrafields.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php index 004b5b41c3d..8615877fefb 100755 --- a/htdocs/adherents/admin/adherent_extrafields.php +++ b/htdocs/adherents/admin/adherent_extrafields.php @@ -144,7 +144,7 @@ if ($action == 'create') // Label print ''.$langs->trans("Label").''; // Code - print ''.$langs->trans("AttributeCode").' ('.$langs->trans("AlphaNumOnlyCharsAndNoSpace").')'; + print ''.$langs->trans("AttributeCode").' ('.$langs->trans("AlphaNumOnlyCharsAndNoSpace").')'; // Type print ''.$langs->trans("Type").''; print $form->selectarray('type',$type2label,GETPOST('type')); diff --git a/htdocs/societe/admin/societe_extrafields.php b/htdocs/societe/admin/societe_extrafields.php index 4f1f131ba5c..7f092bf3781 100755 --- a/htdocs/societe/admin/societe_extrafields.php +++ b/htdocs/societe/admin/societe_extrafields.php @@ -144,7 +144,7 @@ if ($action == 'create') // Label print ''.$langs->trans("Label").''; // Code - print ''.$langs->trans("AttributeCode").' ('.$langs->trans("AlphaNumOnlyCharsAndNoSpace").')'; + print ''.$langs->trans("AttributeCode").' ('.$langs->trans("AlphaNumOnlyCharsAndNoSpace").')'; // Type print ''.$langs->trans("Type").''; print $form->selectarray('type',$type2label,GETPOST('type')); From 10959d0dccb352e5f25b52718b5756d552226b6c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 14 Oct 2011 13:46:40 +0200 Subject: [PATCH 2/3] Add fix on position to total --- htdocs/includes/modules/facture/doc/pdf_crabe.modules.php | 2 +- htdocs/includes/modules/propale/pdf_propale_azur.modules.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php b/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php index 9f0cd0793b0..20b605737fd 100755 --- a/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php @@ -297,7 +297,7 @@ class pdf_crabe extends ModelePDFFactures // Total HT ligne $total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails, $hookmanager); $pdf->SetXY($this->postotalht, $curY); - $pdf->MultiCell(26, 3, $total_excl_tax, 0, 'R', 0); + $pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0); // Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva $tvaligne=$object->lines[$i]->total_tva; diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php index a426e8bf1f2..0a140d15531 100644 --- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php @@ -102,7 +102,7 @@ class pdf_propale_azur extends ModelePDFPropales /** * Function to build pdf onto disk - * + * * @param int $object Id of object to generate * @param object $outputlangs Lang output object * @param string $srctemplatepath Full path of source filename for generator using a template file @@ -279,7 +279,7 @@ class pdf_propale_azur extends ModelePDFPropales // Total HT ligne $total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails, $hookmanager); $pdf->SetXY($this->postotalht, $curY); - $pdf->MultiCell(26, 4, $total_excl_tax, 0, 'R', 0); + $pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 4, $total_excl_tax, 0, 'R', 0); // Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva $tvaligne=$object->lines[$i]->total_tva; From 7ed4400c0366c3286a84dfb32a57e047b3b4c443 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 14 Oct 2011 15:30:41 +0200 Subject: [PATCH 3/3] New: Add patch to allow export of database with no mysqldump access. Still bugged. --- htdocs/admin/tools/dolibarr_export.php | 28 +- htdocs/admin/tools/export.php | 521 ++++++++++++++++--------- htdocs/lib/files.lib.php | 50 ++- 3 files changed, 392 insertions(+), 207 deletions(-) diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php index 972f18530d6..bbb8b286608 100644 --- a/htdocs/admin/tools/dolibarr_export.php +++ b/htdocs/admin/tools/dolibarr_export.php @@ -43,13 +43,25 @@ llxHeader('','','EN:Backups|FR:Sauvegardes|ES:Copias_de_seguridad'); ?>