From 108b4d1ae9f7a1b5d7d4041efa9ea02f25908fc5 Mon Sep 17 00:00:00 2001 From: Grand Philippe Date: Mon, 18 Feb 2013 14:19:01 +0100 Subject: [PATCH 01/11] fix language --- htdocs/langs/fr_FR/admin.lang | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index ffa72893e4a..dd7e8a58207 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -922,9 +922,17 @@ MAIN_PROXY_PORT=Port du serveur proxy mandataire MAIN_PROXY_USER=Login pour passer le serveur proxy mandataire MAIN_PROXY_PASS=Mot de passe pour passer le serveur proxy mandataire DefineHereComplementaryAttributes=Définissez ici la liste des attributs supplémentaires, non disponibles en standard, et que vous voulez voir gérer sur les %s. +<<<<<<< HEAD ExtraFields=Attributs suplémentaires ExtraFieldsThirdParties=Attributs suplémentaires (tiers) ExtraFieldsContacts=Attributs suplémentaires (contacts/adresses) +======= +ExtraFields=Attributs supplémentaires +ExtraFieldsThirdParties=Attributs supplémentaires (tiers) +ExtraFieldsContacts=Attributs supplémentaires (contacts/adresses) +ExtraFieldsMember=Attributs supplémentaires (adhérents) +ExtraFieldsMemberType=Attributs supplémentaires (type d'adhérents) +>>>>>>> b484fef... fix language ExtraFieldHasWrongValue=L'attribut %s a une valeur incorrecte. AlphaNumOnlyCharsAndNoSpace=uniquement caractères alphanumériques sans espace SendingMailSetup=Configuration de l'envoi par mail From 3ce75ce3820b67bee086481d998242f94f4fc155 Mon Sep 17 00:00:00 2001 From: Grand Philippe Date: Mon, 18 Feb 2013 16:57:38 +0100 Subject: [PATCH 02/11] fix: bad commit --- htdocs/langs/fr_FR/admin.lang | 6 ------ 1 file changed, 6 deletions(-) diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index dd7e8a58207..ffd0ac60658 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -922,17 +922,11 @@ MAIN_PROXY_PORT=Port du serveur proxy mandataire MAIN_PROXY_USER=Login pour passer le serveur proxy mandataire MAIN_PROXY_PASS=Mot de passe pour passer le serveur proxy mandataire DefineHereComplementaryAttributes=Définissez ici la liste des attributs supplémentaires, non disponibles en standard, et que vous voulez voir gérer sur les %s. -<<<<<<< HEAD -ExtraFields=Attributs suplémentaires -ExtraFieldsThirdParties=Attributs suplémentaires (tiers) -ExtraFieldsContacts=Attributs suplémentaires (contacts/adresses) -======= ExtraFields=Attributs supplémentaires ExtraFieldsThirdParties=Attributs supplémentaires (tiers) ExtraFieldsContacts=Attributs supplémentaires (contacts/adresses) ExtraFieldsMember=Attributs supplémentaires (adhérents) ExtraFieldsMemberType=Attributs supplémentaires (type d'adhérents) ->>>>>>> b484fef... fix language ExtraFieldHasWrongValue=L'attribut %s a une valeur incorrecte. AlphaNumOnlyCharsAndNoSpace=uniquement caractères alphanumériques sans espace SendingMailSetup=Configuration de l'envoi par mail From 15f6f7c335d1aeab672fdceb1c88a3d430c01eb5 Mon Sep 17 00:00:00 2001 From: simnandez Date: Mon, 18 Feb 2013 17:07:20 +0100 Subject: [PATCH 03/11] Fix: Translation --- htdocs/langs/ca_ES/admin.lang | 2 +- htdocs/langs/es_ES/admin.lang | 2 +- htdocs/langs/es_ES/holiday.lang | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index 1e285b0264a..1b5bdfcbfad 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -967,7 +967,7 @@ NotificationsDesc=La funció de les notificacions permet enviar automàticament ModelModules=Models de documents DocumentModelOdt=Generació des dels documents amb format OpenDocument (Arxiu .ODT OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=Marca d'aigua en els documents esborrany -CompanyIdProfChecker=Id Professional únic +CompanyIdProfChecker=Règles sobre els ID professionals MustBeUnique=Ha de ser únic? MustBeMandatory=Ha de ser obligatori? Miscellanous=Miscel·lània diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index ae0e14de364..cd40781f4a1 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -971,7 +971,7 @@ NotificationsDesc=La función de las notificaciones permite enviar automáticame ModelModules=Modelos de documentos DocumentModelOdt=Generación desde los documentos OpenDocument (Archivo .ODT OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=Marca de agua en los documentos borrador -CompanyIdProfChecker=Id Profesional único +CompanyIdProfChecker=Reglas sobre los ID profesionales MustBeUnique=¿Debe ser único? MustBeMandatory=¿Debe ser obligatorio? Miscellanous=Miscelánea diff --git a/htdocs/langs/es_ES/holiday.lang b/htdocs/langs/es_ES/holiday.lang index 4d7344cc10c..3183101f294 100644 --- a/htdocs/langs/es_ES/holiday.lang +++ b/htdocs/langs/es_ES/holiday.lang @@ -91,7 +91,7 @@ LastDayOfHoliday=Último día libre ConfCP=Configuración del módulo Vacaciones DescOptionCP=Descripción de la opción ValueOptionCP=Valor -GroupToValidateCP=Grupo con posibilidad de validar las vacaciones +GroupToValidateCP=Grupo con posibilidad de aprobar las vacaciones ConfirmConfigCP=Validar la configuración LastUpdateCP=Última actualización automática de vacaciones UpdateConfCPOK=Actualización efectuada correctamente. From 3687b29a7bfc3c248d3adc27fadb05e87fc2598f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Feb 2013 21:41:50 +0100 Subject: [PATCH 04/11] Fix: Missing translation --- htdocs/comm/action/index.php | 1 + htdocs/comm/action/rapport/index.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 2b996c74563..d16454abcf7 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -88,6 +88,7 @@ if (GETPOST('viewday')) { $action='show_day'; $day=($day?$day:date("d")); } // View by day +$langs->load("agenda"); $langs->load("other"); $langs->load("commercial"); diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php index 60597db8c59..514a99cb6a7 100644 --- a/htdocs/comm/action/rapport/index.php +++ b/htdocs/comm/action/rapport/index.php @@ -30,7 +30,8 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/modules/action/rapport.pdf.php'; -$langs->load("commercial"); +$langs->load("agenda"); +$langs->load("commercial"); $action=GETPOST('action','alpha'); $month=GETPOST('month'); From 723c46ec42eb1b3bc43e66ab0090c6d9e7ceb449 Mon Sep 17 00:00:00 2001 From: simnandez Date: Thu, 21 Feb 2013 14:29:06 +0100 Subject: [PATCH 05/11] Fix: Pagination at bottom not work correctly with filters applied --- htdocs/product/liste.php | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php index f5e6581d804..1a7cba82d68 100644 --- a/htdocs/product/liste.php +++ b/htdocs/product/liste.php @@ -442,18 +442,12 @@ else $i++; } - if ($num > $conf->liste_limit) - { - if ($sref || $snom || $sall || $sbarcode || GETPOST('search')) - { - print_barre_liste('', $page, "liste.php", "&sref=".$sref."&snom=".$snom."&sall=".$sall."&tosell=".$tosell."&tobuy=".$tobuy, $sortfield, $sortorder,'',$num); - } - else - { - print_barre_liste('', $page, "liste.php", "&sref=$sref&snom=$snom&fourn_id=$fourn_id".(isset($type)?"&type=$type":"")."&tosell=".$tosell."&tobuy=".$tobuy, $sortfield, $sortorder,'',$num); - } - } - + $param="&sref=".$sref.($sbarcode?"&sbarcode=".$sbarcode:"")."&snom=".$snom."&sall=".$sall."&tosell=".$tosell."&tobuy=".$tobuy; + $param.=($fourn_id?"&fourn_id=".$fourn_id:""); + $param.=($search_categ?"&search_categ=".$search_categ:""); + $param.=isset($type)?"&type=".$type:""; + print_barre_liste('', $page, "liste.php", $param, $sortfield, $sortorder,'',$num); + $db->free($resql); print ""; From aa473fa3e386d7a5debe2cd96274fadd4c73c94e Mon Sep 17 00:00:00 2001 From: fhenry Date: Fri, 22 Feb 2013 09:42:02 +0100 Subject: [PATCH 06/11] Fix bug #730 --- htdocs/user/param_ihm.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index 534ae00ddc4..35f87eb7733 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -1,6 +1,7 @@ * Copyright (C) 2010-2012 Regis Houssin + * Copyright (C) 2013 Florian Henry * * 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 @@ -190,7 +191,7 @@ if ($action == 'edit') print 'conf->MAIN_SIZE_LISTE_LIMIT)?" checked":""); print ! empty($dolibarr_main_demo)?' disabled="disabled"':''; // Disabled for demo print '> '.$langs->trans("UsePersonalValue").''; - print ''; + print ''; print '
'; From 20522148f227e8eb909a412ef7a69f3f172af39c Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 22 Feb 2013 11:03:20 +0100 Subject: [PATCH 07/11] Fix: regression, the product discount overwrites the default customer discount ! --- htdocs/core/tpl/objectline_add.tpl.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/tpl/objectline_add.tpl.php b/htdocs/core/tpl/objectline_add.tpl.php index 2abeb380f75..a575034aa1e 100644 --- a/htdocs/core/tpl/objectline_add.tpl.php +++ b/htdocs/core/tpl/objectline_add.tpl.php @@ -80,8 +80,8 @@ if (! empty($conf->margin->enabled)) { 'origin_price_ht_cache' => 'price_ht', 'origin_tva_tx_cache' => 'tva_tx', 'origin_price_ttc_cache' => 'price_ttc', - 'qty' => 'qty', - 'remise_percent' => 'discount' + 'qty' => 'qty' + //'remise_percent' => 'discount' ), 'update_textarea' => array( 'product_desc' => 'desc' @@ -242,7 +242,7 @@ $(document).ready(function() { $('#select_type').val(data.type).attr('disabled','disabled').trigger('change'); //$('#price_base_type_area').show(); $('#qty').val(data.qty); - $('#remise_percent').val(data.discount); + //$('#remise_percent').val(data.discount); if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined" && CKEDITOR.instances['product_desc'] != "undefined") { CKEDITOR.instances['product_desc'].setData(data.desc).focus(); From 3b45cffafa91eaf55180ad628578cd0f01fbd81b Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 22 Feb 2013 11:25:29 +0100 Subject: [PATCH 08/11] Fix: hide blocs with multi-page --- .../livraison/pdf/pdf_typhon.modules.php | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php index 2be7a5afc63..a88d2ca06f4 100644 --- a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php +++ b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php @@ -490,17 +490,18 @@ class pdf_typhon extends ModelePDFDeliveryOrder $pdf->SetXY($this->posxqty-1, $tab_top+1); $pdf->MultiCell(30, 2, $outputlangs->transnoentities("QtyShipped"),'','R'); - // Modif Seb cadres signatures - $pdf->SetFont('','', $default_font_size); - $larg_sign = ($this->page_largeur-$this->marge_gauche-$this->marge_droite)/3; - $pdf->Rect($this->marge_gauche, ($tab_top + $tab_height + 3), $larg_sign, 25); - $pdf->SetXY($this->marge_gauche + 2, $tab_top + $tab_height + 5); - $pdf->MultiCell($larg_sign,2, $outputlangs->trans("For").' '.$outputlangs->convToOutputCharset($mysoc->name).":",'','L'); - - $pdf->Rect(2*$larg_sign+$this->marge_gauche, ($tab_top + $tab_height + 3), $larg_sign, 25); - $pdf->SetXY(2*$larg_sign+$this->marge_gauche + 2, $tab_top + $tab_height + 5); - $pdf->MultiCell($larg_sign,2, $outputlangs->trans("ForCustomer").':','','L'); + if (!empty($hidebottom)) { + // Modif Seb cadres signatures + $pdf->SetFont('','', $default_font_size); + $larg_sign = ($this->page_largeur-$this->marge_gauche-$this->marge_droite)/3; + $pdf->Rect($this->marge_gauche, ($tab_top + $tab_height + 3), $larg_sign, 25); + $pdf->SetXY($this->marge_gauche + 2, $tab_top + $tab_height + 5); + $pdf->MultiCell($larg_sign,2, $outputlangs->trans("For").' '.$outputlangs->convToOutputCharset($mysoc->name).":",'','L'); + $pdf->Rect(2*$larg_sign+$this->marge_gauche, ($tab_top + $tab_height + 3), $larg_sign, 25); + $pdf->SetXY(2*$larg_sign+$this->marge_gauche + 2, $tab_top + $tab_height + 5); + $pdf->MultiCell($larg_sign,2, $outputlangs->trans("ForCustomer").':','','L'); + } } /** From dd7411593e3438d5dad6758178d82a0953256514 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 22 Feb 2013 12:21:49 +0100 Subject: [PATCH 09/11] Fix: wrong hidden --- htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php index a88d2ca06f4..f402045a471 100644 --- a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php +++ b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php @@ -323,11 +323,11 @@ class pdf_typhon extends ModelePDFDeliveryOrder $pdf->setPage($pagenb); if ($pagenb == 1) { - $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1); + $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0); } else { - $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1); + $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1); } $this->_pagefoot($pdf,$object,$outputlangs,1); $pagenb++; @@ -355,12 +355,12 @@ class pdf_typhon extends ModelePDFDeliveryOrder // Show square if ($pagenb == 1) { - $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0); + $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 1); $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfooter + 1; } else { - $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0); + $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 1); $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfooter + 1; } From b5d2a378fad6ffddf31b1b9446ba8847371b2173 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 22 Feb 2013 13:14:04 +0100 Subject: [PATCH 10/11] Fix: pdf models are unstable and time consuming. --- .../livraison/pdf/pdf_typhon.modules.php | 35 +++++++++++-------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php index f402045a471..0e65800698a 100644 --- a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php +++ b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php @@ -214,7 +214,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder $pdf->SetTextColor(0,0,0); $tab_top = 90; - $tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42:10); + $tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?22:10); $tab_height = 130; $tab_height_newpage = 150; @@ -252,7 +252,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder $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. + $pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext); // The only function to edit the bottom margin of current page to set it. $pageposbefore=$pdf->getPage(); // Description of product line @@ -323,11 +323,11 @@ class pdf_typhon extends ModelePDFDeliveryOrder $pdf->setPage($pagenb); if ($pagenb == 1) { - $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0); + $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1); } else { - $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1); + $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1); } $this->_pagefoot($pdf,$object,$outputlangs,1); $pagenb++; @@ -355,12 +355,12 @@ class pdf_typhon extends ModelePDFDeliveryOrder // Show square if ($pagenb == 1) { - $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 1); + $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0); $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfooter + 1; } else { - $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 1); + $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1); $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfooter + 1; } @@ -472,25 +472,32 @@ class pdf_typhon extends ModelePDFDeliveryOrder // 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); + if (empty($hidetop)) + $pdf->line($this->marge_gauche, $tab_top+6, $this->page_largeur-$this->marge_droite, $tab_top+6); $pdf->SetTextColor(0,0,0); $pdf->SetFont('','', $default_font_size - 1); - $pdf->SetXY($this->posxdesc-1, $tab_top+1); - $pdf->MultiCell(80,2, $outputlangs->transnoentities("Designation"),'','L'); + if (empty($hidetop)) { + $pdf->SetXY($this->posxdesc-1, $tab_top+1); + $pdf->MultiCell(80,2, $outputlangs->transnoentities("Designation"),'','L'); + } // Modif SEB pour avoir une col en plus pour les commentaires clients $pdf->line($this->posxcomm, $tab_top, $this->posxcomm, $tab_top + $tab_height); - $pdf->SetXY($this->posxcomm, $tab_top+1); - $pdf->MultiCell(80,2, $outputlangs->transnoentities("Comments"),'','L'); + if (empty($hidetop)) { + $pdf->SetXY($this->posxcomm, $tab_top+1); + $pdf->MultiCell(80,2, $outputlangs->transnoentities("Comments"),'','L'); + } // Qty $pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height); - $pdf->SetXY($this->posxqty-1, $tab_top+1); - $pdf->MultiCell(30, 2, $outputlangs->transnoentities("QtyShipped"),'','R'); + if (empty($hidetop)) { + $pdf->SetXY($this->posxqty-1, $tab_top+1); + $pdf->MultiCell(30, 2, $outputlangs->transnoentities("QtyShipped"),'','R'); + } - if (!empty($hidebottom)) { + if (empty($hidebottom)) { // Modif Seb cadres signatures $pdf->SetFont('','', $default_font_size); $larg_sign = ($this->page_largeur-$this->marge_gauche-$this->marge_droite)/3; From c4948ea3db7e4015dfa8b1c231d75f1053ece4e1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 25 Feb 2013 20:23:44 +0100 Subject: [PATCH 11/11] Fix: It seems foreign key is not deleted sometimes. To be sure, we force delete also at end. --- htdocs/install/mysql/migration/3.2.0-3.3.0.sql | 2 ++ htdocs/install/mysql/migration/repair.sql | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 3793e822102..dacb7519f28 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 @@ -923,3 +923,5 @@ DELETE FROM llx_c_action_trigger WHERE elementtype='withdraw'; UPDATE llx_c_action_trigger SET code='FICHINTER_VALIDATE' WHERE code='FICHEINTER_VALIDATE'; UPDATE llx_c_departements SET ncc='ALAVA', nom='Álava' WHERE code_departement='01' AND fk_region=419; + +ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseur; diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql index 96b5da7d357..f27fb8cf95f 100644 --- a/htdocs/install/mysql/migration/repair.sql +++ b/htdocs/install/mysql/migration/repair.sql @@ -92,4 +92,4 @@ UPDATE llx_product p SET p.stock= (SELECT SUM(ps.reel) FROM llx_product_stock ps -- DROP TABLE llx_expedition_methode; -- DROP TABLE llx_product_fournisseur; -- ALTER TABLE llx_product_fournisseur_price DROP COLUMN fk_product_fournisseur; - +ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseur;