From 6252857440d7f4ddf1f0549e8b89179473809977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Sat, 6 Apr 2013 17:56:10 +0200 Subject: [PATCH 01/35] Fixed translations and BILL_SUPPLIER_BUILDDOC trigger --- htdocs/adherents/admin/adherent_extrafields.php | 4 +--- htdocs/admin/agenda_extrafields.php | 3 +-- .../supplier_invoice/modules_facturefournisseur.php | 2 +- .../modules/supplier_invoice/pdf/pdf_canelle.modules.php | 8 ++++---- htdocs/langs/en_US/margins.lang | 1 + htdocs/langs/es_ES/admin.lang | 2 +- htdocs/langs/es_ES/margins.lang | 3 ++- htdocs/langs/fr_FR/margins.lang | 1 + 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php index ef104cab883..91377a5e843 100755 --- a/htdocs/adherents/admin/adherent_extrafields.php +++ b/htdocs/adherents/admin/adherent_extrafields.php @@ -58,8 +58,6 @@ require DOL_DOCUMENT_ROOT.'/core/admin_extrafields.inc.php'; * View */ -$textobject=$langs->transnoentitiesnoconv("Members"); - $help_url='EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros'; llxHeader('',$langs->trans("MembersSetup"),$help_url); @@ -73,7 +71,7 @@ $head = member_admin_prepare_head(); dol_fiche_head($head, 'attributes', $langs->trans("Member"), 0, 'user'); -print $langs->trans("DefineHereComplementaryAttributes",$textobject).'
'."\n"; +print $langs->trans("DefineHereComplementaryAttributes", $langs->transnoentitiesnoconv("Members")).'
'."\n"; print '
'; dol_htmloutput_errors($mesg); diff --git a/htdocs/admin/agenda_extrafields.php b/htdocs/admin/agenda_extrafields.php index 1bd0c84ef77..8efb31dad27 100644 --- a/htdocs/admin/agenda_extrafields.php +++ b/htdocs/admin/agenda_extrafields.php @@ -76,8 +76,7 @@ $head=agenda_prepare_head(); dol_fiche_head($head, 'attributes', $langs->trans("Agenda")); - -print $langs->trans("DefineHereComplementaryAttributes",$textobject).'
'."\n"; +print $langs->trans("DefineHereComplementaryAttributes", $langs->transnoentitiesnoconv("Agenda")).'
'."\n"; print '
'; dol_htmloutput_errors($mesg); diff --git a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php index d29abaa08a0..1f8f6cb858f 100755 --- a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php +++ b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php @@ -148,7 +148,7 @@ function supplier_invoice_pdf_create($db, $object, $modele, $outputlangs, $hided // Appel des triggers include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($db); - $result=$interface->run_triggers('BILL_INVOICE_BUILDDOC',$object,$user,$langs,$conf); + $result=$interface->run_triggers('BILL_SUPPLIER_BUILDDOC',$object,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } // Fin appel triggers diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php index 5e857abf6b0..1477b202878 100755 --- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php +++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php @@ -564,8 +564,8 @@ class pdf_canelle extends ModelePDFSuppliersInvoices $tvakey=str_replace('*','',$tvakey); $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")"; } - $totalvat =$outputlangs->transnoentities("TotalLT1",$mysoc->country_code).' '; - $totalvat.=vatrate(abs($tvakey),1).$tvacompl; + $totalvat = $outputlangs->transcountrynoentities("TotalLT1",$mysoc->country_code).' '; + $totalvat.= vatrate(abs($tvakey),1).$tvacompl; $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1); $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index); @@ -592,8 +592,8 @@ class pdf_canelle extends ModelePDFSuppliersInvoices $tvakey=str_replace('*','',$tvakey); $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")"; } - $totalvat =$outputlangs->transnoentities("TotalLT2",$mysoc->country_code).' '; - $totalvat.=vatrate(abs($tvakey),1).$tvacompl; + $totalvat = $outputlangs->transcountrynoentities("TotalLT2",$mysoc->country_code).' '; + $totalvat.= vatrate(abs($tvakey),1).$tvacompl; $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1); $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index); diff --git a/htdocs/langs/en_US/margins.lang b/htdocs/langs/en_US/margins.lang index 10a8112f87e..f4975b719c7 100644 --- a/htdocs/langs/en_US/margins.lang +++ b/htdocs/langs/en_US/margins.lang @@ -45,6 +45,7 @@ MargeBrute=Raw margin MargeNette=Net margin MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price
Net margin : Selling price - Cost price +CostPrice=Cost price BuyingCost=Cost price UnitCharges=Unit charges Charges=Charges diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index cd40781f4a1..1cc8dbe0028 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -1344,7 +1344,7 @@ AccountancyCodeBuy=Código contable compras AgendaSetup=Módulo configuración de acciones y agenda PasswordTogetVCalExport=Clave de autorización vcal export link PastDelayVCalExport=No exportar los eventos de más de -AGENDA_USE_EVENT_TYPE=Use los tipos de eventos (administrables desde Configuración->Diccionarios->llx_c_actioncomm) +AGENDA_USE_EVENT_TYPE=Usar los tipos de eventos (administrables desde Configuración->Diccionarios->llx_c_actioncomm) ##### ClickToDial ##### ClickToDialDesc=Este módulo permite agregar un icono después del número de teléfono de contactos Dolibarr. Un clic en este icono, Llama a un servidor con una URL que se indica a continuación. Esto puede ser usado para llamar al sistema call center de Dolibarr que puede llamar al número de teléfono en un sistema SIP, por ejemplo. ##### Point Of Sales (CashDesk) ##### diff --git a/htdocs/langs/es_ES/margins.lang b/htdocs/langs/es_ES/margins.lang index 0dc08481c46..9dd68991ae7 100644 --- a/htdocs/langs/es_ES/margins.lang +++ b/htdocs/langs/es_ES/margins.lang @@ -43,8 +43,9 @@ MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Indica si un descuento global se toma en cue MARGIN_TYPE=Tipo de margen gestionado MargeBrute=Margen bruto MargeNette=Margen neto -MARGIN_TYPE_DETAILS=Margen bruto : Precio de venta sin IVA - Precio de compra sin IVA
Margen neto : Precio de venta sin IVA - Costos +MARGIN_TYPE_DETAILS=Margen bruto: Precio de venta sin IVA - Precio de compra sin IVA
Margen neto: Precio de venta sin IVA - Costos +CostPrice=Precio de compra BuyingCost=Costos UnitCharges=Carga unitaria Charges=Cargas diff --git a/htdocs/langs/fr_FR/margins.lang b/htdocs/langs/fr_FR/margins.lang index 3c81a9a1e4d..b30e79a3e7b 100644 --- a/htdocs/langs/fr_FR/margins.lang +++ b/htdocs/langs/fr_FR/margins.lang @@ -45,6 +45,7 @@ MargeBrute=Marge brute MargeNette=Marge nette MARGIN_TYPE_DETAILS=Marge brute : Prix de vente HT - Prix d'achat HT
Marge nette : Prix de vente HT - Coût de revient +CostPrice=Prix ​​d'achat BuyingCost=Coût de revient UnitCharges=Charge unitaire Charges=Charges From 4ceeea4a1c24c8690e9e319877be557e2880c79b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Apr 2013 14:36:22 +0200 Subject: [PATCH 02/35] Fix: Can't reset payment due date --- htdocs/fourn/facture/fiche.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 468a5c91e79..6f80f5b0303 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -191,7 +191,7 @@ elseif ($action == 'setdate_lim_reglement' && $user->rights->fournisseur->factur { $object->fetch($id); $object->date_echeance=dol_mktime(12,0,0,$_POST['date_lim_reglementmonth'],$_POST['date_lim_reglementday'],$_POST['date_lim_reglementyear']); - if ($object->date_echeance < $object->date) + if (! empty($object->date_echeance) && $object->date_echeance < $object->date) { $object->date_echeance=$object->date; setEventMessage($langs->trans("DatePaymentTermCantBeLowerThanObjectDate"),'warnings'); From 64a96894733826d0ceafbf902d77e0a0ccc48f7e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Apr 2013 14:40:13 +0200 Subject: [PATCH 03/35] Fix: [ bug #787 ] Invoice supplier box incorrect tooltip when delay on payment --- htdocs/core/boxes/box_factures_fourn.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php index 7de7d3d1ea1..1e9996dc4ad 100644 --- a/htdocs/core/boxes/box_factures_fourn.php +++ b/htdocs/core/boxes/box_factures_fourn.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2009 Laurent Destailleur + * Copyright (C) 2004-2013 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -96,7 +96,7 @@ class box_factures_fourn extends ModeleBoxes $now=dol_now(); $i = 0; - $l_due_date = $langs->trans('Late').' ('.strtolower($langs->trans('DateEcheance')).': %s)'; + $l_due_date = $langs->trans('Late').' ('.$langs->trans('DateEcheance').': %s)'; while ($i < $num) { @@ -105,7 +105,7 @@ class box_factures_fourn extends ModeleBoxes $datec=$db->jdate($objp->datec); $late = ''; - if ($objp->paye == 0 && $datelimite < ($now - $conf->facture->fournisseur->warning_delay)) $late=img_warning(sprintf($l_due_date, dol_print_date($datelimite,'day'))); + if ($objp->paye == 0 && $datelimite && $datelimite < ($now - $conf->facture->fournisseur->warning_delay)) $late=img_warning(sprintf($l_due_date, dol_print_date($datelimite,'day'))); $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"', 'logo' => $this->boximg, From 515c5e58ca1fb4d9a6e5499509f24777cd0e1ca9 Mon Sep 17 00:00:00 2001 From: simnandez Date: Sun, 7 Apr 2013 15:04:55 +0200 Subject: [PATCH 04/35] Update Changelog --- ChangeLog | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a95ef991d5b..fe34f954f38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,9 +6,12 @@ English Dolibarr ChangeLog ***** ChangeLog for 3.3.2 compared to 3.3.1 ***** --Fix: Ducth (nl_NL) translation --Fix: [ bug #790 ] Spanish localtax RE not being correctly calculated --Generalize fix: file with a specific mask not found, again +- Fix: Ducth (nl_NL) translation +- Fix: [ bug #790 ] Spanish localtax RE not being correctly calculated +- Generalize fix: file with a specific mask not found, again +- Fix: translations and BILL_SUPPLIER_BUILDDOC trigger +- Fix: Can't reset payment due date +- Fix: [ bug #787 ] Invoice supplier box incorrect tooltip when delay on payment From 35279f652092162c2b6195872305b88166f2ad53 Mon Sep 17 00:00:00 2001 From: simnandez Date: Sun, 7 Apr 2013 15:17:31 +0200 Subject: [PATCH 05/35] Update ChangeLog --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index fe34f954f38..70762076068 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,8 @@ English Dolibarr ChangeLog - Fix: translations and BILL_SUPPLIER_BUILDDOC trigger - Fix: Can't reset payment due date - Fix: [ bug #787 ] Invoice supplier box incorrect tooltip when delay on payment +- Fix: [ bug #794 ] Lost filter on zipwode in prospect list +- Fix: [ bug #774 ] Bug on creating event with box "all day" crossed From 8f67606685b67bb091e1209f4cd8164094b9f871 Mon Sep 17 00:00:00 2001 From: simnandez Date: Sun, 7 Apr 2013 16:04:57 +0200 Subject: [PATCH 06/35] Spelling fix --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 70762076068..3a3907ab729 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,7 +12,7 @@ English Dolibarr ChangeLog - Fix: translations and BILL_SUPPLIER_BUILDDOC trigger - Fix: Can't reset payment due date - Fix: [ bug #787 ] Invoice supplier box incorrect tooltip when delay on payment -- Fix: [ bug #794 ] Lost filter on zipwode in prospect list +- Fix: [ bug #794 ] Lost filter on zipcode in prospect list - Fix: [ bug #774 ] Bug on creating event with box "all day" crossed From b678183ff2d8f3046250cb5428ec5dcef8a861ed Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Apr 2013 21:09:57 +0200 Subject: [PATCH 07/35] Log --- htdocs/core/class/hookmanager.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php index 753086339fb..efd7ad6932d 100755 --- a/htdocs/core/class/hookmanager.class.php +++ b/htdocs/core/class/hookmanager.class.php @@ -138,6 +138,8 @@ class HookManager { foreach($modules as $module => $actionclassinstance) { + //var_dump(get_class($actionclassinstance).'->'.$method); + // jump to next class if method does not exists if (! method_exists($actionclassinstance,$method)) continue; // test to avoid to run twice a hook, when a module implements several active contexts @@ -162,7 +164,7 @@ class HookManager } // Generic hooks that return a string (printSearchForm, printLeftBlock, printTopRightMenu, formAddObjectLine, formBuilddocOptions, ...) else - { + { // TODO. this should be done into the method by returning nothing if (is_array($parameters) && ! empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) continue; From 6013916d459e4b448ecf0a150755c49fc1edcb21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Sun, 7 Apr 2013 21:58:24 +0200 Subject: [PATCH 08/35] Removed duplicated code and fixed a problem with orders2invoice --- htdocs/commande/orderstoinvoice.php | 35 +++++++++++++---------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php index c709b2b4bbd..a6b2fe44a1f 100755 --- a/htdocs/commande/orderstoinvoice.php +++ b/htdocs/commande/orderstoinvoice.php @@ -51,37 +51,32 @@ $sref = GETPOST('sref'); $sref_client = GETPOST('sref_client'); $sall = GETPOST('sall'); $socid = GETPOST('socid','int'); +$selected = GETPOST('orders_to_invoice'); +$sortfield = GETPOST("sortfield",'alpha'); +$sortorder = GETPOST("sortorder",'alpha'); +$viewstatut = GETPOST('viewstatut'); - -$sortfield = GETPOST("sortfield",'alpha'); -$sortorder = GETPOST("sortorder",'alpha'); if (! $sortfield) $sortfield='c.rowid'; if (! $sortorder) $sortorder='DESC'; -$date_start=dol_mktime(0,0,0,$_REQUEST["date_startmonth"],$_REQUEST["date_startday"],$_REQUEST["date_startyear"]); // Date for local PHP server -$date_end=dol_mktime(23,59,59,$_REQUEST["date_endmonth"],$_REQUEST["date_endday"],$_REQUEST["date_endyear"]); -$date_starty=dol_mktime(0,0,0,$_REQUEST["date_start_delymonth"],$_REQUEST["date_start_delyday"],$_REQUEST["date_start_delyyear"]); // Date for local PHP server -$date_endy=dol_mktime(23,59,59,$_REQUEST["date_end_delymonth"],$_REQUEST["date_end_delyday"],$_REQUEST["date_end_delyyear"]); -$selected=GETPOST('orders_to_invoice'); -$action=GETPOST('action','alpha'); +$now = dol_now(); +$date_start = dol_mktime(0,0,0,$_REQUEST["date_startmonth"],$_REQUEST["date_startday"],$_REQUEST["date_startyear"]); // Date for local PHP server +$date_end = dol_mktime(23,59,59,$_REQUEST["date_endmonth"],$_REQUEST["date_endday"],$_REQUEST["date_endyear"]); +$date_starty = dol_mktime(0,0,0,$_REQUEST["date_start_delymonth"],$_REQUEST["date_start_delyday"],$_REQUEST["date_start_delyyear"]); // Date for local PHP server +$date_endy = dol_mktime(23,59,59,$_REQUEST["date_end_delymonth"],$_REQUEST["date_end_delyday"],$_REQUEST["date_end_delyyear"]); + if ($action == 'create') { - if (! is_array($selected)) + if (is_array($selected) == false) { - $mesgs[]='
'.$langs->trans('Error_OrderNotChecked').'
'; + $mesgs = array('
'.$langs->trans('Error_OrderNotChecked').'
'); } else { - $socid=GETPOST('socid'); - $action=GETPOST('action'); - $origin=GETPOST('origin'); - $originid=GETPOST('originid'); + $origin = GETPOST('origin'); + $originid = GETPOST('originid'); } } -$now=dol_now(); - -$viewstatut=GETPOST('viewstatut'); - /* * Actions @@ -358,7 +353,7 @@ $formfile = new FormFile($db); $companystatic = new Societe($db); // Mode creation -if ($action == 'create') +if ($action == 'create' && empty($mesgs)) { $facturestatic=new Facture($db); From 303cf3bc41062c945fa6e3a1132d00e11053cc3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Sun, 7 Apr 2013 22:00:51 +0200 Subject: [PATCH 09/35] Updated changelog --- ChangeLog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3a3907ab729..5300f3f219b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,7 +13,8 @@ English Dolibarr ChangeLog - Fix: Can't reset payment due date - Fix: [ bug #787 ] Invoice supplier box incorrect tooltip when delay on payment - Fix: [ bug #794 ] Lost filter on zipcode in prospect list -- Fix: [ bug #774 ] Bug on creating event with box "all day" crossed +- Fix: [ bug #774 ] Bug on creating event with box "all day" crossed +- Fix: Orderstoinvoice didn't act as expected when no order was checked From f3bbfe375cc242ccca073f5f3f905c491b710b09 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 8 Apr 2013 12:38:51 +0200 Subject: [PATCH 10/35] Fix: for multicompany compatibility --- htdocs/paypal/lib/paypal.lib.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index 372122940f4..b3949b3d068 100755 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -309,6 +309,10 @@ function getPaypalPaymentUrl($mode,$type,$ref='',$amount='9.99',$freetag='your_f } } } + + // For multicompany + $out.="&entity=".$conf->entity; + return $out; } @@ -790,4 +794,4 @@ function getApiError() return $errors; } -?> \ No newline at end of file +?> From 98aaec18a72e96ee98cb6bda909c7f84e8ca1202 Mon Sep 17 00:00:00 2001 From: fhenry Date: Mon, 8 Apr 2013 18:08:38 +0200 Subject: [PATCH 11/35] Fix [ bug #810 ] Cannot update ODT template path --- htdocs/admin/commande.php | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index 7dda6ded0e4..fc982db0bb7 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -66,7 +66,7 @@ if ($action == 'updateMask') } } -if ($action == 'specimen') +else if ($action == 'specimen') { $modele=GETPOST('module','alpha'); @@ -111,7 +111,8 @@ if ($action == 'specimen') } } -if ($action == 'set') +// Activate a model +else if ($action == 'set') { $label = GETPOST('label','alpha'); $scandir = GETPOST('scandir','alpha'); @@ -128,7 +129,7 @@ if ($action == 'set') } } -if ($action == 'del') +else if ($action == 'del') { $type='order'; $sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model"; @@ -142,7 +143,8 @@ if ($action == 'del') } } -if ($action == 'setdoc') +// Set default model +else if ($action == 'setdoc') { $label = GETPOST('label','alpha'); $scandir = GETPOST('scandir','alpha'); @@ -182,7 +184,7 @@ if ($action == 'setdoc') } } -if ($action == 'setmod') +else if ($action == 'setmod') { // TODO Verifier si module numerotation choisi peut etre active // par appel methode canBeActivated @@ -190,7 +192,7 @@ if ($action == 'setmod') dolibarr_set_const($db, "COMMANDE_ADDON",$value,'chaine',0,'',$conf->entity); } -if ($action == 'set_COMMANDE_DRAFT_WATERMARK') +else if ($action == 'set_COMMANDE_DRAFT_WATERMARK') { $draft = GETPOST("COMMANDE_DRAFT_WATERMARK"); $res = dolibarr_set_const($db, "COMMANDE_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity); @@ -207,7 +209,7 @@ if ($action == 'set_COMMANDE_DRAFT_WATERMARK') } } -if ($action == 'set_COMMANDE_FREE_TEXT') +else if ($action == 'set_COMMANDE_FREE_TEXT') { $freetext = GETPOST("COMMANDE_FREE_TEXT"); // No alpha here, we want exact string @@ -224,6 +226,14 @@ if ($action == 'set_COMMANDE_FREE_TEXT') $mesg = "".$langs->trans("Error").""; } } +else if ($action='setModuleOptions') { + if (dolibarr_set_const($db, "COMMANDE_ADDON_PDF_ODT_PATH",GETPOST('value1'),'chaine',0,'',$conf->entity)) + { + // La constante qui a ete lue en avant du nouveau set + // on passe donc par une variable pour avoir un affichage coherent + $conf->global->COMMANDE_ADDON_PDF_ODT_PATH = GETPOST('value1'); + } +} /* From 8118332dfb0419b68e07f93bd3330d3f9649a143 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 10 Apr 2013 13:00:05 +0200 Subject: [PATCH 12/35] Fix: security Conflicts: htdocs/core/modules/mailings/contacts2.modules.php --- htdocs/core/modules/mailings/contacts2.modules.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/htdocs/core/modules/mailings/contacts2.modules.php b/htdocs/core/modules/mailings/contacts2.modules.php index 1d722cb938d..3270c2cf36d 100755 --- a/htdocs/core/modules/mailings/contacts2.modules.php +++ b/htdocs/core/modules/mailings/contacts2.modules.php @@ -1,5 +1,6 @@ +/* Copyright (C) 2011 François Cerbelle + * Copyright (C) 2013 Regis Houssin * * 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 @@ -87,7 +88,7 @@ class mailing_contacts2 extends MailingTargets $sql.= " AND sp.no_email = 0"; //$sql.= " AND sp.poste != ''"; $sql.= " AND sp.entity IN (".getEntity('societe', 1).")"; - if ($filtersarray[0]<>'all') $sql.= " AND sp.poste ='".$filtersarray[0]."'"; + if ($filtersarray[0]<>'all') $sql.= " AND sp.poste ='".$this->db->escape($filtersarray[0])."'"; $sql.= " ORDER BY sp.name, sp.firstname"; $resql = $this->db->query($sql); if ($resql) @@ -219,4 +220,4 @@ class mailing_contacts2 extends MailingTargets } -?> \ No newline at end of file +?> From 38e30836a5972bea3621cb080801ef94c76f4dc3 Mon Sep 17 00:00:00 2001 From: fhenry Date: Wed, 10 Apr 2013 15:08:03 +0200 Subject: [PATCH 13/35] Fix bug with multicompany (SYSLOG_FILE on wrong entity) --- htdocs/admin/syslog.php | 4 ++-- htdocs/install/mysql/migration/3.2.0-3.3.0.sql | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php index 5bb0e85de84..075f975adb2 100644 --- a/htdocs/admin/syslog.php +++ b/htdocs/admin/syslog.php @@ -98,14 +98,14 @@ if ($action == 'set') if ($_POST[$option['constant']]) { dolibarr_del_const($db, $option['constant'], 0); - dolibarr_set_const($db, $option['constant'], $_POST[$option['constant']], 'chaine'); + dolibarr_set_const($db, $option['constant'], $_POST[$option['constant']], 'chaine',0, '', 0); } } } } } - dolibarr_set_const($db, 'SYSLOG_HANDLERS', json_encode($activeModules), 'chaine'); + dolibarr_set_const($db, 'SYSLOG_HANDLERS', json_encode($activeModules), 'chaine',0,'',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 b756659d987..76f48ed7d61 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 @@ -927,3 +927,6 @@ UPDATE llx_c_departements SET ncc='ALAVA', nom='Álava' WHERE code_departement=' ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseur; UPDATE llx_const set name='PRODUIT_MULTI_PRICES' where name='PRODUIT_MUTLI_PRICES'; + +DELETE FROM llx_const WHERE entity<>0 AND name IN ('SYSLOG_HANDLERS','SYSLOG_LEVEL'); +UPDATE llx_const SET entity=0 WHERE name = 'SYSLOG_FILE'; From 057365b69e837b6f1a8410acb55530ae47ac46d1 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 10 Apr 2013 15:33:03 +0200 Subject: [PATCH 14/35] Fix: change for experimental encryption --- htdocs/install/mysql/migration/3.2.0-3.3.0.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 b756659d987..18620fe09f7 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 @@ -89,7 +89,7 @@ ALTER TABLE llx_commande CHANGE COLUMN fk_demand_reason fk_input_reason integer ALTER TABLE llx_propal CHANGE COLUMN fk_demand_reason fk_input_reason integer NULL DEFAULT NULL; ALTER TABLE llx_commande_fournisseur CHANGE COLUMN fk_methode_commande fk_input_method integer NULL DEFAULT 0; -INSERT INTO llx_const (name, value, type, note, visible) values ('PRODUCT_CODEPRODUCT_ADDON','mod_codeproduct_leopard','yesno','Module to control product codes',0); +INSERT INTO llx_const (name, value, type, note, visible) values (__ENCRYPT('PRODUCT_CODEPRODUCT_ADDON')__, __ENCRYPT('mod_codeproduct_leopard')__, 'yesno', 'Module to control product codes', 0); ALTER TABLE llx_c_barcode_type ADD UNIQUE INDEX uk_c_barcode_type(code, entity); @@ -926,4 +926,4 @@ UPDATE llx_c_departements SET ncc='ALAVA', nom='Álava' WHERE code_departement=' ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseur; -UPDATE llx_const set name='PRODUIT_MULTI_PRICES' where name='PRODUIT_MUTLI_PRICES'; +UPDATE llx_const SET name = __ENCRYPT('PRODUIT_MULTI_PRICES')__ WHERE __DECRYPT('name')__ = 'PRODUIT_MUTLI_PRICES'; From 19e902ef8f104b5c5599168ed46220b902c5da38 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 10 Apr 2013 15:59:54 +0200 Subject: [PATCH 15/35] Fix: filter on all contacts, not just those related to a company --- .../modules/mailings/contacts2.modules.php | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/htdocs/core/modules/mailings/contacts2.modules.php b/htdocs/core/modules/mailings/contacts2.modules.php index 3270c2cf36d..0096b855fe0 100755 --- a/htdocs/core/modules/mailings/contacts2.modules.php +++ b/htdocs/core/modules/mailings/contacts2.modules.php @@ -81,13 +81,12 @@ class mailing_contacts2 extends MailingTargets $sql = "SELECT sp.rowid as id, sp.email as email, sp.rowid as fk_contact,"; $sql.= " sp.name as name, sp.firstname as firstname, sp.civilite,"; $sql.= " s.nom as companyname"; - $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp,"; - $sql.= " ".MAIN_DB_PREFIX."societe as s"; - $sql.= " WHERE s.rowid = sp.fk_soc"; + $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp"; + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = sp.fk_soc"; + $sql.= " WHERE sp.entity IN (".getEntity('societe', 1).")"; $sql.= " AND sp.email != ''"; // Note that null != '' is false $sql.= " AND sp.no_email = 0"; //$sql.= " AND sp.poste != ''"; - $sql.= " AND sp.entity IN (".getEntity('societe', 1).")"; if ($filtersarray[0]<>'all') $sql.= " AND sp.poste ='".$this->db->escape($filtersarray[0])."'"; $sql.= " ORDER BY sp.name, sp.firstname"; $resql = $this->db->query($sql); @@ -163,10 +162,9 @@ class mailing_contacts2 extends MailingTargets // Number with a filter are show in the combo list for each filter. // If we want a filter "a position is defined", we must add it into formFilter $sql = "SELECT count(distinct(sp.email)) as nb"; - $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp,"; - $sql.= " ".MAIN_DB_PREFIX."societe as s"; - $sql.= " WHERE s.rowid = sp.fk_soc"; - $sql.= " AND sp.entity IN (".getEntity('societe', 1).")"; + $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp"; + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = sp.fk_soc"; + $sql.= " WHERE sp.entity IN (".getEntity('societe', 1).")"; $sql.= " AND sp.email != ''"; // Note that null != '' is false $sql.= " AND sp.no_email = 0"; //$sql.= " AND sp.poste != ''"; @@ -188,10 +186,9 @@ class mailing_contacts2 extends MailingTargets $langs->load("companies"); $sql = "SELECT sp.poste, count(distinct(sp.email)) AS nb"; - $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp,"; - $sql.= " ".MAIN_DB_PREFIX."societe as s"; - $sql.= " WHERE s.rowid = sp.fk_soc"; - $sql.= " AND sp.entity IN (".getEntity('societe', 1).")"; + $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp"; + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = sp.fk_soc"; + $sql.= " WHERE sp.entity IN (".getEntity('societe', 1).")"; $sql.= " AND sp.email != ''"; // Note that null != '' is false $sql.= " AND sp.no_email = 0"; $sql.= " AND (sp.poste IS NOT NULL AND sp.poste != '')"; From 5d94b0c5768607928d567b5e55591d1d0f3d291c Mon Sep 17 00:00:00 2001 From: fhenry Date: Wed, 10 Apr 2013 16:34:06 +0200 Subject: [PATCH 16/35] Fix bug : change path of ODT template for commande and propal module --- htdocs/admin/commande.php | 2 +- htdocs/admin/propal.php | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index fc982db0bb7..bb82c0d9ee1 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -226,7 +226,7 @@ else if ($action == 'set_COMMANDE_FREE_TEXT') $mesg = "".$langs->trans("Error").""; } } -else if ($action='setModuleOptions') { +else if ($action=='setModuleOptions') { if (dolibarr_set_const($db, "COMMANDE_ADDON_PDF_ODT_PATH",GETPOST('value1'),'chaine',0,'',$conf->entity)) { // La constante qui a ete lue en avant du nouveau set diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php index 04f429f50bb..46da115c360 100644 --- a/htdocs/admin/propal.php +++ b/htdocs/admin/propal.php @@ -162,6 +162,36 @@ if ($action == 'setdefaultduration') } } +// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...) +if ($action == 'setModuleOptions') +{ + $post_size=count($_POST); + + $db->begin(); + + for($i=0;$i < $post_size;$i++) + { + if (array_key_exists('param'.$i,$_POST)) + { + $param=GETPOST("param".$i,'alpha'); + $value=GETPOST("value".$i,'alpha'); + if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity); + if (! $res > 0) $error++; + } + } + if (! $error) + { + $db->commit(); + $mesg = "".$langs->trans("SetupSaved").""; + } + else + { + $db->rollback(); + $mesg = "".$langs->trans("Error").""; + } +} + + /*if ($action == 'setusecustomercontactasrecipient') { dolibarr_set_const($db, "PROPALE_USE_CUSTOMER_CONTACT_AS_RECIPIENT",$_POST["value"],'chaine',0,'',$conf->entity); From 72f0ca194cdf087c884088dbfdd958cade1932da Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 10 Apr 2013 19:28:54 +0200 Subject: [PATCH 17/35] Fix: Solve conflict of translation --- htdocs/langs/ar_SA/admin.lang | 4 ---- htdocs/langs/bg_BG/admin.lang | 4 ---- htdocs/langs/ca_ES/admin.lang | 4 ---- htdocs/langs/da_DK/admin.lang | 4 ---- htdocs/langs/de_AT/admin.lang | 4 ---- htdocs/langs/de_DE/admin.lang | 4 ---- htdocs/langs/el_GR/admin.lang | 1 - htdocs/langs/en_US/admin.lang | 4 ---- htdocs/langs/es_ES/admin.lang | 4 ---- htdocs/langs/et_EE/admin.lang | 4 ---- htdocs/langs/fa_IR/admin.lang | 4 ---- htdocs/langs/fi_FI/admin.lang | 4 ---- htdocs/langs/fr_FR/admin.lang | 4 ---- htdocs/langs/he_IL/admin.lang | 4 ---- htdocs/langs/hu_HU/admin.lang | 4 ---- htdocs/langs/is_IS/admin.lang | 4 ---- htdocs/langs/it_IT/admin.lang | 4 ---- htdocs/langs/ja_JP/admin.lang | 4 ---- htdocs/langs/nb_NO/admin.lang | 4 ---- htdocs/langs/nl_BE/admin.lang | 4 ---- htdocs/langs/nl_NL/admin.lang | 4 ---- htdocs/langs/pl_PL/admin.lang | 4 ---- htdocs/langs/pt_BR/admin.lang | 4 ---- htdocs/langs/pt_PT/admin.lang | 4 ---- htdocs/langs/ro_RO/admin.lang | 4 ---- htdocs/langs/ru_RU/admin.lang | 4 ---- htdocs/langs/sl_SI/admin.lang | 4 ---- htdocs/langs/sv_SE/admin.lang | 4 ---- htdocs/langs/tr_TR/admin.lang | 4 ---- htdocs/langs/zh_CN/admin.lang | 4 ---- htdocs/langs/zh_TW/admin.lang | 4 ---- 31 files changed, 121 deletions(-) diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang index 1869540d58b..722231818d2 100644 --- a/htdocs/langs/ar_SA/admin.lang +++ b/htdocs/langs/ar_SA/admin.lang @@ -333,10 +333,6 @@ Module1400Name=المحاسبة Module1400Desc=المحاسبة الإدارية (ضعف الأحزاب) Module1780Name=الفئات Module1780Desc=الفئات إدارة المنتجات والموردين والزبائن) -Module2200Name=الإقراض الإنسان -Module2200Desc=الإقراض لإدارة الحقوق -Module2300Name=القوائم -Module2300Desc=القوائم إدارة Module2400Name=جدول الأعمال Module2400Desc=الأعمال / الإدارة المهام وجدول الأعمال Module2500Name=إدارة المحتوى الإلكتروني diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang index 34dfd27832a..812767e5ab4 100644 --- a/htdocs/langs/bg_BG/admin.lang +++ b/htdocs/langs/bg_BG/admin.lang @@ -438,10 +438,6 @@ Module1780Name=Категории Module1780Desc=Категория управление (продукти, доставчици и клиенти) Module2000Name=WYSIWYG редактор Module2000Desc=Оставя се да редактирате някакъв текст, чрез използване на усъвършенствана редактор -Module2200Name=Кредити права -Module2200Desc=Заеми за управление на права -Module2300Name=Менюта -Module2300Desc=Меню управление Module2400Name=Дневен ред Module2400Desc=Събития / задачи и управление на дневен ред Module2500Name=Управление на електронно съдържание diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index 1b5bdfcbfad..230450ce3fa 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -446,10 +446,6 @@ Module1780Name=Categories Module1780Desc=Gestió de categories (productes, proveïdors i clients) Module2000Name=Editor WYSIWYG Module2000Desc=Permet l'edició de certes zones de text mitjançant un editor avançat -Module2200Name=Dret de préstecs -Module2200Desc=Gestió dels drets de préstecs -Module2300Name=Menús -Module2300Desc=Administració dels menús per base de dades Module2400Name=Agenda Module2400Desc=Gestió de l'agenda i de les accions Module2500Name=Gestió Electrònica de Documents diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang index a710c6cfda8..5dc84bdef04 100644 --- a/htdocs/langs/da_DK/admin.lang +++ b/htdocs/langs/da_DK/admin.lang @@ -305,10 +305,6 @@ Module1400Name=Regnskabsmæssig ekspert Module1400Desc=Regnskabsmæssig forvaltning for eksperter (dobbelt parterne) Module1780Name=Kategorier Module1780Desc=Kategorier 'forvaltning (produkter, leverandører og kunder) -Module2200Name=Udlånsrettighederne -Module2200Desc=Udlånsrettighederne forvaltning -Module2300Name=Menuer -Module2300Desc=Menuer 'ledelse Module2400Name=Agenda Module2400Desc=Handlinger / opgaver og dagsorden forvaltning Module2500Name=Elektronisk Content Management diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang index fb5b1ee498f..50b20c94796 100644 --- a/htdocs/langs/de_AT/admin.lang +++ b/htdocs/langs/de_AT/admin.lang @@ -300,10 +300,6 @@ Module1400Name=Buchhaltung Module1400Desc=Buchhaltung für Experten (doppelte Buchhaltung) Module1780Name=Kategorien Module1780Desc=Kategorienverwaltung (Produkte, Lieferanten und Kunden) -Module2200Name=Verleihrechte -Module2200Desc=Verleihrechteverwaltung -Module2300Name=Menüs -Module2300Desc=Menüverwaltung Module2400Name=Agenda Module2400Desc=Maßnahmen/Aufgaben und Agendaverwaltung Module2500Name=Inhaltsverwaltung(ECM) diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang index 6f27f1b4c5f..7c56963166b 100644 --- a/htdocs/langs/de_DE/admin.lang +++ b/htdocs/langs/de_DE/admin.lang @@ -421,10 +421,6 @@ Module1780Name=Kategorien Module1780Desc=Kategorienverwaltung (Produkte, Lieferanten und Kunden) Module2000Name=FCKeditor Module2000Desc=WYSIWYG-Editor -Module2200Name=Verleihrechte -Module2200Desc=Verleihrechteverwaltung -Module2300Name=Menüs -Module2300Desc=Menüverwaltung Module2400Name=Agenda Module2400Desc=Maßnahmen/Aufgaben und Agendaverwaltung Module2500Name=Inhaltsverwaltung(ECM) diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang index 1250cfadf24..9628acf2211 100644 --- a/htdocs/langs/el_GR/admin.lang +++ b/htdocs/langs/el_GR/admin.lang @@ -181,7 +181,6 @@ Module330Name=Σελιδοδείκτες Module400Name=Έργα Module700Name=Δωρεές Module1780Name=Κατηγορίες -Module2300Name=Μενού Module2400Name=Ατζέντα Module50100Name=Σημείο Πωλήσεων Permission19=Διαγραφή τιμολογίων diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 1554fcede0f..8d613053e3a 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -448,10 +448,6 @@ Module1780Name=Categories Module1780Desc=Category management (products, suppliers and customers) Module2000Name=WYSIWYG editor Module2000Desc=Allow to edit some text area using an advanced editor -Module2200Name=Lending rights -Module2200Desc=Lending rights management -Module2300Name=Menus -Module2300Desc=Menu management Module2400Name=Agenda Module2400Desc=Events/tasks and agenda management Module2500Name=Electronic Content Management diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index 1cc8dbe0028..ad4a06a6f79 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -449,10 +449,6 @@ Module1780Name=Categorías Module1780Desc=Gestión de categorías (productos, proveedores y clientes) Module2000Name=Editor WYSIWYG Module2000Desc=Permite la edición de ciertas zonas de texto mediante un editor avanzado -Module2200Name=Derecho de préstamos -Module2200Desc=Gestión de los derechos de préstamos -Module2300Name=Menús -Module2300Desc=Administración de los menús por base de datos Module2400Name=Agenda Module2400Desc=Gestión de la agenda y de las acciones Module2500Name=Gestión Electrónica de Documentos diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang index 763bc5b6eac..b42ccb0a190 100644 --- a/htdocs/langs/et_EE/admin.lang +++ b/htdocs/langs/et_EE/admin.lang @@ -418,10 +418,6 @@ Module1780Name=Kategooriad Module1780Desc=Kategoorias juhtkond (toodete, tarnijate ja tarbijate) Module2000Name=WYSIWYG editor Module2000Desc=Võimaldavad muuta natuke teksti ala, kasutades täiustatud toimetaja -Module2200Name=Laenutusõigust -Module2200Desc=Laenutusõigust juhtimine -Module2300Name=Menüüd -Module2300Desc=Menüü juhtkond Module2400Name=Päevakord Module2400Desc=Events / ülesanded ja kava haldamise Module2500Name=Electronic Content Management diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang index f3a038532d4..2f703f61e92 100644 --- a/htdocs/langs/fa_IR/admin.lang +++ b/htdocs/langs/fa_IR/admin.lang @@ -341,10 +341,6 @@ Module1400Name=المحاسبة Module1400Desc=المحاسبة الإدارية (ضعف الأحزاب) Module1780Name=الفئات Module1780Desc=الفئات إدارة المنتجات والموردين والزبائن) -Module2200Name=الإقراض الإنسان -Module2200Desc=الإقراض لإدارة الحقوق -Module2300Name=القوائم -Module2300Desc=القوائم إدارة Module2400Name=جدول الأعمال Module2400Desc=الأعمال / الإدارة المهام وجدول الأعمال Module2500Name=إدارة المحتوى الإلكتروني diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang index 06cd7ef8817..a79d9c9adbf 100644 --- a/htdocs/langs/fi_FI/admin.lang +++ b/htdocs/langs/fi_FI/admin.lang @@ -303,10 +303,6 @@ Module1400Name=Kirjanpidon asiantuntija Module1400Desc=Kirjanpidon hallinta asiantuntijoille (double osapuolet) Module1780Name=Kategoriat Module1780Desc=Kategoriat hallintaa (tuotteet, tavarantoimittajat ja asiakkaat) -Module2200Name=Lainausoikeuksia -Module2200Desc=Luotonanto oikeuksien hallinta -Module2300Name=Menut -Module2300Desc=Valikot hallinto Module2400Name=Agenda Module2400Desc=Toimet / tehtävät ja esityslistan hallinta Module2500Name=Sähköinen Content Management diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index ffd0ac60658..616cfc6d550 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -443,10 +443,6 @@ Module1780Name= Catégories Module1780Desc= Gestion des catégories (produits, fournisseurs et clients) Module2000Name= Editeur WYSIWYG Module2000Desc= Permet la saisie de certaines zones de textes grace à un éditeur avancé -Module2200Name= Droit de prêts -Module2200Desc= Gestion du droit de prêts -Module2300Name= Menus -Module2300Desc= Administration des menus par base de données Module2400Name= Agenda Module2400Desc= Gestion des actions (événements et tâches) et de l'agenda Module2500Name= Gestion Electronique de Documents diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang index c84af3ec434..4c9f6a55ec0 100644 --- a/htdocs/langs/he_IL/admin.lang +++ b/htdocs/langs/he_IL/admin.lang @@ -418,10 +418,6 @@ Module1780Name=קטגוריות Module1780Desc=Categorie ההנהלה (מוצרים, ספקים ולקוחות) Module2000Name=עורך WYSIWYG Module2000Desc=אפשר לערוך כמה אזור הטקסט באמצעות עורך מתקדם -Module2200Name=ההלוואות זכויות -Module2200Desc=זכויות ההלוואות וניהול -Module2300Name=תפריטים -Module2300Desc=תפריט של ההנהלה Module2400Name=סדר היום Module2400Desc=אירועים / משימות וניהול סדר היום Module2500Name=תוכן אלקטרוני ניהול diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang index 0445f9fb8e9..fd1a1715e7a 100644 --- a/htdocs/langs/hu_HU/admin.lang +++ b/htdocs/langs/hu_HU/admin.lang @@ -418,10 +418,6 @@ Module1780Name=Kategóriák Module1780Desc=Kategóriában vezetősége (termékek, szállítók és vevők) Module2000Name=WYSIWYG szerkesztő Module2000Desc=Hagyjuk szerkeszteni egy szöveget terület egy fejlett szerkesztő -Module2200Name=Haszonkölcsönzési jogait -Module2200Desc=Hitelezési jogkezelés -Module2300Name=Menük -Module2300Desc=Menü vezetése Module2400Name=Napirend Module2400Desc=Események / feladatok és napirend menedzsment Module2500Name=Elektronikus Content Management diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang index 3b4af098b57..6ed5df3e4fb 100644 --- a/htdocs/langs/is_IS/admin.lang +++ b/htdocs/langs/is_IS/admin.lang @@ -369,10 +369,6 @@ Module1780Name=Flokkar Module1780Desc=Stjórn Flokkur's (vörur, birgja og viðskiptavina) Module2000Name=Fckeditor Module2000Desc=WYSIWYG Editor -Module2200Name=Útlán réttindi -Module2200Desc=Útlán réttindi -Module2300Name=Matseðlar -Module2300Desc=Valmynd's stjórnun Module2400Name=Dagskrá Module2400Desc=Aðgerðir / verkefni og dagskrá stjórnun Module2500Name=Rafræn Innihald Stjórnun diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang index a8a55093f8d..605bb6a625d 100644 --- a/htdocs/langs/it_IT/admin.lang +++ b/htdocs/langs/it_IT/admin.lang @@ -637,12 +637,8 @@ Module20Desc =Gestione proposte commerciali Module20Name =Proposte Module210Desc =Integrazione Postnuke Module210Name =Postnuke -Module2200Desc =Gestione dei diritti di prestito -Module2200Name =Diritti di prestito Module22Desc =Gestione posta massiva Module22Name =Posta massiva -Module2300Desc =Gestione dei Menu -Module2300Name =Menu Module23Desc =Monitoraggio del consumo energetico Module23Name =Energia Module2400Desc =Gestione eventi/compiti e ordine del giorno diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang index 6422a0c9634..f1a474fed1a 100644 --- a/htdocs/langs/ja_JP/admin.lang +++ b/htdocs/langs/ja_JP/admin.lang @@ -418,10 +418,6 @@ Module1780Name=カテゴリー Module1780Desc=Categorieの管理（製品、サプライヤー、顧客） Module2000Name=WYSIWYGエディタ Module2000Desc=高度なエディタを使用して、いくつかのテキストエリアを編集することができます -Module2200Name=融資の権限 -Module2200Desc=貸出権限の管理 -Module2300Name=メニュー -Module2300Desc=メニューの管理 Module2400Name=議題 Module2400Desc=イベント/タスクと議題の管理 Module2500Name=電子コンテンツ管理 diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang index 7a9ec630980..f37656c62ab 100644 --- a/htdocs/langs/nb_NO/admin.lang +++ b/htdocs/langs/nb_NO/admin.lang @@ -299,10 +299,6 @@ Module1400Name=Regnskapsekspert Module1400Desc=Behandling av regnskapssopplysninger for eksperter (double parties) Module1780Name=Kategorier Module1780Desc=Behandling av kategorier (varer, leverandører og kunder) -Module2200Name=Utlånsrettigheter -Module2200Desc=Behandling av utlånsrettigheter -Module2300Name=Menyer -Module2300Desc=Menybehandling Module2400Name=Agenda Module2400Desc=Handlinger/oppgaver og agendabehandling Module2500Name=Electronic Content Management diff --git a/htdocs/langs/nl_BE/admin.lang b/htdocs/langs/nl_BE/admin.lang index 9da2674c14c..711478a2a6a 100644 --- a/htdocs/langs/nl_BE/admin.lang +++ b/htdocs/langs/nl_BE/admin.lang @@ -413,10 +413,6 @@ Module1780Name = Categorieën Module1780Desc = Categorie' beheer (producten, leveranciers en klanten) Module2000Name = Module2000Desc = -Module2200Name = Uitleenrechten -Module2200Desc = Uitleenrechten beheer -Module2300Name = Menu's -Module2300Desc = Menu's beheer Module2400Name = Agenda Module2400Desc = Acties / taken en agenda beheer Module2500Name = Electronic Content Management diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang index b3d80668ba2..97efffdbe5e 100644 --- a/htdocs/langs/nl_NL/admin.lang +++ b/htdocs/langs/nl_NL/admin.lang @@ -383,10 +383,6 @@ Module1780Name = Categorieën Module1780Desc = Categoriebeheer (producten, leveranciers en afnemers) Module2000Name = Fckeditor Module2000Desc = Een WYSIWYG editor -Module2200Name = Uitleenrechten -Module2200Desc = Uitleenrechtenbeheer -Module2300Name = Menu's -Module2300Desc = Menubeheer Module2400Name = Agenda Module2400Desc = Acties-, taken- en agendabeheer Module2500Name = Electronic Content Management diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang index 3e98c2e19c8..1817660d665 100644 --- a/htdocs/langs/pl_PL/admin.lang +++ b/htdocs/langs/pl_PL/admin.lang @@ -306,10 +306,6 @@ Module1400Name=Księgowość ekspertów Module1400Desc=Księgowość zarządzania dla ekspertów (double stron) Module1780Name=Kategorie Module1780Desc=Kategorie zarządzania (produktów, dostawców i klientów) -Module2200Name=Użyczanie -Module2200Desc=Kredyty zarządzania prawami -Module2300Name=Menu -Module2300Desc=Menu zarządzania Module2400Name=Porządek obrad Module2400Desc=Działania / zadania i porządku zarządzania Module2500Name=Electronic Content Management diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang index 78a92d28d73..d001e6fb84c 100644 --- a/htdocs/langs/pt_BR/admin.lang +++ b/htdocs/langs/pt_BR/admin.lang @@ -320,10 +320,6 @@ Module1200Name=Mantis Module1200Desc=Interface com o sistema de seguimento de incidências Mantis Module1780Name=Categorias Module1780Desc=Administração de categorias (produtos, Fornecedores e clientes) -Module2200Name=Direito de emprétimos -Module2200Desc=Administração dos direitos de emprétimos -Module2300Name=Menus -Module2300Desc=Administração dos menus por base de dados Module2400Name=Agenda Module2400Desc=Administração da agenda e das ações Module2500Name=Administração Eletrônica de Documentos diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang index c9a0c81d20e..7f6f02be470 100644 --- a/htdocs/langs/pt_PT/admin.lang +++ b/htdocs/langs/pt_PT/admin.lang @@ -558,12 +558,8 @@ Module20Desc = Gestão de Orçamentos/Propostas comerciais Module20Name = Orçamentos Module210Desc = Integração com PostNuke Module210Name = PostNuke -Module2200Desc = Gestão dos direitos de empréstimos -Module2200Name = Direito de empréstimos Module22Desc = Administração e envío de E-Mails massivos Module22Name = E-Mailings -Module2300Desc = Administração dos menus por base de dados -Module2300Name = Menus Module23Desc = Acompanhamento do consumo de energia Module23Name = Energia Module2400Desc = Gestão da agenda e das acções diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang index 907e7c10e7b..e049b78fbbd 100644 --- a/htdocs/langs/ro_RO/admin.lang +++ b/htdocs/langs/ro_RO/admin.lang @@ -304,10 +304,6 @@ Module1400Name=Expert contabil Module1400Desc=Contabilitate de gestiune pentru experţi (dublu părţi) Module1780Name=Categorii Module1780Desc=Categorii de "management (produse, furnizori şi clienţi) -Module2200Name=Credite drepturile -Module2200Desc=Credite de gestionare a drepturilor -Module2300Name=Meniuri -Module2300Desc=Meniuri de gestionare Module2400Name=Ordinea de zi Module2400Desc=Acţiuni / activităţi de ordine de zi şi de gestionare a Module2500Name=Electronic Content Management diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang index 76591925e57..9f051c0f3ba 100644 --- a/htdocs/langs/ru_RU/admin.lang +++ b/htdocs/langs/ru_RU/admin.lang @@ -303,10 +303,6 @@ Module1400Name=Бухгалтерия эксперт Module1400Desc=Бухгалтерия управления для экспертов (двойная сторон) Module1780Name=Категории Module1780Desc=Категории управления (продукции, поставщиков и заказчиков) -Module2200Name=Кредитование человека -Module2200Desc=Кредитование права управления -Module2300Name=Меню -Module2300Desc=Меню управления Module2400Name=Повестка дня Module2400Desc=Деятельность / задачи и программы управления Module2500Name=Электронное управление diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang index 47b8ab80347..6c83d1d141e 100644 --- a/htdocs/langs/sl_SI/admin.lang +++ b/htdocs/langs/sl_SI/admin.lang @@ -399,10 +399,6 @@ Module1780Name = Kategorije Module1780Desc = Upravljanje kategorij (proizvodi, dobavitelji in kupci) Module2000Name = Fck urejevalnik Module2000Desc = WYSIWYG urejevalnik -Module2200Name = Kreditne pravice -Module2200Desc = Upravljanje kreditnih pravic -Module2300Name = Meniji -Module2300Desc = Upravljanje menijev Module2400Name = Dnevni red Module2400Desc = Upravljanje aktivnosti/nalog in dnevnih redov Module2500Name = Upravljanje elektronskih vsebin diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang index 82e94b5acd9..e7036e47db4 100644 --- a/htdocs/langs/sv_SE/admin.lang +++ b/htdocs/langs/sv_SE/admin.lang @@ -372,10 +372,6 @@ Module1780Name=Kategorier Module1780Desc=Categorie ledning (produkter, leverantörer och kunder) Module2000Name=FCKeditor Module2000Desc=WYSIWYG Editor -Module2200Name=Utlåning rättigheter -Module2200Desc=Utlåning förvaltning av rättigheter -Module2300Name=Menyer -Module2300Desc=Meny ledning Module2400Name=Agenda Module2400Desc=Åtgärder / uppgifter och dagordning förvaltning Module2500Name=Electronic Content Management diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang index ef75bda0eee..212a938edde 100755 --- a/htdocs/langs/tr_TR/admin.lang +++ b/htdocs/langs/tr_TR/admin.lang @@ -370,10 +370,6 @@ Module1780Name=Kategoriler Module1780Desc=Kategorilerin yönetimi (ürünler, tedarikçiler ve müşteriler) Module2000Name=FCKdüzenleyici (FCKeditor) Module2000Desc=Gelişmiş editör kullanarak bazı metin alanlarının düzenlenmesini sağlar -Module2200Name=Kiralama hakları -Module2200Desc=Kiralama hakları yönetimi -Module2300Name=Menüler -Module2300Desc=Menülerin yönetimi Module2400Name=Gündem Module2400Desc=Eylemler/görevler ve gündem yönetimi Module2500Name=Elektronik İçerik Yönetimi diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang index 39121d9ce0b..937e3dae058 100644 --- a/htdocs/langs/zh_CN/admin.lang +++ b/htdocs/langs/zh_CN/admin.lang @@ -366,10 +366,6 @@ Module1780Name=分类 Module1780Desc=的类别：管理层（产品，供应商和客户） Module2000Name=fckeditor的 Module2000Desc=所见即所得的编辑器 -Module2200Name=贷款的权利 -Module2200Desc=贷款权限管理 -Module2300Name=菜单 -Module2300Desc=菜单的管理 Module2400Name=议程 Module2400Desc=行动/任务和议程管理 Module2500Name=电子内容管理 diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang index c1f69179187..edf18ba2584 100644 --- a/htdocs/langs/zh_TW/admin.lang +++ b/htdocs/langs/zh_TW/admin.lang @@ -371,10 +371,6 @@ Module1780Name=分類 Module1780Desc=分類的管理（產品，供應商和客戶） Module2000Name=fckeditor的 Module2000Desc=所見即所得的編輯器 -Module2200Name=貸款的權利 -Module2200Desc=貸款權限管理 -Module2300Name=選單 -Module2300Desc=選單的管理 Module2400Name=議程 Module2400Desc=行動/任務和議程管理 Module2500Name=電子內容管理 From 3bcd506e73dd753d8afdaea2e2fa1fedec4ffbf3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 10 Apr 2013 23:06:38 +0200 Subject: [PATCH 18/35] Fix: demo modules list --- htdocs/public/demo/index.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php index fcd0976876b..b9be5a24070 100644 --- a/htdocs/public/demo/index.php +++ b/htdocs/public/demo/index.php @@ -70,16 +70,18 @@ $object=new stdClass(); $reshook=$hookmanager->executeHooks('addDemoProfile', $parameters, $object, $tmpaction); // Note that $action and $object may have been modified by some hooks $error=$hookmanager->error; $errors=$hookmanager->errors; +// Visible $alwayscheckedmodules=array('barcode','bookmark','externalrss','fckeditor','geoipmaxmind','gravatar','memcached','syslog','user','webservices'); // Technical module we always want $alwaysuncheckedmodules=array('paybox','paypal','google','scanner','workflow'); // Module we never want +// Not visible $alwayshiddencheckedmodules=array('accounting','barcode','bookmark','clicktodial','comptabilite','document','domain','externalrss','externalsite','fckeditor','geoipmaxmind','gravatar','label','ldap', 'mailmanspip','notification','syslog','user','webservices', // Extended modules 'memcached','numberwords','zipautofillfr'); $alwayshiddenuncheckedmodules=array('boutique','ftp', // Extended modules - 'awstats','bittorrent','cabinetmed','cmcic','concatpdf','dolicloud','filemanager','lightbox','mantis','monitoring','moretemplates','nltechno','numberingpack','openstreetmap', - 'ovh','phenix','phpsysinfo','pibarcode','postnuke','skincoloreditor','submiteverywhere','survey','thomsonphonebook','topten','tvacerfa','voyage','webcalendar','webmail'); + 'awstats','bittorrent','bootstrap','cabinetmed','cmcic','concatpdf','dolicloud','filemanager','lightbox','mantis','monitoring','moretemplates','nltechno','numberingpack','openstreetmap', + 'ovh','phenix','phpsysinfo','pibarcode','postnuke','selectbank','skincoloreditor','submiteverywhere','survey','thomsonphonebook','topten','tvacerfa','voyage','webcalendar','webmail'); // Search modules $dirlist=$conf->file->dol_document_root; From d570aa02d4b097c5dc3249fca86831d04c3a3ccc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 10 Apr 2013 23:11:21 +0200 Subject: [PATCH 19/35] Fix: bad url --- htdocs/public/demo/index.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php index b9be5a24070..da447c7fd00 100644 --- a/htdocs/public/demo/index.php +++ b/htdocs/public/demo/index.php @@ -218,8 +218,7 @@ if (GETPOST("action") == 'gotodemo') // Do redirect to login page if ($disablestring) { - $url=DOL_URL_ROOT.'/index.php?disablemodules='.$disablestring; - if (GETPOST('urlfrom','alpha')) $url.='&urlfrom='.GETPOST('urlfrom','alpha'); + $url=DOL_URL_ROOT.'/index.php?'.(GETPOST('urlfrom','alpha')?'urlfrom='.urlencode(GETPOST('urlfrom','alpha')).'&':'').'disablemodules='.$disablestring; header("Location: ".$url); exit; } From 76c180aaafd5e72846f9b7d1378a9dc8e2d9eaf5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 10 Apr 2013 23:13:55 +0200 Subject: [PATCH 20/35] Fix: encoding at wrong place --- htdocs/public/demo/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php index da447c7fd00..93eed01d86c 100644 --- a/htdocs/public/demo/index.php +++ b/htdocs/public/demo/index.php @@ -297,7 +297,7 @@ foreach ($demoprofiles as $profilearray) print '
'."\n"; print ''."\n"; - print ''."\n"; + print ''."\n"; print ''."\n"; print ''."\n"; print ''."\n"; From 662d9cfa6efa5d5a212c7d132d33ab012b8a5b32 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 11 Apr 2013 17:10:11 +0200 Subject: [PATCH 21/35] Fix: for avoid problem with multicompany thirdparty sharing --- htdocs/core/class/conf.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index e456effe66e..449ba902c26 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -341,7 +341,8 @@ class Conf // societe if (empty($this->global->SOCIETE_CODECLIENT_ADDON)) $this->global->SOCIETE_CODECLIENT_ADDON="mod_codeclient_leopard"; - if (empty($this->global->SOCIETE_CODEFOURNISSEUR_ADDON)) $this->global->SOCIETE_CODEFOURNISSEUR_ADDON=$this->global->SOCIETE_CODECLIENT_ADDON; + // Unused constant and for avoid problem with multicompany sharing + //if (empty($this->global->SOCIETE_CODEFOURNISSEUR_ADDON)) $this->global->SOCIETE_CODEFOURNISSEUR_ADDON=$this->global->SOCIETE_CODECLIENT_ADDON; if (empty($this->global->SOCIETE_CODECOMPTA_ADDON)) $this->global->SOCIETE_CODECOMPTA_ADDON="mod_codecompta_panicum"; // Security From 9ec74194a0cff38ec994244937dcb2dd5f6ea34b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Thu, 11 Apr 2013 23:10:27 +0200 Subject: [PATCH 22/35] Translated linked object propal module name --- htdocs/compta/facture.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index a990149aa87..66d78e66b9a 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -2082,7 +2082,9 @@ if ($action == 'create') print ''; $newclassname=$classname; - if ($newclassname=='Propal') $newclassname='CommercialProposal'; + if ($newclassname == 'Propal') $newclassname = 'CommercialProposal'; + elseif ($newclassname == 'Commande') $newclassname = 'Order'; + print ''; print ''; print '"; From 85e09a953f87481cd3a74d5049760f48ec72b9be Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 12 Apr 2013 10:00:20 +0200 Subject: [PATCH 23/35] Fix: missing return with hook --- htdocs/core/lib/files.lib.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index d5874b1d4d7..81a3c2705de 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -700,6 +700,8 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable return -3; // Unknown error } } + else + return $reshook; } /** From 9596134e47b810a00bf574e96c1560026aa91296 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 12 Apr 2013 10:26:52 +0200 Subject: [PATCH 24/35] Fix: use new method --- htdocs/core/lib/files.lib.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index 81a3c2705de..5211841fc02 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -1,7 +1,7 @@ - * Copyright (C) 2012 Regis Houssin - * Copyright (C) 2012 Juanjo Menent +/* Copyright (C) 2008-2012 Laurent Destailleur + * Copyright (C) 2012-2013 Regis Houssin + * Copyright (C) 2012 Juanjo Menent * * 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 @@ -664,10 +664,10 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable $hookmanager->initHooks(array('fileslib')); $parameters=array('dest_file' => $dest_file, 'src_file' => $src_file, 'file_name' => $file_name, 'varfiles' => $varfiles, 'allowoverwrite' => $allowoverwrite); - $reshook=$hookmanager->executeHooks('moveUploadedFile', $parameters, $object); + $hookmanager->executeHooks('moveUploadedFile', $parameters, $object); } - if (empty($reshook)) + if (empty($hookmanager->resPrint)) { // The file functions must be in OS filesystem encoding. $src_file_osencoded=dol_osencode($src_file); @@ -701,7 +701,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable } } else - return $reshook; + return $hookmanager->resPrint; } /** From b6f765ef3c7cb3af194c76b96286f31eae65fe5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Fri, 12 Apr 2013 23:51:52 +0200 Subject: [PATCH 25/35] Improved es_ES translations --- htdocs/langs/es_ES/errors.lang | 2 +- htdocs/langs/es_ES/install.lang | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang index 41e39e4aea2..afb31dd4269 100644 --- a/htdocs/langs/es_ES/errors.lang +++ b/htdocs/langs/es_ES/errors.lang @@ -18,7 +18,7 @@ ErrorFailToCreateDir=Error al crear el directorio '%s' ErrorFailToDeleteDir=Error al eliminar el directorio '%s'. ErrorFailedToDeleteJoinedFiles=Imposible eliminar la entidad ya que tiene archivos adjuntos. Elimine antes los archivos adjuntos ErrorThisContactIsAlreadyDefinedAsThisType=Este contacto ya está definido como contacto para este tipo. -ErrorCashAccountAcceptsOnlyCashMoney=Esta cuenta bancaria es de tipo caja y solo acepta el método de pago de tipo especie. +ErrorCashAccountAcceptsOnlyCashMoney=Esta cuenta bancaria es de tipo caja y sólo acepta pagos en efectivo. ErrorFromToAccountsMustDiffers=La cuenta origen y destino deben ser diferentes. ErrorBadThirdPartyName=Nombre de tercero incorrecto ErrorProdIdIsMandatory=El %s es obligatorio diff --git a/htdocs/langs/es_ES/install.lang b/htdocs/langs/es_ES/install.lang index d53dcc28407..6ebfe3e0e10 100644 --- a/htdocs/langs/es_ES/install.lang +++ b/htdocs/langs/es_ES/install.lang @@ -225,4 +225,6 @@ MigrationProjectTaskTime=Actualización de tiempo dedicado en segundos # Migration Acctioncom MigrationActioncommElement=Actualización de los datos de acciones sobre elementos # Migration payment mode -MigrationPaymentMode=Actualización de los modos de pago \ No newline at end of file +MigrationPaymentMode=Actualización de los modos de pago +# Migration categories +MigrationCategorieAssociation=Actualización de las categorías \ No newline at end of file From ac0cd975cd5b688a410aafcc98581226a41b8a1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Sat, 13 Apr 2013 13:03:13 +0200 Subject: [PATCH 26/35] Added missing table head strings into supplier invoices --- htdocs/fourn/facture/fiche.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 6f80f5b0303..68ed4bc001e 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -1609,7 +1609,7 @@ else print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -1783,7 +1783,7 @@ else print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -1853,7 +1853,7 @@ else } print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; From d6b42ac87924a38ed3307e93c38c6dedf4563ef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Sat, 13 Apr 2013 14:44:56 +0200 Subject: [PATCH 27/35] [ bug #816 ] Sales journal does not reflect localtaxes --- htdocs/compta/journal/sellsjournal.php | 52 ++++++++++++++++++++++---- htdocs/langs/es_ES/compta.lang | 4 +- 2 files changed, 47 insertions(+), 9 deletions(-) diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php index 4ffed9fa53c..495db3b4c65 100755 --- a/htdocs/compta/journal/sellsjournal.php +++ b/htdocs/compta/journal/sellsjournal.php @@ -4,6 +4,7 @@ * Copyright (C) 2011 Juanjo Menent * Copyright (C) 2012 Regis Houssin * Copyright (C) 2011-2012 Alexandre Spangaro + * Copyright (C) 2013 Marcos García * * 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 @@ -24,6 +25,8 @@ * \ingroup societe, facture * \brief Page with sells journal */ +global $mysoc; + require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; @@ -42,10 +45,10 @@ $date_endmonth=GETPOST('date_endmonth'); $date_endday=GETPOST('date_endday'); $date_endyear=GETPOST('date_endyear'); -// Security check -if ($user->societe_id > 0) $socid = $user->societe_id; -if (! empty($conf->comptabilite->enabled)) $result=restrictedArea($user,'compta','','','resultat'); -if (! empty($conf->accounting->enabled)) $result=restrictedArea($user,'accounting','','','comptarapport'); +// Security check +if ($user->societe_id > 0) $socid = $user->societe_id; +if (! empty($conf->comptabilite->enabled)) $result=restrictedArea($user,'compta','','','resultat'); +if (! empty($conf->accounting->enabled)) $result=restrictedArea($user,'accounting','','','comptarapport'); /* * Actions @@ -96,15 +99,17 @@ $p = explode(":", $conf->global->MAIN_INFO_SOCIETE_PAYS); $idpays = $p[0]; $sql = "SELECT f.rowid, f.facnumber, f.type, f.datef, f.ref_client,"; -$sql.= " fd.product_type, fd.total_ht, fd.total_tva, fd.tva_tx, fd.total_ttc,"; +$sql.= " fd.product_type, fd.total_ht, fd.total_tva, fd.tva_tx, fd.total_ttc, fd.localtax1_tx, fd.localtax2_tx, fd.total_localtax1, fd.total_localtax2,"; $sql.= " s.rowid as socid, s.nom as name, s.code_compta, s.client,"; $sql.= " p.rowid as pid, p.ref as pref, p.accountancy_code_sell,"; -$sql.= " ct.accountancy_code_sell as account_tva"; +$sql.= " ct.accountancy_code_sell as account_tva, ctl1.accountancy_code_sell as account_localtax1, ctl2.accountancy_code_sell as account_localtax2"; $sql.= " FROM ".MAIN_DB_PREFIX."facturedet fd"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product p ON p.rowid = fd.fk_product"; $sql.= " JOIN ".MAIN_DB_PREFIX."facture f ON f.rowid = fd.fk_facture"; $sql.= " JOIN ".MAIN_DB_PREFIX."societe s ON s.rowid = f.fk_soc"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_tva ct ON fd.tva_tx = ct.taux AND ct.fk_pays = '".$idpays."'"; +$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_tva ctl1 ON fd.localtax1_tx = ctl1.localtax1 AND ctl1.fk_pays = '".$idpays."'"; +$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_tva ctl2 ON fd.localtax2_tx = ctl2.localtax2 AND ctl2.fk_pays = '".$idpays."'"; $sql.= " WHERE f.entity = ".$conf->entity; $sql.= " AND f.fk_statut > 0"; if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2)"; @@ -119,6 +124,8 @@ if ($result) $tabfac = array(); $tabht = array(); $tabtva = array(); + $tablocaltax1 = array(); + $tablocaltax2 = array(); $tabttc = array(); $tabcompany = array(); @@ -139,6 +146,8 @@ if ($result) } $cpttva = (! empty($conf->global->COMPTA_VAT_ACCOUNT)?$conf->global->COMPTA_VAT_ACCOUNT:$langs->trans("CodeNotDef")); $compta_tva = (! empty($obj->account_tva)?$obj->account_tva:$cpttva); + $compta_localtax1 = (! empty($obj->account_localtax1)?$obj->account_localtax1:$langs->trans("CodeNotDef")); + $compta_localtax2 = (! empty($obj->account_localtax2)?$obj->account_localtax2:$langs->trans("CodeNotDef")); //la ligne facture $tabfac[$obj->rowid]["date"] = $obj->datef; @@ -147,9 +156,13 @@ if ($result) if (! isset($tabttc[$obj->rowid][$compta_soc])) $tabttc[$obj->rowid][$compta_soc]=0; if (! isset($tabht[$obj->rowid][$compta_prod])) $tabht[$obj->rowid][$compta_prod]=0; if (! isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva]=0; + if (! isset($tablocaltax1[$obj->rowid][$compta_localtax1])) $tablocaltax1[$obj->rowid][$compta_localtax1]=0; + if (! isset($tablocaltax2[$obj->rowid][$compta_localtax2])) $tablocaltax2[$obj->rowid][$compta_localtax2]=0; $tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc; $tabht[$obj->rowid][$compta_prod] += $obj->total_ht; $tabtva[$obj->rowid][$compta_tva] += $obj->total_tva; + $tablocaltax1[$obj->rowid][$compta_localtax1] += $obj->total_localtax1; + $tablocaltax2[$obj->rowid][$compta_localtax2] += $obj->total_localtax2; $tabcompany[$obj->rowid]=array('id'=>$obj->socid, 'name'=>$obj->name, 'client'=>$obj->client); $i++; } @@ -215,7 +228,6 @@ foreach ($tabfac as $key => $val) } } // vat - //var_dump($tabtva); foreach ($tabtva[$key] as $k => $mt) { if ($mt) @@ -228,6 +240,32 @@ foreach ($tabfac as $key => $val) print ""; } } + // localtax1 + foreach ($tablocaltax1[$key] as $k => $mt) + { + if ($mt) + { + print ""; + //print ""; + print ""; + print ""; + print ""; + } + } + // localtax2 + foreach ($tablocaltax2[$key] as $k => $mt) + { + if ($mt) + { + print ""; + //print ""; + print ""; + print ""; + print ""; + } + } $var = !$var; } diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang index 2f72861a920..248a41a843d 100644 --- a/htdocs/langs/es_ES/compta.lang +++ b/htdocs/langs/es_ES/compta.lang @@ -29,8 +29,8 @@ PaymentsNotLinkedToInvoice=Pagos vinculados a ninguna factura, por lo que ningu PaymentsNotLinkedToUser=Pagos no vinculados a un usuario Profit=Beneficio Balance=Saldo -Debit=Débito -Credit=Crédito +Debit=Debe +Credit=Haber Withdrawl=Domiciliación Withdrawls=Domiciliaciones AmountHTVATRealReceived=Total repercutido From 3ed4d7bfbf5c9a86058a3614fa77770a599f2b0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Sat, 13 Apr 2013 14:46:43 +0200 Subject: [PATCH 28/35] Updated changelog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 5300f3f219b..619e0058e93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ English Dolibarr ChangeLog - Fix: [ bug #787 ] Invoice supplier box incorrect tooltip when delay on payment - Fix: [ bug #794 ] Lost filter on zipcode in prospect list - Fix: [ bug #774 ] Bug on creating event with box "all day" crossed +- Fix: [ bug #816 ] Sales journal does not reflect localtaxes - Fix: Orderstoinvoice didn't act as expected when no order was checked From b3a035951fa85f1903d93d5ed36e5fd217b0793a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Sat, 13 Apr 2013 15:22:59 +0200 Subject: [PATCH 29/35] [ bug #817 ] Purchases journal does not reflect localtaxes --- ChangeLog | 1 + htdocs/compta/journal/purchasesjournal.php | 49 +++++++++++++++++++--- 2 files changed, 45 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5300f3f219b..15db292de73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ English Dolibarr ChangeLog - Fix: [ bug #787 ] Invoice supplier box incorrect tooltip when delay on payment - Fix: [ bug #794 ] Lost filter on zipcode in prospect list - Fix: [ bug #774 ] Bug on creating event with box "all day" crossed +- Fix: [ bug #817 ] Purchases journal does not reflect localtaxes - Fix: Orderstoinvoice didn't act as expected when no order was checked diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php index 1521802a580..66f7f5a6aa2 100755 --- a/htdocs/compta/journal/purchasesjournal.php +++ b/htdocs/compta/journal/purchasesjournal.php @@ -24,6 +24,8 @@ * \ingroup societe, fournisseur, facture * \brief Page with purchases journal */ +global $mysoc; + require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; @@ -58,7 +60,7 @@ if (! empty($conf->accounting->enabled)) $result=restrictedArea($user,'accountin * View */ -llxHeader('','',''); +llxHeader('',$langs->trans("PurchasesJournal"),''); $form=new Form($db); @@ -94,12 +96,14 @@ $p = explode(":", $conf->global->MAIN_INFO_SOCIETE_PAYS); $idpays = $p[0]; $sql = "SELECT f.rowid, f.facnumber, f.type, f.datef, f.libelle,"; -$sql.= " fd.total_ttc, fd.tva_tx, fd.total_ht, fd.tva as total_tva, fd.product_type,"; +$sql.= " fd.total_ttc, fd.tva_tx, fd.total_ht, fd.tva as total_tva, fd.product_type, fd.localtax1_tx, fd.localtax2_tx, fd.total_localtax1, fd.total_localtax2,"; $sql.= " s.rowid as socid, s.nom as name, s.code_compta_fournisseur,"; $sql.= " p.rowid as pid, p.ref as ref, p.accountancy_code_buy,"; -$sql.= " ct.accountancy_code_buy as account_tva"; +$sql.= " ct.accountancy_code_buy as account_tva, ctl1.accountancy_code_buy as account_localtax1, ctl2.accountancy_code_buy as account_localtax2"; $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn_det fd"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_tva ct ON fd.tva_tx = ct.taux AND ct.fk_pays = '".$idpays."'"; +$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_tva ctl1 ON fd.localtax1_tx = ctl1.localtax1 AND ctl1.fk_pays = '".$idpays."'"; +$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_tva ctl2 ON fd.localtax2_tx = ctl2.localtax2 AND ctl2.fk_pays = '".$idpays."'"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product p ON p.rowid = fd.fk_product"; $sql.= " JOIN ".MAIN_DB_PREFIX."facture_fourn f ON f.rowid = fd.fk_facture_fourn"; $sql.= " JOIN ".MAIN_DB_PREFIX."societe s ON s.rowid = f.fk_soc" ; @@ -120,6 +124,8 @@ if ($result) $tabht = array(); $tabtva = array(); $tabttc = array(); + $tablocaltax1 = array(); + $tablocaltax2 = array(); $tabcompany = array(); $i=0; @@ -135,6 +141,8 @@ if ($result) else $compta_prod = (! empty($conf->global->COMPTA_SERVICE_BUY_ACCOUNT)?$conf->global->COMPTA_SERVICE_BUY_ACCOUNT:$langs->trans("CodeNotDef")); } $compta_tva = (! empty($obj->account_tva)?$obj->account_tva:$cpttva); + $compta_localtax1 = (! empty($obj->account_localtax1)?$obj->account_localtax1:$langs->trans("CodeNotDef")); + $compta_localtax2 = (! empty($obj->account_localtax2)?$obj->account_localtax2:$langs->trans("CodeNotDef")); $tabfac[$obj->rowid]["date"] = $obj->datef; $tabfac[$obj->rowid]["ref"] = $obj->facnumber; @@ -143,6 +151,8 @@ if ($result) $tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc; $tabht[$obj->rowid][$compta_prod] += $obj->total_ht; $tabtva[$obj->rowid][$compta_tva] += $obj->total_tva; + $tablocaltax1[$obj->rowid][$compta_localtax1] += $obj->total_localtax1; + $tablocaltax2[$obj->rowid][$compta_localtax2] += $obj->total_localtax2; $tabcompany[$obj->rowid]=array('id'=>$obj->socid,'name'=>$obj->name); $i++; @@ -193,7 +203,6 @@ foreach ($tabfac as $key => $val) } } // vat - //var_dump($tabtva); foreach ($tabtva[$key] as $k => $mt) { if ($mt) @@ -202,12 +211,42 @@ foreach ($tabfac as $key => $val) //print ""; print ""; print ""; - print ""; + print ""; print '"; print '"; print ""; } } + // localtax1 + foreach ($tablocaltax1[$key] as $k => $mt) + { + if ($mt) + { + print ""; + //print ""; + print ""; + print ""; + print ""; + print ""; + print ""; + print ""; + } + } + // localtax2 + foreach ($tablocaltax2[$key] as $k => $mt) + { + if ($mt) + { + print ""; + //print ""; + print ""; + print ""; + print ""; + print ""; + print ""; + print ""; + } + } print ""; // third party //print ""; From 404ad184253b0f7a14be31ac2f6fb26dd67766bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Sat, 13 Apr 2013 16:04:51 +0200 Subject: [PATCH 30/35] Added missing translation --- htdocs/langs/en_US/bills.lang | 1 + htdocs/langs/es_ES/bills.lang | 1 + htdocs/langs/fr_FR/bills.lang | 1 + 3 files changed, 3 insertions(+) diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 78179acd8c9..c6c4aabf708 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -189,6 +189,7 @@ Abandoned=Abandoned RemainderToPay=Remainder to pay RemainderToTake=Remainder to take RemainderToPayBack=Remainder to pay back +Rest=Pending AmountExpected=Amount claimed ExcessReceived=Excess received EscompteOffered=Discount offered (payment before term) diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang index e72c4637fd4..21b61974c6a 100644 --- a/htdocs/langs/es_ES/bills.lang +++ b/htdocs/langs/es_ES/bills.lang @@ -184,6 +184,7 @@ Abandoned=Abandonada RemainderToPay=Queda por pagar RemainderToTake=Queda por cobrar RemainderToPayBack=Queda por reembolsar +Rest=Pendiente AmountExpected=Importe reclamado ExcessReceived=Recibido en exceso EscompteOffered=Descuento (Pronto pago) diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index 237dcedda8b..02789aa3402 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -184,6 +184,7 @@ Abandoned=Abandonné RemainderToPay=Reste à payer RemainderToTake=Reste à encaisser RemainderToPayBack=Reste à rembourser +Rest=Créance AmountExpected=Montant réclamé ExcessReceived=Trop perçu EscompteOffered=Escompte (règlement avant échéance) From 85866ff9a645a7125b947bd4bda312f72b3c03b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Sat, 13 Apr 2013 17:10:07 +0200 Subject: [PATCH 31/35] Revert "Added missing translation" This reverts commit 404ad184253b0f7a14be31ac2f6fb26dd67766bc. --- htdocs/langs/en_US/bills.lang | 1 - htdocs/langs/es_ES/bills.lang | 1 - htdocs/langs/fr_FR/bills.lang | 1 - 3 files changed, 3 deletions(-) diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index c6c4aabf708..78179acd8c9 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -189,7 +189,6 @@ Abandoned=Abandoned RemainderToPay=Remainder to pay RemainderToTake=Remainder to take RemainderToPayBack=Remainder to pay back -Rest=Pending AmountExpected=Amount claimed ExcessReceived=Excess received EscompteOffered=Discount offered (payment before term) diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang index 21b61974c6a..e72c4637fd4 100644 --- a/htdocs/langs/es_ES/bills.lang +++ b/htdocs/langs/es_ES/bills.lang @@ -184,7 +184,6 @@ Abandoned=Abandonada RemainderToPay=Queda por pagar RemainderToTake=Queda por cobrar RemainderToPayBack=Queda por reembolsar -Rest=Pendiente AmountExpected=Importe reclamado ExcessReceived=Recibido en exceso EscompteOffered=Descuento (Pronto pago) diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index 02789aa3402..237dcedda8b 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -184,7 +184,6 @@ Abandoned=Abandonné RemainderToPay=Reste à payer RemainderToTake=Reste à encaisser RemainderToPayBack=Reste à rembourser -Rest=Créance AmountExpected=Montant réclamé ExcessReceived=Trop perçu EscompteOffered=Escompte (règlement avant échéance) From 580881c205080fec5447039d91726a209597fa43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Sat, 13 Apr 2013 17:12:16 +0200 Subject: [PATCH 32/35] Replaced `Rest` not translated string with `AlreadyPaid` --- htdocs/compta/facture/impayees.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php index 5737c9bb99a..0b5fe8f410e 100644 --- a/htdocs/compta/facture/impayees.php +++ b/htdocs/compta/facture/impayees.php @@ -130,18 +130,18 @@ if ($action == "builddoc" && $user->rights->facture->lire) } // Remove file -if ($action == 'remove_file') -{ - require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - - $langs->load("other"); - $upload_dir = $diroutputpdf; +if ($action == 'remove_file') +{ + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + + $langs->load("other"); + $upload_dir = $diroutputpdf; $file = $upload_dir . '/' . GETPOST('file'); - $ret=dol_delete_file($file,0,0,0,''); - if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile'))); - else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors'); - $action=''; -} + $ret=dol_delete_file($file,0,0,0,''); + if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile'))); + else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors'); + $action=''; +} @@ -283,7 +283,7 @@ if ($resql) print_liste_field_titre($langs->trans("AmountVAT"),$_SERVER["PHP_SELF"],"f.tva","",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER["PHP_SELF"],"f.total_ttc","",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Received"),$_SERVER["PHP_SELF"],"am","",$param,'align="right"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Rest"),$_SERVER["PHP_SELF"],"am","",$param,'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("AlreadyPaid"),$_SERVER["PHP_SELF"],"am","",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"fk_statut,paye,am","",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Merge"),$_SERVER["PHP_SELF"],"","",$param,'align="center"',$sortfield,$sortorder); print "\n"; From a6ed2551fbb44b1a23f8da989a08d988730c0385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Sat, 13 Apr 2013 17:13:59 +0200 Subject: [PATCH 33/35] Revert "Replaced `Rest` not translated string with `AlreadyPaid`" This reverts commit 580881c205080fec5447039d91726a209597fa43. --- htdocs/compta/facture/impayees.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php index 0b5fe8f410e..5737c9bb99a 100644 --- a/htdocs/compta/facture/impayees.php +++ b/htdocs/compta/facture/impayees.php @@ -130,18 +130,18 @@ if ($action == "builddoc" && $user->rights->facture->lire) } // Remove file -if ($action == 'remove_file') -{ - require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - - $langs->load("other"); - $upload_dir = $diroutputpdf; +if ($action == 'remove_file') +{ + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + + $langs->load("other"); + $upload_dir = $diroutputpdf; $file = $upload_dir . '/' . GETPOST('file'); - $ret=dol_delete_file($file,0,0,0,''); - if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile'))); - else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors'); - $action=''; -} + $ret=dol_delete_file($file,0,0,0,''); + if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile'))); + else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors'); + $action=''; +} @@ -283,7 +283,7 @@ if ($resql) print_liste_field_titre($langs->trans("AmountVAT"),$_SERVER["PHP_SELF"],"f.tva","",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER["PHP_SELF"],"f.total_ttc","",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Received"),$_SERVER["PHP_SELF"],"am","",$param,'align="right"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("AlreadyPaid"),$_SERVER["PHP_SELF"],"am","",$param,'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Rest"),$_SERVER["PHP_SELF"],"am","",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"fk_statut,paye,am","",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Merge"),$_SERVER["PHP_SELF"],"","",$param,'align="center"',$sortfield,$sortorder); print "\n"; From 418921f360e88299285bae6bb6ac11db80ec5ac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Sat, 13 Apr 2013 17:14:06 +0200 Subject: [PATCH 34/35] Revert "Revert "Added missing translation"" This reverts commit 85866ff9a645a7125b947bd4bda312f72b3c03b3. --- htdocs/langs/en_US/bills.lang | 1 + htdocs/langs/es_ES/bills.lang | 1 + htdocs/langs/fr_FR/bills.lang | 1 + 3 files changed, 3 insertions(+) diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 78179acd8c9..c6c4aabf708 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -189,6 +189,7 @@ Abandoned=Abandoned RemainderToPay=Remainder to pay RemainderToTake=Remainder to take RemainderToPayBack=Remainder to pay back +Rest=Pending AmountExpected=Amount claimed ExcessReceived=Excess received EscompteOffered=Discount offered (payment before term) diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang index e72c4637fd4..21b61974c6a 100644 --- a/htdocs/langs/es_ES/bills.lang +++ b/htdocs/langs/es_ES/bills.lang @@ -184,6 +184,7 @@ Abandoned=Abandonada RemainderToPay=Queda por pagar RemainderToTake=Queda por cobrar RemainderToPayBack=Queda por reembolsar +Rest=Pendiente AmountExpected=Importe reclamado ExcessReceived=Recibido en exceso EscompteOffered=Descuento (Pronto pago) diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index 237dcedda8b..02789aa3402 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -184,6 +184,7 @@ Abandoned=Abandonné RemainderToPay=Reste à payer RemainderToTake=Reste à encaisser RemainderToPayBack=Reste à rembourser +Rest=Créance AmountExpected=Montant réclamé ExcessReceived=Trop perçu EscompteOffered=Escompte (règlement avant échéance) From 7c4b901b0a7098e74e487fa3837f3d2310723fcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Sat, 13 Apr 2013 17:45:41 +0200 Subject: [PATCH 35/35] Improved es_ES translations and replaced missing translation --- htdocs/compta/facture.php | 2 +- htdocs/langs/es_ES/bills.lang | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 66d78e66b9a..32505622a85 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -2789,7 +2789,7 @@ else if ($id > 0 || ! empty($ref)) if (($object->statut == 2 || $object->statut == 3) && $object->close_code == 'discount_vat') { print ''; $resteapayeraffiche=0; } diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang index 21b61974c6a..2ac03e256db 100644 --- a/htdocs/langs/es_ES/bills.lang +++ b/htdocs/langs/es_ES/bills.lang @@ -103,17 +103,17 @@ BillStatusValidated=Validada (a pagar) BillStatusStarted=Pagada parcialmente BillStatusNotPaid=Pendiente de pago BillStatusClosedUnpaid=Cerrada (pendiente de pago) -BillStatusClosedPaidPartially=Pagada (parcialmente) +BillStatusClosedPaidPartially=Cerrada (pagada parcialmente) BillShortStatusDraft=Borrador BillShortStatusPaid=Pagada BillShortStatusPaidBackOrConverted=Procesada BillShortStatusConverted=Tratada BillShortStatusCanceled=Abandonada BillShortStatusValidated=Validada -BillShortStatusStarted=Empezada -BillShortStatusNotPaid=Pendiente de cobro -BillShortStatusClosedUnpaid=Cerrada -BillShortStatusClosedPaidPartially=Pagada +BillShortStatusStarted=Pago parcial +BillShortStatusNotPaid=Pte. pago +BillShortStatusClosedUnpaid=Cerrada (pte. pago) +BillShortStatusClosedPaidPartially=Cerrada (pago parcial) PaymentStatusToValidShort=A validar ErrorVATIntraNotConfigured=Número de IVA intracomunitario aún no configurado ErrorNoPaiementModeConfigured=No hay definido modo de pago por defecto. Corregir desde el módulo factura
'.$langs->trans($newclassname).''.$objectsrc->getNomUrl(1).'
'.$langs->trans('TotalHT').''.price($objectsrc->total_ht).'
'.$langs->trans('TotalVAT').''.price($objectsrc->total_tva)."
'.$langs->trans('PriceUHT').''.$langs->trans('PriceUTTC').''.$langs->trans('Qty').''.$langs->trans('Discount').''.$langs->trans('ReductionShort').''.$langs->trans('TotalHTShort').''.$langs->trans('TotalTTCShort').' '.$langs->trans('PriceUHT').''.$langs->trans('PriceUTTC').''.$langs->trans('Qty').' '.$langs->trans('ReductionShort').'   '.$langs->trans('Qty').' '.$langs->trans('ReductionShort').'  
".$langs->trans("VAT")."".($mt<0?price(-$mt):'')."".($mt>=0?price($mt):'')."
".$conf->global->COMPTA_JOURNAL_SELL."".$val["date"]."".$invoicestatic->getNomUrl(1)."".$k; + print "".$langs->transcountrynoentities("LT1",$mysoc->country_code)."".($mt<0?price(-$mt):'')."".($mt>=0?price($mt):'')."
".$conf->global->COMPTA_JOURNAL_SELL."".$val["date"]."".$invoicestatic->getNomUrl(1)."".$k; + print "".$langs->transcountrynoentities("LT2",$mysoc->country_code)."".($mt<0?price(-$mt):'')."".($mt>=0?price($mt):'')."
".$conf->global->COMPTA_JOURNAL_BUY."".$val["date"]."".$invoicestatic->getNomUrl(1)."".$k."".$langs->trans("VAT")." ".$key."".$k."".$langs->trans("VAT")."'.($mt>=0?price($mt):'')."'.($mt<0?price(-$mt):'')."
".$conf->global->COMPTA_JOURNAL_BUY."".$val["date"]."".$invoicestatic->getNomUrl(1)."".$k."".$langs->transcountrynoentities("LT1",$mysoc->country_code)."".($mt>=0?price($mt):'')."".($mt<0?price(-$mt):'')."
".$conf->global->COMPTA_JOURNAL_BUY."".$val["date"]."".$invoicestatic->getNomUrl(1)."".$k."".$langs->transcountrynoentities("LT2",$mysoc->country_code)."".($mt>=0?price($mt):'')."".($mt<0?price(-$mt):'')."
".$conf->global->COMPTA_JOURNAL_BUY."
'; - print $form->textwithpicto($langs->trans("Escompte").':',$langs->trans("HelpEscompte"),-1); + print $form->textwithpicto($langs->trans("Discount").':',$langs->trans("HelpEscompte"),-1); print ''.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye).'