From 6b031616fae895799cfac055fe0385409e1fe7ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Sun, 14 Apr 2013 12:34:10 +0200 Subject: [PATCH 01/36] Improved margins es_ES translation --- htdocs/langs/es_ES/margins.lang | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/langs/es_ES/margins.lang b/htdocs/langs/es_ES/margins.lang index 9dd68991ae7..b4614596ae6 100644 --- a/htdocs/langs/es_ES/margins.lang +++ b/htdocs/langs/es_ES/margins.lang @@ -8,10 +8,10 @@ Margins=Márgenes TotalMargin=Margen total MarginOnProducts=Margen / Productos MarginOnServices=Margen / Servicios -MarginRate=Tasa de margen -MarkRate=Tasa de marca -DisplayMarginRates=Mostrar las tasas de margen -DisplayMarkRates=Mostrar las tasas de marca +MarginRate=Margen sobre coste +MarkRate=Margen sobre venta +DisplayMarginRates=Mostrar el margen sobre costes +DisplayMarkRates=Mostrar el margen sobre ventas InputPrice=Introducir un precio margin=Gestión de márgenes From 90b9e7c136c357fd85c57e9a3eee4a4fa310377f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Sun, 14 Apr 2013 13:06:13 +0200 Subject: [PATCH 02/36] Fixed bug #807: Margins modules with orders2invoice does not respect cost price Also, removed duplicated requires in orderstoinvoice.php --- htdocs/commande/orderstoinvoice.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php index a6b2fe44a1f..5fdfaa59201 100755 --- a/htdocs/commande/orderstoinvoice.php +++ b/htdocs/commande/orderstoinvoice.php @@ -28,9 +28,9 @@ */ require '../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php'; @@ -84,17 +84,12 @@ if ($action == 'create') if (($action == 'create' || $action == 'add') && empty($mesgs)) { - require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; - require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php'; - require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'; - require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; if (! empty($conf->projet->enabled)) { require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; - require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; } $langs->load('bills'); $langs->load('products'); @@ -287,7 +282,9 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) $lines[$i]->special_code, $object->origin, $lines[$i]->rowid, - $fk_parent_line + $fk_parent_line, + $lines[$i]->fk_fournprice, + $lines[$i]->pa_ht ); if ($result > 0) { From b6ce386513b8d6bfca758183a20a08fa3749500c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Sun, 14 Apr 2013 13:07:05 +0200 Subject: [PATCH 03/36] Converted indentation to tabs --- htdocs/commande/orderstoinvoice.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php index 5fdfaa59201..42a39dd9fa8 100755 --- a/htdocs/commande/orderstoinvoice.php +++ b/htdocs/commande/orderstoinvoice.php @@ -284,7 +284,7 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) $lines[$i]->rowid, $fk_parent_line, $lines[$i]->fk_fournprice, - $lines[$i]->pa_ht + $lines[$i]->pa_ht ); if ($result > 0) { From 0e34df43b1f0c944d44efb168d0e92b4857330c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Sun, 14 Apr 2013 13:09:00 +0200 Subject: [PATCH 04/36] Updated changelog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 74522e7b7c8..b410a03df2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ English Dolibarr ChangeLog - Fix: [ bug #774 ] Bug on creating event with box "all day" crossed - Fix: [ bug #817 ] Purchases journal does not reflect localtaxes - Fix: [ bug #816 ] Sales journal does not reflect localtaxes +- Fix: [ bug #806 ] Margins module with orders2invoice does not respect cost price - Fix: Orderstoinvoice didn't act as expected when no order was checked From e27e5e9c44bd25bc32c3c59d15080b862a4f3902 Mon Sep 17 00:00:00 2001 From: simnandez Date: Sun, 14 Apr 2013 13:53:48 +0200 Subject: [PATCH 05/36] Improved margins ca_ES translation --- htdocs/langs/ca_ES/margins.lang | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/langs/ca_ES/margins.lang b/htdocs/langs/ca_ES/margins.lang index 62bb253a587..8a0763f5214 100644 --- a/htdocs/langs/ca_ES/margins.lang +++ b/htdocs/langs/ca_ES/margins.lang @@ -8,10 +8,10 @@ Margins=Marges TotalMargin=Marge total MarginOnProducts=Marge / Productes MarginOnServices=Marge / Serveis -MarginRate=Taxa de marge -MarkRate=Taxa de marca -DisplayMarginRates=Mostrar les taxes de marge -DisplayMarkRates=Mostrar les taxes de marca +MarginRate=Marge sobre cost +MarkRate=Marge sobre venda +DisplayMarginRates=Mostrar els marges sobre cost +DisplayMarkRates=Mostrar els marges sobre venda InputPrice=Introduir un preu margin=Gestió de marges From deaa63960ed7bd376c3295cca168c455fe6bcea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Mon, 15 Apr 2013 00:18:08 +0200 Subject: [PATCH 06/36] Improved es_ES holidays translations --- htdocs/holiday/define_holiday.php | 2 +- htdocs/holiday/index.php | 2 +- htdocs/holiday/month_report.php | 2 +- htdocs/holiday/view_log.php | 4 ++-- htdocs/langs/es_ES/agenda.lang | 1 + htdocs/langs/es_ES/holiday.lang | 20 +++++++++++--------- htdocs/langs/es_ES/main.lang | 4 ++-- 7 files changed, 19 insertions(+), 16 deletions(-) diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php index 586ae4db258..a4fcfe98201 100644 --- a/htdocs/holiday/define_holiday.php +++ b/htdocs/holiday/define_holiday.php @@ -137,7 +137,7 @@ print '
'."\n"; print ''; print ''; print ""; -print ''; +print ''; print ''; print ''; print ''; diff --git a/htdocs/holiday/index.php b/htdocs/holiday/index.php index a3ebf0f1c1c..91d3622eb9d 100644 --- a/htdocs/holiday/index.php +++ b/htdocs/holiday/index.php @@ -248,7 +248,7 @@ print_liste_field_titre($langs->trans("ValidatorCP"),$_SERVER["PHP_SELF"],"cp.fk print_liste_field_titre($langs->trans("DateDebCP"),$_SERVER["PHP_SELF"],"cp.date_debut","",'','align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateFinCP"),$_SERVER["PHP_SELF"],"cp.date_fin","",'','align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Duration")); -print_liste_field_titre($langs->trans("Statut"),$_SERVER["PHP_SELF"],"cp.statut","",'','align="center"',$sortfield,$sortorder); +print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"cp.statut","",'','align="center"',$sortfield,$sortorder); print "\n"; // FILTRES diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php index 238b9f70a10..38604e8fa2b 100644 --- a/htdocs/holiday/month_report.php +++ b/htdocs/holiday/month_report.php @@ -77,7 +77,7 @@ print '
'; print ''."\n"; -print 'Choix mois :  '; +print $langs->trans('Month').':  '; $htmlother->select_year($year,'year_start',1,10,3); print ''; diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php index ef750abb71a..29c58c4dec7 100644 --- a/htdocs/holiday/view_log.php +++ b/htdocs/holiday/view_log.php @@ -78,8 +78,8 @@ foreach($cp->logs as $logs_CP) print '
'; print ''; print ''; - print ''; - print ''; + print ''; + print ''; print ''."\n"; } diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang index 1b881cf96be..e0131db59fe 100644 --- a/htdocs/langs/es_ES/agenda.lang +++ b/htdocs/langs/es_ES/agenda.lang @@ -15,6 +15,7 @@ MyEvents=Mis eventos OtherEvents=Otros eventos ListOfActions=Listado de eventos EventOnFullDay=Evento para todo el día +Busy=Ocupado Location=Localización SearchAnAction=Buscar un evento/tarea MenuToDoActions=Eventos incompletos diff --git a/htdocs/langs/es_ES/holiday.lang b/htdocs/langs/es_ES/holiday.lang index 3183101f294..55e56fb9d0a 100644 --- a/htdocs/langs/es_ES/holiday.lang +++ b/htdocs/langs/es_ES/holiday.lang @@ -20,12 +20,12 @@ CancelCP=Anulada RefuseCP=Rechazada ValidatorCP=Validador ListeCP=Lista de vacaciones -ValidateByCP=Sera validada por +ValidateByCP=Será validada por DescCP=Descripción SendRequestCP=Enviar la petición de vacaciones DelayToRequestCP=Las peticiones de vacaciones deben realizarse al menos %s días antes. -MenuConfCP=Definir los vacaciones -UpdateAllCP=Actualizar los vacaciones +MenuConfCP=Definir las vacaciones +UpdateAllCP=Actualizar las vacaciones SoldeCPUser=Su saldo de vacaciones es de %s días. ErrorEndDateCP=Debe indicar una fecha de fin superior a la fecha de inicio. ErrorSQLCreateCP=Se ha producido un error de SQL durante la creación : @@ -68,12 +68,12 @@ ConfirmCancelCP=¿Está seguro de querer anular la petición de vacaciones? DetailRefusCP=Motivo del rechazo DateRefusCP=Fecha del rechazo DateCancelCP=Fecha de la anulación -DefineEventUserCP=Asignar vacación excepcional a un usuario -addEventToUserCP=Asignar esta vacación +DefineEventUserCP=Asignar permiso excepcional a un usuario +addEventToUserCP=Asignar este permiso MotifCP=Motivo UserCP=Usuario -ErrorAddEventToUserCP=Se ha producido un error en la asignación de la vacación excepcional. -AddEventToUserOkCP=Se ha añadido la vaciación excepcional. +ErrorAddEventToUserCP=Se ha producido un error en la asignación del permiso excepcional. +AddEventToUserOkCP=Se ha añadido el permiso excepcional. MenuLogCP=Ver los logs de vacaciones LogCP=Logs de actualizaciones de vacaciones ActionByCP=Realizado por @@ -86,6 +86,8 @@ UserName=Nombre Apellidos Employee=Empleado FirstDayOfHoliday=Primer día libre LastDayOfHoliday=Último día libre +Morning=Mañana +Afternoon=Tarde ## Configuration du Module ## ConfCP=Configuración del módulo Vacaciones @@ -98,8 +100,8 @@ UpdateConfCPOK=Actualización efectuada correctamente. ErrorUpdateConfCP=Se ha producido un error durante la actualización, vuélvalo a intentar. AddCPforUsers=Añada los saldos de vacaciones de los usuarios haciendo clic aquí. DelayForSubmitCP=La fecha límite para solicitar vacaciones -AlertValidatorDelayCP=Prevenir al validador si la petición no respeta el límite previsto -AlertValidorSoldeCP=Prevenir al validador si el usuario pide vacaciones superiores a su saldo +AlertValidatorDelayCP=Advertir al usuario validador si la petición no respeta el límite previsto +AlertValidorSoldeCP=Advertir al usuario validador si el usuario pide vacaciones superiores a su saldo nbUserCP=Número de usuarios tomados en cuenta en el módulo vacaciones nbHolidayDeductedCP=Número de días retribuidos a deducir por día de vacaciones nbHolidayEveryMonthCP=Número de vacaciones añadidas por mes diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang index dbafcb393b2..1d61bb709f5 100644 --- a/htdocs/langs/es_ES/main.lang +++ b/htdocs/langs/es_ES/main.lang @@ -498,8 +498,8 @@ Warning=Alerta Warnings=Alertas BuildPDF=Generar el PDF RebuildPDF=Regenerar el PDF -BuildDoc=Generar el doc -RebuildDoc=Regenerar el doc +BuildDoc=Generar el documento +RebuildDoc=Regenerar el documento Entity=Entidad Entities=Entidades EventLogs=Log From 6d896a8558a16a34b5ca3ed86e49d53a4107a5e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Mon, 15 Apr 2013 00:53:06 +0200 Subject: [PATCH 07/36] Improved holidays module translations --- htdocs/holiday/class/holiday.class.php | 4 +-- htdocs/holiday/define_holiday.php | 6 ++-- htdocs/holiday/fiche.php | 42 +++++++++++++------------- htdocs/langs/en_US/holiday.lang | 3 ++ htdocs/langs/es_ES/holiday.lang | 5 ++- htdocs/langs/fr_FR/holiday.lang | 3 ++ 6 files changed, 36 insertions(+), 27 deletions(-) diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php index 34b26421a08..924d6eb1c4e 100644 --- a/htdocs/holiday/class/holiday.class.php +++ b/htdocs/holiday/class/holiday.class.php @@ -859,7 +859,7 @@ class Holiday extends CommonObject */ function updateSoldeCP($userID='',$nbHoliday='') { - global $user; + global $user, $langs; if (empty($userID) && empty($nbHoliday)) { @@ -897,7 +897,7 @@ class Holiday extends CommonObject $new_solde = $now_holiday + $this->getConfCP('nbHolidayEveryMonth'); // On ajoute la modification dans le LOG - $this->addLogCP($user->id,$users[$i]['rowid'],'Event : Mise à jour mensuelle',$new_solde); + $this->addLogCP($user->id,$users[$i]['rowid'], $langs->trans('Event').': '.$langs->trans('HolidaysMonthlyAssignment'),$new_solde); $i++; } diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php index a4fcfe98201..3d43d8e375e 100644 --- a/htdocs/holiday/define_holiday.php +++ b/htdocs/holiday/define_holiday.php @@ -67,7 +67,7 @@ if ($action == 'update' && isset($_POST['update_cp'])) } // On ajoute la modification dans le LOG - $holiday->addLogCP($user->id,$userID,'Event : Manual update',$userValue); + $holiday->addLogCP($user->id,$userID, $langs->trans('Event').': '.$langs->trans('ManualUpdate'),$userValue); // Mise à jour des congés de l'utilisateur $holiday->updateSoldeCP($userID,$userValue); @@ -100,7 +100,7 @@ elseif($action == 'add_event') $new_holiday = $nb_holiday + $add_holiday; // On ajoute la modification dans le LOG - $holiday->addLogCP($user->id,$userCP,'Event : '.$holiday->getNameEventCp($event),$new_holiday); + $holiday->addLogCP($user->id,$userCP, $langs->trans('Event').': '.$holiday->getNameEventCp($event),$new_holiday); $holiday->updateSoldeCP($userCP,$new_holiday); @@ -158,7 +158,7 @@ foreach($listUsers as $users) print ''; print ''."\n"; + print ' '.$langs->trans('days').''."\n"; print ''."\n"; print ''; diff --git a/htdocs/holiday/fiche.php b/htdocs/holiday/fiche.php index e4ffc4007fb..e7626506dde 100644 --- a/htdocs/holiday/fiche.php +++ b/htdocs/holiday/fiche.php @@ -52,7 +52,7 @@ $now=dol_now(); // Si création de la demande if ($action == 'create') { - $cp = new Holiday($db); + $cp = new Holiday($db); // Si pas le droit de créer une demande if(!$user->rights->holiday->write) @@ -63,12 +63,12 @@ if ($action == 'create') $date_debut = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year')); $date_fin = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year')); - $starthalfday=GETPOST('starthalfday'); + $starthalfday=GETPOST('starthalfday'); $endhalfday=GETPOST('endhalfday'); $halfday=0; if ($starthalfday == 'afternoon' && $endhalfday == 'morning') $halfday=2; else if ($starthalfday == 'afternoon') $halfday=-1; - else if ($endhalfday == 'morning') $halfday=1; + else if ($endhalfday == 'morning') $halfday=1; $valideur = GETPOST('valideur'); $description = trim(GETPOST('description')); @@ -144,14 +144,14 @@ if ($action == 'create') if ($action == 'update') { - $date_debut = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year')); - $date_fin = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year')); - $starthalfday=GETPOST('starthalfday'); - $endhalfday=GETPOST('endhalfday'); - $halfday=0; - if ($starthalfday == 'afternoon' && $endhalfday == 'morning') $halfday=2; - else if ($starthalfday == 'afternoon') $halfday=-1; - else if ($endhalfday == 'morning') $halfday=1; + $date_debut = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year')); + $date_fin = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year')); + $starthalfday=GETPOST('starthalfday'); + $endhalfday=GETPOST('endhalfday'); + $halfday=0; + if ($starthalfday == 'afternoon' && $endhalfday == 'morning') $halfday=2; + else if ($starthalfday == 'afternoon') $halfday=-1; + else if ($endhalfday == 'morning') $halfday=1; // Si pas le droit de modifier une demande if(!$user->rights->holiday->write) @@ -375,7 +375,7 @@ if($action == 'confirm_valid') $newSolde = $soldeActuel - ($nbJour*$cp->getConfCP('nbHolidayDeducted')); // On ajoute la modification dans le LOG - $cp->addLogCP($userID,$cp->fk_user,'Event : '.$langs->transnoentitiesnoconv("Holiday"),$newSolde); + $cp->addLogCP($userID,$cp->fk_user, $langs->trans('Event').': '.$langs->transnoentitiesnoconv("Holidays"),$newSolde); // Mise à jour du solde $cp->updateSoldeCP($cp->fk_user,$newSolde); @@ -575,9 +575,9 @@ if ($action == 'confirm_cancel' && $_GET['confirm'] == 'yes') */ $form = new Form($db); -$cp = new Holiday($db); +$cp = new Holiday($db); -$listhalfday=array('morning'=>$langs->trans("Morning"),"afternoon"=>$langs->trans("Afternoon")); +$listhalfday=array('morning'=>$langs->trans("Morning"),"afternoon"=>$langs->trans("Afternoon")); llxHeader(array(),$langs->trans('CPTitreMenu')); @@ -859,12 +859,12 @@ else print ''; print ''; print ''; print ''; $starthalfday=($cp->halfday == -1 || $cp->halfday == 2)?'afternoon':'morning'; - $endhalfday=($cp->halfday == 1 || $cp->halfday == 2)?'morning':'afternoon'; + $endhalfday=($cp->halfday == 1 || $cp->halfday == 2)?'morning':'afternoon'; if(!$edit) { print ''; @@ -890,7 +890,7 @@ else print ''; print ''; print ''; print ''; @@ -1026,10 +1026,10 @@ else { print ''.$langs->trans("Validate").''; } - if($user->rights->holiday->delete && $cp->statut == 1) - { - print ''.$langs->trans("DeleteCP").''; - } + if($user->rights->holiday->delete && $cp->statut == 1) + { + print ''.$langs->trans("DeleteCP").''; + } // Si le statut est en attente de validation et que le valideur est connecté if ($userID == $cp->fk_validator && $cp->statut == 2) diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang index abf2b1dc514..67adb36dfeb 100755 --- a/htdocs/langs/en_US/holiday.lang +++ b/htdocs/langs/en_US/holiday.lang @@ -1,6 +1,7 @@ # Dolibarr language file - en_US - holiday CHARSET= UTF-8 +Holidays=Holidays CPTitreMenu=Holidays MenuReportMonth=Monthly statement MenuAddCP=Apply for holidays @@ -86,6 +87,8 @@ UserName=Name Employee=Employee FirstDayOfHoliday=First day of holiday LastDayOfHoliday=Last day of holiday +HolidaysMonthlyUpdate=Monthly update +ManualUpdate=Manual update ## Configuration du Module ## ConfCP=Configuration of holidays module diff --git a/htdocs/langs/es_ES/holiday.lang b/htdocs/langs/es_ES/holiday.lang index 55e56fb9d0a..ebf1a0457d9 100644 --- a/htdocs/langs/es_ES/holiday.lang +++ b/htdocs/langs/es_ES/holiday.lang @@ -1,6 +1,7 @@ # Dolibarr language file - es_ES - holiday CHARSET= UTF-8 +Holidays=Vacaciones CPTitreMenu=Vacaciones MenuReportMonth=Estado mensual MenuAddCP=Nueva petición @@ -88,6 +89,8 @@ FirstDayOfHoliday=Primer día libre LastDayOfHoliday=Último día libre Morning=Mañana Afternoon=Tarde +HolidaysMonthlyUpdate=Actualización mensual +ManualUpdate=Actualización manual ## Configuration du Module ## ConfCP=Configuración del módulo Vacaciones @@ -99,7 +102,7 @@ LastUpdateCP=Última actualización automática de vacaciones UpdateConfCPOK=Actualización efectuada correctamente. ErrorUpdateConfCP=Se ha producido un error durante la actualización, vuélvalo a intentar. AddCPforUsers=Añada los saldos de vacaciones de los usuarios haciendo clic aquí. -DelayForSubmitCP=La fecha límite para solicitar vacaciones +DelayForSubmitCP=Antelación mínima para solicitar vacaciones AlertValidatorDelayCP=Advertir al usuario validador si la petición no respeta el límite previsto AlertValidorSoldeCP=Advertir al usuario validador si el usuario pide vacaciones superiores a su saldo nbUserCP=Número de usuarios tomados en cuenta en el módulo vacaciones diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang index ad8ebd7fcf1..c01d84218bf 100644 --- a/htdocs/langs/fr_FR/holiday.lang +++ b/htdocs/langs/fr_FR/holiday.lang @@ -1,6 +1,7 @@ # Dolibarr language file - fr_FR - holiday CHARSET= UTF-8 +Holidays=Congés CPTitreMenu=Congés MenuReportMonth=Etat mensuel MenuAddCP=Nouvelle demande @@ -86,6 +87,8 @@ UserName=Nom Prénom Employee=Salarié FirstDayOfHoliday=Premier jour de congès LastDayOfHoliday=Dernier jour de congès +HolidaysMonthlyUpdate=Mise à jour mensuelle +ManualUpdate=Mise à jour manuelle ## Configuration du Module ## ConfCP=Configuration du module Congés From 76132206bf549bd0558fc3746eb361725303813a Mon Sep 17 00:00:00 2001 From: simnandez Date: Mon, 15 Apr 2013 17:12:31 +0200 Subject: [PATCH 08/36] Fix: Bad link to all proposals into Third party card if customer is prospect --- ChangeLog | 1 + htdocs/comm/prospect/fiche.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b410a03df2e..87ba9da878e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ English Dolibarr ChangeLog - Fix: [ bug #816 ] Sales journal does not reflect localtaxes - Fix: [ bug #806 ] Margins module with orders2invoice does not respect cost price - Fix: Orderstoinvoice didn't act as expected when no order was checked +- Fix: Bad link to all proposals into Third party card if customer is prospect diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php index 0e2467a3a75..e81862ec6f5 100644 --- a/htdocs/comm/prospect/fiche.php +++ b/htdocs/comm/prospect/fiche.php @@ -2,6 +2,7 @@ /* Copyright (C) 2001-2005 Rodolphe Quiedeville * Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2013 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 @@ -249,7 +250,7 @@ if ($socid > 0) { print '
User ID'.$langs->trans('ID').''.$langs->trans('UserName').''.$langs->trans('Available').''.$langs->trans('UpdateButtonCP').'
'.$user_action->getFullName($langs).''.$user_update->getFullName($langs).''.$logs_CP['type_action'].''.$logs_CP['prev_solde'].' jours'.$logs_CP['new_solde'].' jours'.$logs_CP['prev_solde'].' '.$langs->trans('days').''.$logs_CP['new_solde'].' '.$langs->trans('days').'
'; print ''; - print ' jours
'.$langs->trans("Ref").''; - print $form->showrefnav($cp, 'id', $linkback, 1, 'rowid', 'ref'); + print $form->showrefnav($cp, 'id', $linkback, 1, 'rowid', 'ref'); print '
'.$langs->trans('DateFinCP').' ('.$langs->trans("LastDayOfHoliday").')'.dol_print_date($cp->date_fin,'day'); - print '     '; + print '     '; print $langs->trans($listhalfday[$endhalfday]); print '
'; print ''; - print '
'; + print ''; print ''; From 21056d2b78bec5b04f719678a663629baa645051 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 15 Apr 2013 21:27:01 +0200 Subject: [PATCH 09/36] Fix: missing current entity record --- htdocs/compta/sociales/charges.php | 2 +- htdocs/compta/sociales/class/chargesociales.class.php | 7 +++++-- htdocs/compta/tva/class/tva.class.php | 4 ++-- htdocs/compta/tva/fiche.php | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php index 70065d7b7d2..2ec6539db9e 100644 --- a/htdocs/compta/sociales/charges.php +++ b/htdocs/compta/sociales/charges.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2005-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 diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php index 1f85a99916d..44779b8b0de 100644 --- a/htdocs/compta/sociales/class/chargesociales.class.php +++ b/htdocs/compta/sociales/class/chargesociales.class.php @@ -115,6 +115,8 @@ class ChargeSociales extends CommonObject */ function create($user) { + global $conf; + // Nettoyage parametres $newamount=price2num($this->amount,'MT'); @@ -127,10 +129,11 @@ class ChargeSociales extends CommonObject $this->db->begin(); - $sql = "INSERT INTO ".MAIN_DB_PREFIX."chargesociales (fk_type, libelle, date_ech, periode, amount)"; + $sql = "INSERT INTO ".MAIN_DB_PREFIX."chargesociales (fk_type, libelle, date_ech, periode, amount, entity)"; $sql.= " VALUES (".$this->type.",'".$this->db->escape($this->lib)."',"; $sql.= " '".$this->db->idate($this->date_ech)."','".$this->db->idate($this->periode)."',"; - $sql.= " ".price2num($newamount); + $sql.= " ".price2num($newamount)."',"; + $sql.= " ".$conf->entity; $sql.= ")"; dol_syslog(get_class($this)."::create sql=".$sql); diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php index ab393c12ba2..34dc0262c2e 100644 --- a/htdocs/compta/tva/class/tva.class.php +++ b/htdocs/compta/tva/class/tva.class.php @@ -500,13 +500,13 @@ class Tva extends CommonObject $sql = "INSERT INTO ".MAIN_DB_PREFIX."tva (datep, datev, amount"; if ($this->note) $sql.=", note"; if ($this->label) $sql.=", label"; - $sql.= ", fk_user_creat, fk_bank"; + $sql.= ", fk_user_creat, fk_bank, entity"; $sql.= ") "; $sql.= " VALUES ('".$this->db->idate($this->datep)."',"; $sql.= "'".$this->db->idate($this->datev)."'," . $this->amount; if ($this->note) $sql.=", '".$this->db->escape($this->note)."'"; if ($this->label) $sql.=", '".$this->db->escape($this->label)."'"; - $sql.=", '".$user->id."', NULL"; + $sql.=", '".$user->id."', NULL, ".$conf->entity; $sql.= ")"; dol_syslog("Tva::addPayment sql=".$sql); diff --git a/htdocs/compta/tva/fiche.php b/htdocs/compta/tva/fiche.php index 45dc91263ad..f7bb83e221b 100644 --- a/htdocs/compta/tva/fiche.php +++ b/htdocs/compta/tva/fiche.php @@ -1,7 +1,7 @@ * Copyright (C) 2004-2010 Laurent Destailleur - * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2005-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 From 7177e59ea4a0f3b1491956782bac930278ad8b5f Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 15 Apr 2013 21:40:49 +0200 Subject: [PATCH 10/36] Fix: missing quote --- htdocs/compta/sociales/class/chargesociales.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php index 44779b8b0de..6fbd0a23143 100644 --- a/htdocs/compta/sociales/class/chargesociales.class.php +++ b/htdocs/compta/sociales/class/chargesociales.class.php @@ -132,7 +132,7 @@ class ChargeSociales extends CommonObject $sql = "INSERT INTO ".MAIN_DB_PREFIX."chargesociales (fk_type, libelle, date_ech, periode, amount, entity)"; $sql.= " VALUES (".$this->type.",'".$this->db->escape($this->lib)."',"; $sql.= " '".$this->db->idate($this->date_ech)."','".$this->db->idate($this->periode)."',"; - $sql.= " ".price2num($newamount)."',"; + $sql.= " '".price2num($newamount)."',"; $sql.= " ".$conf->entity; $sql.= ")"; From 7d6c89169cd189ba1df0c09b924a632761695e2c Mon Sep 17 00:00:00 2001 From: fhenry Date: Mon, 15 Apr 2013 23:06:03 +0200 Subject: [PATCH 11/36] Fix [ bug #789 ] VAT not being calculated in POS --- htdocs/cashdesk/class/Facturation.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php index 3538a3908d1..292252c2716 100644 --- a/htdocs/cashdesk/class/Facturation.class.php +++ b/htdocs/cashdesk/class/Facturation.class.php @@ -118,7 +118,7 @@ class Facturation } // Define part of HT, VAT, TTC - $resultarray=calcul_price_total($this->qte,$this->prix(),$this->remisePercent(),$vat_rate,0,0,0,'HT',$product->type,0); + $resultarray=calcul_price_total($this->qte,$this->prix(),$this->remisePercent(),$vat_rate,0,0,0,'HT',0,$product->type,0); // Calcul du total ht sans remise $total_ht = $resultarray[0]; From 90a2a86dbb0597e8be39089ccd5eb2f7f0bdc57d Mon Sep 17 00:00:00 2001 From: simnandez Date: Tue, 16 Apr 2013 08:59:01 +0200 Subject: [PATCH 12/36] Update ChangeLog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 87ba9da878e..02a03be8896 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ English Dolibarr ChangeLog - Fix: [ bug #806 ] Margins module with orders2invoice does not respect cost price - Fix: Orderstoinvoice didn't act as expected when no order was checked - Fix: Bad link to all proposals into Third party card if customer is prospect +- Fix: [ bug #789 ] VAT not being calculated in POS From a5deb8e9d70b249cc445e47dff7bce7abd523508 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 16 Apr 2013 15:54:36 +0200 Subject: [PATCH 13/36] Fix: bug into is_erasable function. Conflicts: test/phpunit/NumberingModulesTest.php --- htdocs/compta/facture/class/facture.class.php | 11 ++- htdocs/core/lib/functions2.lib.php | 46 +++++------ test/phpunit/NumberingModulesTest.php | 81 +++++++++++-------- 3 files changed, 74 insertions(+), 64 deletions(-) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index cf7b89be7aa..2333802cc40 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1576,7 +1576,7 @@ class Facture extends CommonInvoice $now=dol_now(); $error=0; - dol_syslog(get_class($this).'::validate user='.$user->id.', force_number='.$force_number.', idwarehouse='.$idwarehouse, LOG_WARNING); + dol_syslog(get_class($this).'::validate user='.$user->id.', force_number='.$force_number.', idwarehouse='.$idwarehouse); // Check parameters if (! $this->brouillon) @@ -2554,11 +2554,10 @@ class Facture extends CommonInvoice { $maxfacnumber = $this->getNextNumRef($this->client,'last'); $ventilExportCompta = $this->getVentilExportCompta(); - // Si derniere facture et si non ventilee, on peut supprimer - if ($maxfacnumber == $this->ref && $ventilExportCompta == 0) - { - return 1; - } + // If there is no invoice into the reset range and not already dispatched, we can delete + if ($maxfacnumber == '' && $ventilExportCompta == 0) return 1; + // If invoice to delete is last one and not already dispatched, we can delete + if ($maxfacnumber == $this->ref && $ventilExportCompta == 0) return 1; } else if ($this->statut == 0 && $facref == 'PROV') // Si facture brouillon et provisoire { diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php index 40c52cbc200..63ad0667ca3 100644 --- a/htdocs/core/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -506,7 +506,7 @@ function array2table($data,$tableMarkup=1,$tableoptions='',$troptions='',$tdopti } /** - * Return next value for a mask + * Return last or next value for a mask (according to area we should not reset) * * @param DoliDB $db Database handler * @param string $mask Mask to use @@ -688,7 +688,6 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m $posnumstart=strpos($maskwithnocode,$maskcounter); // Pos of counter in final string (from 0 to ...) if ($posnumstart < 0) return 'ErrorBadMaskFailedToLocatePosOfSequence'; $sqlstring='SUBSTRING('.$field.', '.($posnumstart+1).', '.dol_strlen($maskcounter).')'; - //print "x".$sqlstring; // Define $maskLike $maskLike = dol_string_nospecial($mask); @@ -701,7 +700,6 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m $maskLike = preg_replace('/\{dd\}/i','__',$maskLike); $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'),str_pad("",dol_strlen($maskcounter),"_"),$maskLike); if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike); - //if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),str_pad("",dol_strlen($masktype),"_"),$maskLike); if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike); // Get counter in database @@ -715,7 +713,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m if ($sqlwhere) $sql.=' AND '.$sqlwhere; //print $sql.'
'; - dol_syslog("functions2::get_next_value sql=".$sql, LOG_DEBUG); + dol_syslog("functions2::get_next_value mode=".$mode." sql=".$sql, LOG_DEBUG); $resql=$db->query($sql); if ($resql) { @@ -725,30 +723,32 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m else dol_print_error($db); if (empty($counter) || preg_match('/[^0-9]/i',$counter)) $counter=$maskoffset; - if ($mode == 'last') + if ($mode == 'last') // We found value for counter = last counter value. Now need to get corresponding ref of invoice. { $counterpadded=str_pad($counter,dol_strlen($maskcounter),"0",STR_PAD_LEFT); - // Define $maskLike - $maskLike = dol_string_nospecial($mask); - $maskLike = str_replace("%","_",$maskLike); - // Replace protected special codes with matching number of _ as wild card caracter - $maskLike = preg_replace('/\{yyyy\}/i','____',$maskLike); - $maskLike = preg_replace('/\{yy\}/i','__',$maskLike); - $maskLike = preg_replace('/\{y\}/i','_',$maskLike); - $maskLike = preg_replace('/\{mm\}/i','__',$maskLike); - $maskLike = preg_replace('/\{dd\}/i','__',$maskLike); - $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'),$counterpadded,$maskLike); - if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike); - //if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),str_pad("",dol_strlen($masktype),"_"),$maskLike); - if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike); - + // Define $maskLike + $maskLike = dol_string_nospecial($mask); + $maskLike = str_replace("%","_",$maskLike); + // Replace protected special codes with matching number of _ as wild card caracter + $maskLike = preg_replace('/\{yyyy\}/i','____',$maskLike); + $maskLike = preg_replace('/\{yy\}/i','__',$maskLike); + $maskLike = preg_replace('/\{y\}/i','_',$maskLike); + $maskLike = preg_replace('/\{mm\}/i','__',$maskLike); + $maskLike = preg_replace('/\{dd\}/i','__',$maskLike); + $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'),$counterpadded,$maskLike); + if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike); + if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike); + $ref=''; - $sql = "SELECT facnumber as ref"; - $sql.= " FROM ".MAIN_DB_PREFIX."facture"; - $sql.= " WHERE facnumber LIKE '".$maskLike."'"; + $sql = "SELECT ".$field." as ref"; + $sql.= " FROM ".MAIN_DB_PREFIX.$table; + $sql.= " WHERE ".$field." LIKE '".$maskLike."'"; + $sql.= " AND ".$field." NOT LIKE '%PROV%'"; $sql.= " AND entity IN (".getEntity($table, 1).")"; - + if ($where) $sql.=$where; + if ($sqlwhere) $sql.=' AND '.$sqlwhere; + dol_syslog("functions2::get_next_value sql=".$sql); $resql=$db->query($sql); if ($resql) diff --git a/test/phpunit/NumberingModulesTest.php b/test/phpunit/NumberingModulesTest.php index 59d13c7606f..1f121d6c9e3 100644 --- a/test/phpunit/NumberingModulesTest.php +++ b/test/phpunit/NumberingModulesTest.php @@ -134,23 +134,25 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase $conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}-{0000}'; $conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}-{0000}'; - $localobject=new Facture($this->savdb); - $localobject->initAsSpecimen(); - $localobject->date=dol_mktime(12, 0, 0, 1, 1, 1915); // we use year 1915 to be sure to not have existing invoice for this year - $numbering=new mod_facture_mercure(); - $result=$numbering->getNextValue($mysoc, $localobject); - $result2=$localobject->create($user,1); - $result3=$localobject->validate($user, $result); - print __METHOD__." result=".$result."\n"; - $this->assertEquals('1915-0001', $result); // counter must start to 1 - - $localobject=new Facture($this->savdb); - $localobject->initAsSpecimen(); - $localobject->date=dol_mktime(12, 0, 0, 1, 1, 1916); // we use following year for second invoice - $numbering=new mod_facture_mercure(); - $result=$numbering->getNextValue($mysoc, $localobject); - print __METHOD__." result=".$result."\n"; - $this->assertEquals('1916-0002', $result); // counter must not be reset + $localobject=new Facture($this->savdb); + $localobject->initAsSpecimen(); + $localobject->date=dol_mktime(12, 0, 0, 1, 1, 1915); // we use year 1915 to be sure to not have existing invoice for this year + $numbering=new mod_facture_mercure(); + $result=$numbering->getNextValue($mysoc, $localobject); + $result2=$localobject->create($user,1); + $result3=$localobject->validate($user, $result); // create invoice by forcing ref + print __METHOD__." result=".$result."\n"; + $this->assertEquals('1915-0001', $result); // counter must start to 1 + + $localobject=new Facture($this->savdb); + $localobject->initAsSpecimen(); + $localobject->date=dol_mktime(12, 0, 0, 1, 1, 1916); // we use following year for second invoice (there is no reset into mask) + $numbering=new mod_facture_mercure(); + $result=$numbering->getNextValue($mysoc, $localobject, 'last'); + $this->assertEquals('1915-0001', $result); + $result=$numbering->getNextValue($mysoc, $localobject); + print __METHOD__." result=".$result."\n"; + $this->assertEquals('1916-0002', $result); // counter must not be reseted so be 2 // Now we try with a reset $conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}-{0000@1}'; @@ -162,7 +164,7 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase $numbering=new mod_facture_mercure(); $result=$numbering->getNextValue($mysoc, $localobject); print __METHOD__." result=".$result."\n"; - $this->assertEquals('1910-0001', $result); // counter must start to 1 + $this->assertEquals('1910-0001', $result); // counter must start to 1 // Same mask but we add month $conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@1}'; @@ -175,35 +177,44 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase $result2=$localobject->create($user,1); $result3=$localobject->validate($user, $result); print __METHOD__." result=".$result."\n"; - $this->assertEquals('192001-0001', $result); // counter must start to 1 + $this->assertEquals('192001-0001', $result); // counter must start to 1 $localobject=new Facture($this->savdb); $localobject->initAsSpecimen(); - $localobject->date=dol_mktime(12, 0, 0, 1, 1, 1921); // we use following year for second invoice + $localobject->date=dol_mktime(12, 0, 0, 1, 1, 1921); // we use following year for second invoice (and there is a reset required) $numbering=new mod_facture_mercure(); $result=$numbering->getNextValue($mysoc, $localobject); print __METHOD__." result=".$result."\n"; - $this->assertEquals('192101-0001', $result); // counter must be resete to 1 + $this->assertEquals('192101-0001', $result); // counter must be reseted to 1 // Now we try with a different fiscal month (forced by mask) - $conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@6}'; - $conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@6}'; - - $localobject=new Facture($this->savdb); - $localobject->initAsSpecimen(); - $localobject->date=dol_mktime(12, 0, 0, 1, 1, 1930); // we use year 1930 to be sure to not have existing invoice for this year - $numbering=new mod_facture_mercure(); - $result=$numbering->getNextValue($mysoc, $localobject); - $result2=$localobject->create($user,1); - $result3=$localobject->validate($user, $result); - print __METHOD__." result=".$result."\n"; - $this->assertEquals('193001-0001', $result); // counter must start to 1 - + $conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@6}'; + $conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@6}'; + + $localobject=new Facture($this->savdb); + $localobject->initAsSpecimen(); + $localobject->date=dol_mktime(12, 0, 0, 1, 1, 1930); // we use year 1930 to be sure to not have existing invoice for this year + $numbering=new mod_facture_mercure(); + $result=$numbering->getNextValue($mysoc, $localobject, 'last'); + print __METHOD__." result for last=".$result."\n"; + $this->assertEquals('', $result); // no existing ref into reset range + $result=$numbering->getNextValue($mysoc, $localobject); + $result2=$localobject->create($user,1); + $result3=$localobject->validate($user, $result); + print __METHOD__." result=".$result."\n"; + $this->assertEquals('193001-0001', $result); // counter must start to 1 + $result=$numbering->getNextValue($mysoc, $localobject, 'last'); + print __METHOD__." result for last=".$result."\n"; + $this->assertEquals('193001-0001', $result); // last ref into reset range should be same than last created + $localobject=new Facture($this->savdb); $localobject->initAsSpecimen(); $localobject->date=dol_mktime(12, 0, 0, 12, 1, 1930); // we use same year but fiscal month after $numbering=new mod_facture_mercure(); + $result=$numbering->getNextValue($mysoc, $localobject, 'last'); + print __METHOD__." result for last=".$result."\n"; + $this->assertEquals('', $result); // last ref into reset range should be '' $result=$numbering->getNextValue($mysoc, $localobject); $result2=$localobject->create($user,1); $result3=$localobject->validate($user, $result); @@ -408,4 +419,4 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase } } -?> \ No newline at end of file +?> From 3a474a22ca75472b5064832ff7ec8c15175b8252 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 16 Apr 2013 15:56:08 +0200 Subject: [PATCH 14/36] Qual: Include is_erasable() into test Conflicts: test/phpunit/NumberingModulesTest.php --- test/phpunit/NumberingModulesTest.php | 64 ++++++++++++++++++--------- 1 file changed, 44 insertions(+), 20 deletions(-) diff --git a/test/phpunit/NumberingModulesTest.php b/test/phpunit/NumberingModulesTest.php index 1f121d6c9e3..e9e6454a81a 100644 --- a/test/phpunit/NumberingModulesTest.php +++ b/test/phpunit/NumberingModulesTest.php @@ -131,6 +131,7 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase // First we try with a simple mask, with no reset // and we test counter is still increase second year. + $conf->global->FACTURE_ADDON='mercure'; $conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}-{0000}'; $conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}-{0000}'; @@ -143,17 +144,29 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase $result3=$localobject->validate($user, $result); // create invoice by forcing ref print __METHOD__." result=".$result."\n"; $this->assertEquals('1915-0001', $result); // counter must start to 1 - - $localobject=new Facture($this->savdb); - $localobject->initAsSpecimen(); - $localobject->date=dol_mktime(12, 0, 0, 1, 1, 1916); // we use following year for second invoice (there is no reset into mask) + $result=$localobject->is_erasable(); + print __METHOD__." is_erasable=".$result."\n"; + $this->assertEquals(1, $result); // Can be deleted + + $localobject2=new Facture($this->savdb); + $localobject2->initAsSpecimen(); + $localobject2->date=dol_mktime(12, 0, 0, 1, 1, 1916); // we use following year for second invoice (there is no reset into mask) $numbering=new mod_facture_mercure(); - $result=$numbering->getNextValue($mysoc, $localobject, 'last'); + $result=$numbering->getNextValue($mysoc, $localobject2, 'last'); + print __METHOD__." result=".$result."\n"; $this->assertEquals('1915-0001', $result); - $result=$numbering->getNextValue($mysoc, $localobject); + $result=$numbering->getNextValue($mysoc, $localobject2); + $result2=$localobject2->create($user,1); + $result3=$localobject2->validate($user, $result); // create invoice by forcing ref print __METHOD__." result=".$result."\n"; $this->assertEquals('1916-0002', $result); // counter must not be reseted so be 2 - + $result=$localobject2->is_erasable(); + print __METHOD__." is_erasable=".$result."\n"; + $this->assertEquals(1, $result); // Can be deleted + $result=$localobject->is_erasable(); + print __METHOD__." is_erasable=".$result."\n"; + $this->assertEquals(0, $result); // Case 1 can not be deleted (case 2 is more recent) + // Now we try with a reset $conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}-{0000@1}'; $conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}-{0000@1}'; @@ -178,15 +191,26 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase $result3=$localobject->validate($user, $result); print __METHOD__." result=".$result."\n"; $this->assertEquals('192001-0001', $result); // counter must start to 1 - - $localobject=new Facture($this->savdb); - $localobject->initAsSpecimen(); - $localobject->date=dol_mktime(12, 0, 0, 1, 1, 1921); // we use following year for second invoice (and there is a reset required) + $result=$localobject->is_erasable(); + print __METHOD__." is_erasable=".$result."\n"; + $this->assertEquals(1, $result); // Can be deleted + + $localobject2=new Facture($this->savdb); + $localobject2->initAsSpecimen(); + $localobject2->date=dol_mktime(12, 0, 0, 1, 1, 1921); // we use following year for second invoice (and there is a reset required) $numbering=new mod_facture_mercure(); - $result=$numbering->getNextValue($mysoc, $localobject); - print __METHOD__." result=".$result."\n"; + $result=$numbering->getNextValue($mysoc, $localobject2); + $result2=$localobject2->create($user,1); + $result3=$localobject2->validate($user, $result); + print __METHOD__." result=".$result."\n"; $this->assertEquals('192101-0001', $result); // counter must be reseted to 1 - + $result=$localobject2->is_erasable(); + print __METHOD__." is_erasable=".$result."\n"; + $this->assertEquals(1, $result); // Can be deleted + $result=$localobject->is_erasable(); + print __METHOD__." is_erasable=".$result."\n"; + $this->assertEquals(1, $result); // Case 1 can be deleted (because there was a reset for case 2) + // Now we try with a different fiscal month (forced by mask) $conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@6}'; @@ -231,12 +255,12 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase print __METHOD__." result=".$result."\n"; $this->assertEquals('193101-0002', $result); // counter must be 2 - $localobject=new Facture($this->savdb); - $localobject->initAsSpecimen(); - $localobject->date=dol_mktime(12, 0, 0, 12, 1, 1931); // we use different discal year but same year - $numbering=new mod_facture_mercure(); - $result=$numbering->getNextValue($mysoc, $localobject); - print __METHOD__." result=".$result."\n"; + $localobject=new Facture($this->savdb); + $localobject->initAsSpecimen(); + $localobject->date=dol_mktime(12, 0, 0, 12, 1, 1931); // we use different fiscal year but same year + $numbering=new mod_facture_mercure(); + $result=$numbering->getNextValue($mysoc, $localobject); + print __METHOD__." result=".$result."\n"; $this->assertEquals('193112-0001', $result); // counter must be reset to 1 From e2156b5df7e58f76c87d3b5628ca9f2c83176359 Mon Sep 17 00:00:00 2001 From: fhenry Date: Tue, 16 Apr 2013 16:00:23 +0200 Subject: [PATCH 15/36] Fix bug http://www.dolibarr.org/forum/527-bugs-on-a-stable-version/22542-table-prefix-bug --- htdocs/admin/dict.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 87e40d8645a..2e49d0f2859 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -139,7 +139,7 @@ $tabsql[6] = "SELECT a.id as rowid, a.code as code, a.libelle AS libelle, a.t $tabsql[7] = "SELECT a.id as rowid, a.code as code, a.libelle AS libelle, a.accountancy_code as accountancy_code, a.deductible, p.code as pays_code, p.libelle as pays, a.fk_pays as pays_id, a.active FROM ".MAIN_DB_PREFIX."c_chargesociales AS a, ".MAIN_DB_PREFIX."c_pays as p WHERE a.fk_pays=p.rowid and p.active=1"; $tabsql[8] = "SELECT id as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_typent"; $tabsql[9] = "SELECT code_iso as code, label as libelle, unicode, active FROM ".MAIN_DB_PREFIX."c_currencies"; -$tabsql[10]= "SELECT t.rowid, t.taux, t.localtax1_type, t.localtax1, t.localtax2_type, t.localtax2, p.libelle as pays, p.code as pays_code, t.fk_pays as pays_id, t.recuperableonly, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_tva as t, llx_c_pays as p WHERE t.fk_pays=p.rowid"; +$tabsql[10]= "SELECT t.rowid, t.taux, t.localtax1_type, t.localtax1, t.localtax2_type, t.localtax2, p.libelle as pays, p.code as pays_code, t.fk_pays as pays_id, t.recuperableonly, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p WHERE t.fk_pays=p.rowid"; $tabsql[11]= "SELECT t.rowid as rowid, element, source, code, libelle, active FROM ".MAIN_DB_PREFIX."c_type_contact AS t"; $tabsql[12]= "SELECT c.rowid as rowid, code, sortorder, c.libelle, c.libelle_facture, nbjour, fdm, decalage, active FROM ".MAIN_DB_PREFIX.'c_payment_term AS c'; $tabsql[13]= "SELECT id as rowid, code, c.libelle, type, active FROM ".MAIN_DB_PREFIX."c_paiement AS c"; From 7e3ca0ce16d544b9eef8571e653e2508cbcd23bb Mon Sep 17 00:00:00 2001 From: fhenry Date: Tue, 16 Apr 2013 16:02:13 +0200 Subject: [PATCH 16/36] Fix bug http://www.dolibarr.org/forum/527-bugs-on-a-stable-version/22542-table-prefix-bug#22548 --- htdocs/admin/dict.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 4df22736021..cf93f472019 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -139,7 +139,7 @@ $tabsql[6] = "SELECT a.id as rowid, a.code as code, a.libelle AS libelle, a.t $tabsql[7] = "SELECT a.id as rowid, a.code as code, a.libelle AS libelle, a.accountancy_code as accountancy_code, a.deductible, p.code as country_code, p.libelle as country, a.fk_pays as country_id, a.active FROM ".MAIN_DB_PREFIX."c_chargesociales AS a, ".MAIN_DB_PREFIX."c_pays as p WHERE a.fk_pays=p.rowid and p.active=1"; $tabsql[8] = "SELECT id as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_typent"; $tabsql[9] = "SELECT code_iso as code, label, unicode, active FROM ".MAIN_DB_PREFIX."c_currencies"; -$tabsql[10]= "SELECT t.rowid, t.taux, t.localtax1_type, t.localtax1, t.localtax2_type, t.localtax2, p.libelle as country, p.code as country_code, t.fk_pays as country_id, t.recuperableonly, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_tva as t, llx_c_pays as p WHERE t.fk_pays=p.rowid"; +$tabsql[10]= "SELECT t.rowid, t.taux, t.localtax1_type, t.localtax1, t.localtax2_type, t.localtax2, p.libelle as country, p.code as country_code, t.fk_pays as country_id, t.recuperableonly, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p WHERE t.fk_pays=p.rowid"; $tabsql[11]= "SELECT t.rowid as rowid, element, source, code, libelle, active FROM ".MAIN_DB_PREFIX."c_type_contact AS t"; $tabsql[12]= "SELECT c.rowid as rowid, code, sortorder, c.libelle, c.libelle_facture, nbjour, fdm, decalage, active FROM ".MAIN_DB_PREFIX.'c_payment_term AS c'; $tabsql[13]= "SELECT id as rowid, code, c.libelle, type, active FROM ".MAIN_DB_PREFIX."c_paiement AS c"; @@ -154,7 +154,7 @@ $tabsql[21]= "SELECT c.rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX $tabsql[22]= "SELECT rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_input_reason"; $tabsql[23]= "SELECT rowid as rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number as accountancy_code, account_parent, label, active FROM ".MAIN_DB_PREFIX."accountingaccount"; $tabsql[24]= "SELECT s.rowid as rowid, pcg_version, s.fk_pays as country_id, p.code as country_code, p.libelle as pays, s.label, s.active FROM ".MAIN_DB_PREFIX."accounting_system as s, ".MAIN_DB_PREFIX."c_pays as p WHERE s.fk_pays=p.rowid and p.active=1"; -$tabsql[25]= "SELECT t.rowid, t.taux, p.libelle as country, p.code as country_code, t.fk_pays as country_id, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_revenuestamp as t, llx_c_pays as p WHERE t.fk_pays=p.rowid"; +$tabsql[25]= "SELECT t.rowid, t.taux, p.libelle as country, p.code as country_code, t.fk_pays as country_id, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_revenuestamp as t, ".MAIN_DB_PREFIX."c_pays as p WHERE t.fk_pays=p.rowid"; // Critere de tri du dictionnaire $tabsqlsort=array(); From e7cec6d4100ce694f732bba655faa7e8d1b5667b Mon Sep 17 00:00:00 2001 From: fhenry Date: Wed, 17 Apr 2013 09:32:35 +0200 Subject: [PATCH 17/36] update change log --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 02a03be8896..3503347114a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ English Dolibarr ChangeLog - Fix: [ bug #736 ] Missing column in llx_c_chargesociales - Fix: Localtax2 for Spain must be based into buyer - Fix: [ bug #762 ] Bad profit calculation in Reporting +- Fix: bug dictionnary with wrong prefix table From 2bac3982bafdf053071f3142d902873bb4a78e46 Mon Sep 17 00:00:00 2001 From: fhenry Date: Wed, 17 Apr 2013 09:48:44 +0200 Subject: [PATCH 18/36] Update Changelog --- ChangeLog | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2ef52f1354a..6e132a280f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,18 @@ For users: - New: Add module Opensurvey. - New: Default aprrover for holidays i sby default hierchical parent. - First change to prepare feature "click to print" (IPP) for PDF. +- New: [ task #350 ] Merge tab customer and prospect +- New: [ task #710 ] Add substitution into mailing send (and HTML is now valid) +- New: [ task #711 ] Add combobox for contact as done for product/thirdparty +- New: [ task #714 ] In Emailing module admin autogenerate security key of READRECIEPT +- New: [ task #743 ] GED : Add aministration option to disabled autotree to display +- New: [ task #767 ] Customer Address fallback when a contact doesn't have an address +- New: [ task #768 ] WYSIWYG for all mail +- New: [ task #773 ] Add Project document in GED(ECM) modules +- New: [ task #783 ] Add checkbox and radio into extrafield feature +- New: [ task #798 ] Add range limit date on product/services as it is done on order and invoice +- New: [ task #814 ] Add extrafield feature into Project/project tasks module + For translators: - Update language files. @@ -59,6 +71,8 @@ For developers: - New: when adding an action, we can define a free code to tag it for a specific need. - New: Enhance Dolibarr migration process to include migration script of external modules. +- New: [ task #811 ] Uniformanize note field. + WARNING: If you used external modules, some of them may need to be upgraded due to: - Fields of classes were renamed to be normalized (nom, prenom, cp, ville, adresse, tel From 2b05cb3cea16d15fa24bff6c7bfd8ef8b4faeaf9 Mon Sep 17 00:00:00 2001 From: fhenry Date: Wed, 17 Apr 2013 09:52:30 +0200 Subject: [PATCH 19/36] Update changelog --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6e132a280f1..6e304944378 100644 --- a/ChangeLog +++ b/ChangeLog @@ -47,7 +47,7 @@ For users: - New: [ task #783 ] Add checkbox and radio into extrafield feature - New: [ task #798 ] Add range limit date on product/services as it is done on order and invoice - New: [ task #814 ] Add extrafield feature into Project/project tasks module - +- New: [ task #770 ] Add ODT document generation for Projects module For translators: - Update language files. From 03e57c229a20b20f0a70f5600e714704dac2d7da Mon Sep 17 00:00:00 2001 From: fhenry Date: Wed, 17 Apr 2013 10:00:12 +0200 Subject: [PATCH 20/36] Update changelog --- ChangeLog | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3503347114a..945bf875bfd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,7 +20,10 @@ English Dolibarr ChangeLog - Fix: Orderstoinvoice didn't act as expected when no order was checked - Fix: Bad link to all proposals into Third party card if customer is prospect - Fix: [ bug #789 ] VAT not being calculated in POS - +- Fix: [ bug #794 ] Lost filter on zipcode in prospect list +- Fix: [ bug #774 ] Bug on creating event with box "all day" crossed +- Fix: [ bug #810 ] Cannot update ODT template path +- Fix: [ bug #824 ] MAIN_DB_PREFIX not use into dictionnary ***** ChangeLog for 3.3.1 compared to 3.3 ***** From 4c13a4049c21efc8d5a2f5eebd1640fe1cedbb37 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 17 Apr 2013 10:41:54 +0200 Subject: [PATCH 21/36] Fix: use empty instead isset --- htdocs/compta/bank/releve.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index adbed8ea740..044b4b70ebc 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -1,7 +1,7 @@ * Copyright (C) 2004-2009 Laurent Destailleur - * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2005-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 @@ -85,7 +85,7 @@ if ($id > 0 || ! empty($ref)) $acct->fetch($id, $ref); } -if (! isset($num)) +if (empty($num)) { /* * Vue liste tous releves confondus From 5c50b1db57a64c05d0888b63181698b59176dcc9 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 17 Apr 2013 10:41:54 +0200 Subject: [PATCH 22/36] Fix: use empty instead isset --- htdocs/compta/bank/releve.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index f3603da2d6d..eb114400f52 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -1,7 +1,7 @@ * Copyright (C) 2004-2009 Laurent Destailleur - * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2005-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 @@ -84,7 +84,7 @@ if ($id > 0 || ! empty($ref)) $acct->fetch($id, $ref); } -if (! isset($num)) +if (empty($num)) { /* * Vue liste tous releves confondus From 4927aae891168610dc0c1ee26816f8c3278cd8e5 Mon Sep 17 00:00:00 2001 From: fhenry Date: Wed, 17 Apr 2013 16:20:01 +0200 Subject: [PATCH 23/36] [ task #741 ] Gestion des interventions/Add intervention box --- ChangeLog | 3 +- htdocs/core/boxes/box_ficheinter.php | 153 ++++++++++++++++++++ htdocs/core/modules/modFicheinter.class.php | 1 + htdocs/langs/en_US/boxes.lang | 2 + htdocs/langs/es_ES/boxes.lang | 2 + htdocs/langs/fr_FR/boxes.lang | 2 + 6 files changed, 162 insertions(+), 1 deletion(-) create mode 100644 htdocs/core/boxes/box_ficheinter.php diff --git a/ChangeLog b/ChangeLog index 6e304944378..da6bd6b1bfd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,7 +48,8 @@ For users: - New: [ task #798 ] Add range limit date on product/services as it is done on order and invoice - New: [ task #814 ] Add extrafield feature into Project/project tasks module - New: [ task #770 ] Add ODT document generation for Projects module - +- New: [ task #741 ] Add intervention box + For translators: - Update language files. diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php new file mode 100644 index 00000000000..78a81139654 --- /dev/null +++ b/htdocs/core/boxes/box_ficheinter.php @@ -0,0 +1,153 @@ + + * +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +*/ + +/** + * \file htdocs/core/boxes/box_intervention.php + * \ingroup ficheinter + * \brief Module de generation de l'affichage de la box ficheinter + */ + +include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; + + +/** + * Class to manage the box to show last contracts + */ +class box_ficheinter extends ModeleBoxes +{ + var $boxcode="ficheinter"; + var $boximg="object_intervention"; + var $boxlabel="BoxFicheInter"; + var $depends = array("ficheinter"); // conf->contrat->enabled + + var $db; + var $param; + + var $info_box_head = array(); + var $info_box_contents = array(); + + + /** + * Load data for box to show them later + * + * @param int $max Maximum number of records to load + * @return void + */ + function loadBox($max=10) + { + global $user, $langs, $db, $conf; + + $this->max=$max; + + include_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'; + $ficheinterstatic=new Fichinter($db); + + $this->info_box_head = array('text' => $langs->trans("BoxTitleLastFicheInter",$max)); + + if ($user->rights->ficheinter->lire) + { + $sql = "SELECT f.rowid, f.ref, f.fk_soc, f.fk_statut,"; + $sql.= " f.datec,"; + $sql.= " f.date_valid as datev,"; + $sql.= " f.tms as datem,"; + $sql.= " s.nom, s.rowid as socid, s.client"; + $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; + if (! $user->rights->societe->client->voir) + $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; + $sql.= ", ".MAIN_DB_PREFIX."fichinter as f"; + $sql.= " WHERE f.fk_soc = s.rowid "; + $sql.= " AND f.entity = ".$conf->entity; + if (! $user->rights->societe->client->voir) + $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; + $sql.= " ORDER BY f.tms DESC"; + $sql.= $db->plimit($max, 0); + + dol_syslog(get_class($this).'::loadBox sql='.$sql,LOG_DEBUG); + $resql = $db->query($sql); + if ($resql) + { + $num = $db->num_rows($resql); + $now=dol_now(); + + $i = 0; + + while ($i < $num) + { + $objp = $db->fetch_object($resql); + $datec=$db->jdate($objp->datec); + + $ficheinterstatic->statut=$objp->fk_statut; + $ficheinterstatic->id=$objp->rowid; + + $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"', + 'logo' => $this->boximg, + 'url' => DOL_URL_ROOT."/ficheinter/fiche.php?id=".$objp->rowid); + + $this->info_box_contents[$i][1] = array('td' => 'align="left"', + 'text' => ($objp->ref?$objp->ref:$objp->rowid), // Some contracts have no ref + 'url' => DOL_URL_ROOT."/contrat/fiche.php?id=".$objp->rowid); + + $this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"', + 'logo' => 'company', + 'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid); + + $this->info_box_contents[$i][3] = array('td' => 'align="left"', + 'text' => dol_trunc($objp->nom,40), + 'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid); + + $this->info_box_contents[$i][4] = array('td' => 'align="right"', + 'text' => dol_print_date($datec,'day')); + + $this->info_box_contents[$i][5] = array('td' => 'align="right" nowrap="nowrap"', + 'text' => $ficheinterstatic->getLibStatut(6), + 'asis'=>1 + ); + + $i++; + } + + if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedContracts")); + } + else + { + $this->info_box_contents[0][0] = array( 'td' => 'align="left"', + 'maxlength'=>500, + 'text' => ($db->error().' sql='.$sql)); + } + } + else + { + $this->info_box_contents[0][0] = array('td' => 'align="left"', + 'text' => $langs->trans("ReadPermissionNotAllowed")); + } + } + + /** + * Method to show box + * + * @param array $head Array with properties of box title + * @param array $contents Array with properties of box lines + * @return void + */ + function showBox($head = null, $contents = null) + { + parent::showBox($this->info_box_head, $this->info_box_contents); + } + +} + +?> diff --git a/htdocs/core/modules/modFicheinter.class.php b/htdocs/core/modules/modFicheinter.class.php index 96c0b6b012a..52a90179b95 100644 --- a/htdocs/core/modules/modFicheinter.class.php +++ b/htdocs/core/modules/modFicheinter.class.php @@ -89,6 +89,7 @@ class modFicheinter extends DolibarrModules // Boites $this->boxes = array(); + $this->boxes[0][1] = "box_ficheinter.php"; // Permissions $this->rights = array(); diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang index e7a56618f88..18c6d541505 100644 --- a/htdocs/langs/en_US/boxes.lang +++ b/htdocs/langs/en_US/boxes.lang @@ -18,6 +18,7 @@ BoxLastActions=Last actions BoxLastContracts=Last contracts BoxLastContacts=Last contacts/addresses BoxLastMembers=Last members +BoxFicheInter=Last interventions BoxCurrentAccounts=Current accounts balance BoxSalesTurnover=Sales turnover BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices @@ -40,6 +41,7 @@ BoxTitleLastProspects=Last %s recorded prospects BoxTitleLastModifiedProspects=Last %s modified prospects BoxTitleLastProductsInContract=Last %s products/services in a contract BoxTitleLastModifiedMembers=Last %s modified members +BoxTitleLastFicheInter=Last %s modified intervention BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer's invoices BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier's invoices BoxTitleCurrentAccounts=Current account's balances diff --git a/htdocs/langs/es_ES/boxes.lang b/htdocs/langs/es_ES/boxes.lang index 72c4363ebe5..8ba90fe75e4 100644 --- a/htdocs/langs/es_ES/boxes.lang +++ b/htdocs/langs/es_ES/boxes.lang @@ -18,6 +18,7 @@ BoxLastActions=Últimos eventos BoxLastContracts=Últimos contratos BoxLastContacts=Últimos contactos/direcciones BoxLastMembers=Últimos miembros modificados +BoxFicheInter=Últimos intervenciones modificados BoxCurrentAccounts=Saldos cuentas corrientes BoxSalesTurnover=Volumen de ventas BoxTotalUnpaidCustomerBills=Total facturas a clientes pendientes de pago @@ -47,6 +48,7 @@ BoxTitleTotalUnpaidCustomerBills=Pendiente de clientes BoxTitleTotalUnpaidSuppliersBills=Pendiente a proveedores BoxTitleLastModifiedContacts=Los %s últimos contactos/direcciones modificadas BoxTitleLastModifiedMembers=Los %s últimos miembros modificados +BoxTitleLastFicheInter=Los %s últimos intervenciones modificados BoxMyLastBookmarks=Mis %s últimos marcadores BoxOldestExpiredServices=Servicios antiguos expirados BoxLastExpiredServices=Los %s contratos más antiguos con servicios activos expirados diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang index 61ef3d2ab52..cd61aa64d93 100644 --- a/htdocs/langs/fr_FR/boxes.lang +++ b/htdocs/langs/fr_FR/boxes.lang @@ -18,6 +18,7 @@ BoxLastActions=Derniers événements BoxLastContracts=Derniers contrats BoxLastContacts=Derniers contacts/adresses BoxLastMembers=Derniers adhérents modifiés +BoxFicheInter=Dernières fiche d'intervention modifiée BoxCurrentAccounts=Soldes Comptes courants BoxSalesTurnover=Chiffre d'affaires BoxTotalUnpaidCustomerBills=Total des factures clients impayées @@ -47,6 +48,7 @@ BoxTitleTotalUnpaidCustomerBills=Impayés clients BoxTitleTotalUnpaidSuppliersBills=Impayés fournisseurs BoxTitleLastModifiedContacts=Les %s derniers contacts/adresses modifiés BoxTitleLastModifiedMembers=Les %s derniers adhérents modifiés +BoxTitleLastFicheInter=Les %s dernières fiche d'intervention modifiée BoxMyLastBookmarks=Mes %s derniers marque-pages BoxOldestExpiredServices=Plus anciens services expirés BoxLastExpiredServices=Les %s plus anciens contrats avec services actifs expirés From bcacbab48155bd172bee62bccb58c1f3321e3960 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 17 Apr 2013 16:26:14 +0200 Subject: [PATCH 24/36] Qual: No need to use two menu entries for this. --- htdocs/core/modules/modCron.class.php | 17 +++-------------- htdocs/cron/class/cronjob.class.php | 8 +++----- htdocs/cron/list.php | 20 +++++++++++++++----- 3 files changed, 21 insertions(+), 24 deletions(-) diff --git a/htdocs/core/modules/modCron.class.php b/htdocs/core/modules/modCron.class.php index 7f17b07503e..2080767e00c 100644 --- a/htdocs/core/modules/modCron.class.php +++ b/htdocs/core/modules/modCron.class.php @@ -25,6 +25,7 @@ */ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; + /** * Class to describe a Cron module */ @@ -122,8 +123,8 @@ class modCron extends DolibarrModules $r=0; $this->menu[$r]=array( 'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=modulesadmintools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode 'type'=>'left', // This is a Left menu entry - 'titre'=>'CronListActive', - 'url'=>'/cron/list.php?status=1', + 'titre'=>'CronList', + 'url'=>'/cron/list.php?status=-1', 'langs'=>'cron', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. 'position'=>200, 'enabled'=>'$leftmenu==\'modulesadmintools\'', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. @@ -131,18 +132,6 @@ class modCron extends DolibarrModules 'target'=>'', 'user'=>2); // 0=Menu for internal users, 1=external users, 2=both $r++; - - $this->menu[$r]=array( 'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=modulesadmintools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode - 'type'=>'left', // This is a Left menu entry - 'titre'=>'CronListInactive', - 'url'=>'/cron/list.php?status=0', - 'langs'=>'cron', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. - 'position'=>201, - 'enabled'=>'$leftmenu==\'modulesadmintools\'', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. - 'perms'=>'$user->rights->cron->read', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules - 'target'=>'', - 'user'=>2); // 0=Menu for internal users, 1=external users, 2=both - $r++; } diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php index 60514e73942..454eb457517 100644 --- a/htdocs/cron/class/cronjob.class.php +++ b/htdocs/cron/class/cronjob.class.php @@ -393,10 +393,9 @@ class Cronjob extends CommonObject $sql.= " t.note,"; $sql.= " t.nbrun"; - $sql.= " FROM ".MAIN_DB_PREFIX."cronjob as t"; - $status = (empty($status))?'0':'1'; - $sql.= " WHERE t.status=".$status; + $sql.= " WHERE 1 = 1"; + if ($status >= 0) $sql.= " AND t.status = ".(empty($status)?'0':'1'); //Manage filter if (is_array($filter) && count($filter)>0) { foreach($filter as $key => $value) { @@ -404,7 +403,6 @@ class Cronjob extends CommonObject } } - $sql.= " ORDER BY $sortfield $sortorder "; if (!empty($limit) && !empty($offset)) { $sql.= $this->db->plimit($limit + 1,$offset); @@ -836,7 +834,7 @@ class Cronjob extends CommonObject $error=0; $now=dol_now(); - + $langs->load('cron'); if (empty($userlogin)) { diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index a78b037d68b..42b41d0ed4f 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -108,8 +108,9 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->ex $form = new Form($db); -if (!empty($status)) $pagetitle=$langs->trans("CronListActive"); -else $pagetitle=$langs->trans("CronListInactive"); +//if (! empty($status)) $pagetitle=$langs->trans("CronListActive"); +//else $pagetitle=$langs->trans("CronListInactive"); +$pagetitle=$langs->trans("CronList"); llxHeader('',$pagetitle); @@ -155,8 +156,8 @@ if (count($object->lines)>0) { print_liste_field_titre($langs->trans("CronNbRun"),$_SERVEUR['PHP_SELF'],"t.nbrun","",$arg_url,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("CronLastResult"),$_SERVEUR['PHP_SELF'],"t.lastresult","",$arg_url,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("CronLastOutput"),$_SERVEUR['PHP_SELF'],"t.lastoutput","",$arg_url,'',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Active"),$_SERVEUR['PHP_SELF'],"t.status","",$arg_url,'align="center"',$sortfield,$sortorder); print ''; - print ''; print ''."\n"; @@ -177,7 +178,11 @@ if (count($object->lines)>0) { print ''; print ''; print ''; - print ''; @@ -189,7 +194,8 @@ if (count($object->lines)>0) { // Boucler sur chaque job $style='impair'; - foreach($object->lines as $line){ + foreach($object->lines as $line) + { // title profil if ($style=='pair') {$style='impair';} else {$style='pair';} @@ -259,6 +265,10 @@ if (count($object->lines)>0) { print ''; print ''; + + print '
'.$langs->trans("LastPropals",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllPropals").' ('.$num.')'; print ''; print '
'.$langs->trans("LastPropals",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllPropals").' ('.$num.')'.img_picto($langs->trans("Statistics"),'stats').'
   '; + print ''; + print $form->selectarray('status', array('0'=>$langs->trans("No"),'1'=>$langs->trans("Yes")), GETPOST('status'), 1); + print ''; + print ' '; + print ''; print '  '; print ''; print ''; + print yn($line->status); + print ''; if ($user->rights->cron->delete) { print "id."&status=".$status."&action=delete\" title=\"".$langs->trans('CronDelete')."\">".img_delete()."  "; } else { From e505ce3e7d935e7d30decb31899c29d194145ae0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 17 Apr 2013 16:26:50 +0200 Subject: [PATCH 25/36] Update soap setup --- test/soapui/Dolibarr-soapui-project.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/soapui/Dolibarr-soapui-project.xml b/test/soapui/Dolibarr-soapui-project.xml index 12e54e1410c..48349dcf250 100755 --- a/test/soapui/Dolibarr-soapui-project.xml +++ b/test/soapui/Dolibarr-soapui-project.xml @@ -130,7 +130,7 @@ - + @@ -628,7 +628,7 @@ - + From c9074231b51fef50c595ad3f1366f87b8faaf876 Mon Sep 17 00:00:00 2001 From: simnandez Date: Wed, 17 Apr 2013 17:06:19 +0200 Subject: [PATCH 26/36] Fix: Spelling es_ES boxes lang Trad: Add ca_ES missing translations --- htdocs/langs/ca_ES/boxes.lang | 2 ++ htdocs/langs/es_ES/boxes.lang | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/langs/ca_ES/boxes.lang b/htdocs/langs/ca_ES/boxes.lang index c9630609526..029fcb2a189 100644 --- a/htdocs/langs/ca_ES/boxes.lang +++ b/htdocs/langs/ca_ES/boxes.lang @@ -18,6 +18,7 @@ BoxLastActions=Últims esdeveniments BoxLastContracts=Últims contractes BoxLastContacts=Últims contactes/adreçes BoxLastMembers=Últims membres modificats +BoxFicheInter=Últimes intervencions modificades BoxCurrentAccounts=Saldos comptes corrents BoxSalesTurnover=Volum de vendes BoxTotalUnpaidCustomerBills=Total factures a clients pendents de cobrament @@ -47,6 +48,7 @@ BoxTitleTotalUnpaidCustomerBills=Pendent de clients BoxTitleTotalUnpaidSuppliersBills=Pendent a proveïdors BoxTitleLastModifiedContacts=Els últims %s contactes/adreçes modificades BoxTitleLastModifiedMembers=Els %s últims membres modificats +BoxTitleLastFicheInter=Les %s últimes intervencions modificades BoxMyLastBookmarks=Els meus %s darrers marcadors BoxOldestExpiredServices=Serveis antics expirats BoxLastExpiredServices=Els %s contractes més antics amb serveis actius expirats diff --git a/htdocs/langs/es_ES/boxes.lang b/htdocs/langs/es_ES/boxes.lang index 8ba90fe75e4..728ae189826 100644 --- a/htdocs/langs/es_ES/boxes.lang +++ b/htdocs/langs/es_ES/boxes.lang @@ -18,7 +18,7 @@ BoxLastActions=Últimos eventos BoxLastContracts=Últimos contratos BoxLastContacts=Últimos contactos/direcciones BoxLastMembers=Últimos miembros modificados -BoxFicheInter=Últimos intervenciones modificados +BoxFicheInter=Últimas intervenciones modificadas BoxCurrentAccounts=Saldos cuentas corrientes BoxSalesTurnover=Volumen de ventas BoxTotalUnpaidCustomerBills=Total facturas a clientes pendientes de pago @@ -48,7 +48,7 @@ BoxTitleTotalUnpaidCustomerBills=Pendiente de clientes BoxTitleTotalUnpaidSuppliersBills=Pendiente a proveedores BoxTitleLastModifiedContacts=Los %s últimos contactos/direcciones modificadas BoxTitleLastModifiedMembers=Los %s últimos miembros modificados -BoxTitleLastFicheInter=Los %s últimos intervenciones modificados +BoxTitleLastFicheInter=Las %s últimas intervenciones modificadas BoxMyLastBookmarks=Mis %s últimos marcadores BoxOldestExpiredServices=Servicios antiguos expirados BoxLastExpiredServices=Los %s contratos más antiguos con servicios activos expirados From 52a0df34246c722bc357d1f431bb4f956d9b0fd9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 17 Apr 2013 20:13:42 +0200 Subject: [PATCH 27/36] Fix: Bad translation --- htdocs/langs/nb_NO/main.lang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang index 020639a5d90..203896ba362 100644 --- a/htdocs/langs/nb_NO/main.lang +++ b/htdocs/langs/nb_NO/main.lang @@ -535,8 +535,8 @@ Login=Innlogging Month01=januar Month02=februar Month03=mars -Month04=April -Month05=kan +Month04=april +Month05=mai Month06=juni Month07=juli Month08=August From 1381373c95250e161ff569c6469490b544572b13 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Thu, 18 Apr 2013 09:24:29 +0200 Subject: [PATCH 28/36] Fix : set emetteur to MYCOMPANY when payment is a customer --- htdocs/compta/paiement.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 4a8f93a52f6..232126d68e2 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -286,7 +286,8 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie $(\'.fieldrequireddyn\').addClass(\'fieldrequired\'); if ($(\'#fieldchqemetteur\').val() == \'\') { - $(\'#fieldchqemetteur\').val(jQuery(\'#thirdpartylabel\').val()); + var emetteur = ('.$facture->type.' == 2) ? \''.dol_escape_htmltag(MAIN_INFO_SOCIETE_NOM).'\' : jQuery(\'#thirdpartylabel\').val(); + $(\'#fieldchqemetteur\').val(emetteur); } } else From dcdbdd42fbe52a1c9bb74ae814a66f3ce70cb7b6 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Thu, 18 Apr 2013 09:25:19 +0200 Subject: [PATCH 29/36] Fix : action list couldn't be sorted by label, action type was kept in filter --- htdocs/comm/action/listactions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index b603792b957..7a5dbfdaff9 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -182,7 +182,7 @@ if ($filtera > 0 || $filtert > 0 || $filterd > 0) } $sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($limit + 1, $offset); -//print $sql; +print $sql; dol_syslog("comm/action/listactions.php sql=".$sql); $resql=$db->query($sql); @@ -238,7 +238,7 @@ if ($resql) $i = 0; print ''; print ''; - print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"acode",$param,"","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"a.label",$param,"","",$sortfield,$sortorder); //print_liste_field_titre($langs->trans("Title"),$_SERVER["PHP_SELF"],"a.label",$param,"","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateStart"),$_SERVER["PHP_SELF"],"a.datep",$param,'','align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateEnd"),$_SERVER["PHP_SELF"],"a.datep2",$param,'','align="center"',$sortfield,$sortorder); From 2538a9e20e0888832d3300b71801c9ff5cc537a7 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 18 Apr 2013 09:39:43 +0200 Subject: [PATCH 30/36] Fix: duplicate sql request --- htdocs/install/mysql/migration/3.3.0-3.4.0.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql index e8c1da2aa4f..4bc303e932d 100755 --- a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql +++ b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql @@ -266,7 +266,6 @@ ALTER TABLE llx_commande_extrafields ADD INDEX idx_commande_extrafields (fk_obje ALTER TABLE llx_socpeople ADD COLUMN note_public text after note; ALTER TABLE llx_societe ADD COLUMN note_public text after note; -ALTER TABLE llx_facture_fourn_det ADD COLUMN info_bits integer NOT NULL DEFAULT 0 after date_end; ALTER TABLE llx_actioncomm ADD COLUMN transparency integer after fk_user_action; INSERT INTO llx_c_action_trigger (rowid,code,label,description,elementtype,rang) VALUES (29,'FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',29); From b6bcffa4d9487a90997575bc6e405a671f2de1e1 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 18 Apr 2013 09:44:33 +0200 Subject: [PATCH 31/36] Fix: missing field --- .../install/mysql/migration/3.3.0-3.4.0.sql | 1 + .../tables/llx_product_fournisseur_price.sql | 26 +++++++++---------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql index 4bc303e932d..b8542349f5f 100755 --- a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql +++ b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql @@ -180,6 +180,7 @@ UPDATE llx_c_tva set localtax1=0, localtax1_type='0' where localtax1_type = '7'; UPDATE llx_c_tva set localtax2=0, localtax2_type='0' where localtax2_type = '7'; ALTER TABLE llx_facture_fourn_det ADD COLUMN info_bits integer NOT NULL DEFAULT 0 after date_end; +ALTER TABLE llx_product_fournisseur_price ADD COLUMN info_bits integer NOT NULL DEFAULT 0 after tva_tx; ALTER TABLE llx_actioncomm ADD COLUMN code varchar(32) NULL after fk_action; diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql index 2a26034c130..e48c3ce6f82 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql @@ -1,7 +1,7 @@ -- ============================================================================ -- Copyright (C) 2003 Rodolphe Quiedeville -- Copyright (C) 2009-2011 Laurent Destailleur --- Copyright (C) 2009-2012 Regis Houssin +-- Copyright (C) 2009-2013 Regis Houssin -- Copyright (C) 2012 Juanjo Menent -- -- This program is free software; you can redistribute it and/or modify @@ -21,23 +21,23 @@ create table llx_product_fournisseur_price ( - rowid integer AUTO_INCREMENT PRIMARY KEY, - entity integer DEFAULT 1 NOT NULL, -- multi company id - datec datetime, - tms timestamp, + rowid integer AUTO_INCREMENT PRIMARY KEY, + entity integer DEFAULT 1 NOT NULL, -- multi company id + datec datetime, + tms timestamp, fk_product integer, - fk_soc integer, + fk_soc integer, ref_fourn varchar(30), - fk_availability integer, - price double(24,8) DEFAULT 0, + fk_availability integer, + price double(24,8) DEFAULT 0, quantity double, - remise_percent double NOT NULL DEFAULT 0, + remise_percent double NOT NULL DEFAULT 0, remise double NOT NULL DEFAULT 0, unitprice double(24,8) DEFAULT 0, - charges double(24,8) DEFAULT 0, + charges double(24,8) DEFAULT 0, unitcharges double(24,8) DEFAULT 0, - tva_tx double(6,3) NOT NULL, + tva_tx double(6,3) NOT NULL, info_bits integer NOT NULL DEFAULT 0, - fk_user integer, - import_key varchar(14) -- Import key + fk_user integer, + import_key varchar(14) -- Import key )ENGINE=innodb; From 6c62d0cd283fffcb819346217046682b75faae80 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Thu, 18 Apr 2013 10:12:16 +0200 Subject: [PATCH 32/36] Print forgotten --- htdocs/comm/action/listactions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index 7a5dbfdaff9..9e7a7a959bb 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -182,7 +182,7 @@ if ($filtera > 0 || $filtert > 0 || $filterd > 0) } $sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($limit + 1, $offset); -print $sql; +//print $sql; dol_syslog("comm/action/listactions.php sql=".$sql); $resql=$db->query($sql); From ebb09db710ba7b4d6f4f4fefa376d30e95d3bcd6 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 18 Apr 2013 11:05:31 +0200 Subject: [PATCH 33/36] Fix: for avoid errors --- htdocs/core/lib/functions.lib.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 7ea8087613e..46f65283a3e 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3105,12 +3105,16 @@ function get_default_npr($thirdparty_seller, $thirdparty_buyer, $idprod=0, $idpr if ($idprodfournprice > 0) { + if (! class_exists('ProductFournisseur')) + require DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php'; $prodprice = new ProductFournisseur($db); $prodprice->fetch_product_fournisseur_price($idprodfournprice); return $prodprice->fourn_tva_npr; } elseif ($idprod > 0) { + if (! class_exists('Product')) + require DOL_DOCUMENT_ROOT . '/product/class/product.class.php'; $prod = new Product($db); $prod->fetch($idprod); return $prod->tva_npr; From a880a8c51e0e124c37e821fe03133e73df7819fc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 18 Apr 2013 19:37:50 +0200 Subject: [PATCH 34/36] Qual: Work to prepare usage of jquery data plugins. --- htdocs/core/class/html.form.class.php | 10 +++++----- htdocs/core/datepicker.php | 6 +++--- htdocs/langs/ar_SA/main.lang | 5 ++++- htdocs/langs/bg_BG/main.lang | 3 +++ htdocs/langs/ca_ES/main.lang | 3 +++ htdocs/langs/da_DK/main.lang | 5 ++++- htdocs/langs/de_AT/main.lang | 2 ++ htdocs/langs/de_DE/main.lang | 3 +++ htdocs/langs/el_GR/main.lang | 5 ++++- htdocs/langs/en_AU/main.lang | 4 ++++ htdocs/langs/en_GB/main.lang | 4 ++++ htdocs/langs/en_IN/main.lang | 4 ++++ htdocs/langs/en_NZ/main.lang | 4 ++++ htdocs/langs/en_SA/main.lang | 3 +++ htdocs/langs/en_US/main.lang | 3 +++ htdocs/langs/es_ES/main.lang | 3 +++ htdocs/langs/es_HN/main.lang | 9 --------- htdocs/langs/es_PR/main.lang | 9 --------- htdocs/langs/et_EE/main.lang | 3 +++ htdocs/langs/fa_IR/main.lang | 4 ++++ htdocs/langs/fi_FI/main.lang | 5 ++++- htdocs/langs/fr_BE/main.lang | 4 ++++ htdocs/langs/fr_CA/main.lang | 4 ++++ htdocs/langs/fr_CH/main.lang | 4 ++++ htdocs/langs/fr_FR/main.lang | 7 +++++-- htdocs/langs/he_IL/main.lang | 5 ++++- htdocs/langs/hu_HU/main.lang | 5 ++++- htdocs/langs/is_IS/main.lang | 5 ++++- htdocs/langs/it_IT/main.lang | 13 ++++++++----- htdocs/langs/ja_JP/main.lang | 9 ++++++--- htdocs/langs/nb_NO/main.lang | 5 ++++- htdocs/langs/nl_BE/main.lang | 4 ++++ htdocs/langs/nl_NL/main.lang | 5 ++++- htdocs/langs/pl_PL/main.lang | 5 ++++- htdocs/langs/pt_PT/main.lang | 5 ++++- htdocs/langs/ro_RO/main.lang | 5 ++++- htdocs/langs/ru_RU/main.lang | 5 ++++- htdocs/langs/ru_UA/main.lang | 4 ++++ htdocs/langs/sl_SI/main.lang | 3 +++ htdocs/langs/sv_SE/main.lang | 5 ++++- htdocs/langs/tr_TR/main.lang | 3 +++ htdocs/langs/zh_CN/main.lang | 5 ++++- htdocs/langs/zh_TW/main.lang | 5 ++++- 43 files changed, 160 insertions(+), 52 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index ae60706f523..944f364ee4b 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -3333,7 +3333,7 @@ class Form if (strval($set_time) != '' && $set_time != -1) { //$formated_date=dol_print_date($set_time,$conf->format_date_short); - $formated_date=dol_print_date($set_time,$langs->trans("FormatDateShort")); // FormatDateShort for dol_print_date/FormatDateShortJava that is same for javascript + $formated_date=dol_print_date($set_time,$langs->trans("FormatDateShortInput")); // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript } // Calendrier popup version eldy @@ -3342,7 +3342,7 @@ class Form // Zone de saisie manuelle de la date $retstring.='trans("FormatDateShortJava").'\'); "'; // FormatDateShort for dol_print_date/FormatDateShortJava that is same for javascript + $retstring.=' onChange="dpChangeDay(\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript $retstring.='>'; // Icone calendrier @@ -3350,7 +3350,7 @@ class Form { $retstring.=''; + $retstring.=' onClick="showDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\',\''.$langs->defaultlang.'\');">'.img_object($langs->trans("SelectDate"),'calendarday','class="datecallink"').''; } else $retstring.=''; @@ -3359,7 +3359,7 @@ class Form $retstring.=''."\n"; } else - { + { print "Bad value of MAIN_POPUP_CALENDAR"; } } @@ -3453,7 +3453,7 @@ class Form if ($usecalendar == "eldy") { $base=DOL_URL_ROOT.'/core/'; - $reset_scripts .= 'resetDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJava").'\',\''.$langs->defaultlang.'\');'; + $reset_scripts .= 'resetDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\',\''.$langs->defaultlang.'\');'; } else { diff --git a/htdocs/core/datepicker.php b/htdocs/core/datepicker.php index 76b8dbb4b79..a976eb83f01 100644 --- a/htdocs/core/datepicker.php +++ b/htdocs/core/datepicker.php @@ -224,16 +224,16 @@ function displayBox($selectedDate,$month,$year) if($thedate==$selDate) $dayclass="dpSelected"; elseif($thedate==$today) $dayclass="dpToday"; - if ($langs->trans("FormatDateShortJava")=="FormatDateShortJava") + if ($langs->trans("FormatDateShortJavaInput")=="FormatDateShortJavaInput") { - print "ERROR FormatDateShortJava not defined for language ".$langs->defaultlang; + print "ERROR FormatDateShortJavaInput not defined for language ".$langs->defaultlang; exit; } // Sur click dans calendrier, appelle fonction dpClickDay echo ""; $cols++; diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang index f273f913d04..93e44d0cf43 100644 --- a/htdocs/langs/ar_SA/main.lang +++ b/htdocs/langs/ar_SA/main.lang @@ -15,7 +15,11 @@ FONTSIZEFORPDF=9 SeparatorDecimal=. SeparatorThousand=None FormatDateShort=%d/%m/%Y +FormatDateShortInpu=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y @@ -600,7 +604,6 @@ Prefix=بادئة // START - Lines generated via autotranslator.php tool (2012-02-29 15:55:27). // Reference language: en_US -> ar_SA -FormatDateShortJQuery=dd/mm/yy AddLink=إضافة وصلة Of=من SearchOf=البحث diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang index 51df97caecb..9356eeac9a0 100644 --- a/htdocs/langs/bg_BG/main.lang +++ b/htdocs/langs/bg_BG/main.lang @@ -10,8 +10,11 @@ FONTSIZEFORPDF=9 SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%d.%m.%Y +FormatDateShortInput=%d.%m.%Y FormatDateShortJava=dd.MM.yyyy +FormatDateShortJavaInput=dd.MM.yyyy FormatDateShortJQuery=dd.mm.yy +FormatDateShortJQueryInput=dd.mm.yy FormatHourShort=%H:%M FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang index 35b4d437e4e..b4689f1537d 100644 --- a/htdocs/langs/ca_ES/main.lang +++ b/htdocs/langs/ca_ES/main.lang @@ -4,8 +4,11 @@ DIRECTION=ltr SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%H:%M FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang index 7dd615bfa86..128bf629fc7 100644 --- a/htdocs/langs/da_DK/main.lang +++ b/htdocs/langs/da_DK/main.lang @@ -14,7 +14,11 @@ CHARSET=UTF-8 SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y @@ -624,7 +628,6 @@ Prefix=Præfiks // START - Lines generated via autotranslator.php tool (2012-02-29 15:59:19). // Reference language: en_US -> da_DK -FormatDateShortJQuery=dd/mm/yy AddLink=Tilføj link Of=af SearchOf=Søg diff --git a/htdocs/langs/de_AT/main.lang b/htdocs/langs/de_AT/main.lang index ed9d7b27ec2..095cf44e5e2 100644 --- a/htdocs/langs/de_AT/main.lang +++ b/htdocs/langs/de_AT/main.lang @@ -10,7 +10,9 @@ DIRECTION=ltr SeparatorDecimal=, SeparatorThousand=. FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang index bac265965cc..88e22f914d8 100644 --- a/htdocs/langs/de_DE/main.lang +++ b/htdocs/langs/de_DE/main.lang @@ -11,8 +11,11 @@ DIRECTION=ltr SeparatorDecimal=, SeparatorThousand=. FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy FormatDateShortJQuery=dd/MM/yy +FormatDateShortJQueryInput=dd/MM/yy FormatHourShort=%I:%M %p FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang index d37b716a9ba..b38a1417ea8 100644 --- a/htdocs/langs/el_GR/main.lang +++ b/htdocs/langs/el_GR/main.lang @@ -7,7 +7,11 @@ FONTSIZEFORPDF=9 SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%I:%M %p FormatHourShortDuration=%H:%M FormatDateTextShort=%b %d, %Y @@ -592,7 +596,6 @@ ShortSunday=Κ // START - Lines generated via autotranslator.php tool (2011-06-26 15:35:22). // Reference language: en_US -> el_GR -FormatDateShortJQuery=dd/mm/yy AddLink=Προσθήκη συνδέσμου Of=του AmountByMonth=Ποσό ανά μήνα diff --git a/htdocs/langs/en_AU/main.lang b/htdocs/langs/en_AU/main.lang index 02b689c7c47..e1c3f95b5ea 100644 --- a/htdocs/langs/en_AU/main.lang +++ b/htdocs/langs/en_AU/main.lang @@ -4,7 +4,11 @@ CHARSET=UTF-8 SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/en_GB/main.lang b/htdocs/langs/en_GB/main.lang index 8bd3243e226..6ec5c920232 100644 --- a/htdocs/langs/en_GB/main.lang +++ b/htdocs/langs/en_GB/main.lang @@ -3,7 +3,11 @@ CHARSET=UTF-8 SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/en_IN/main.lang b/htdocs/langs/en_IN/main.lang index 795d89bce4e..8bf5df955b5 100644 --- a/htdocs/langs/en_IN/main.lang +++ b/htdocs/langs/en_IN/main.lang @@ -4,7 +4,11 @@ DIRECTION=ltr SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%I:%M %p FormatDateTextShort=%b %d, %Y FormatDateText=%B %d, %Y diff --git a/htdocs/langs/en_NZ/main.lang b/htdocs/langs/en_NZ/main.lang index 1e6ca9a9ddc..d3f11199968 100644 --- a/htdocs/langs/en_NZ/main.lang +++ b/htdocs/langs/en_NZ/main.lang @@ -4,7 +4,11 @@ CHARSET=UTF-8 SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/en_SA/main.lang b/htdocs/langs/en_SA/main.lang index 146ae3fd85e..cb8e3ba6e6d 100644 --- a/htdocs/langs/en_SA/main.lang +++ b/htdocs/langs/en_SA/main.lang @@ -6,8 +6,11 @@ FONTSIZEFORPDF=9 SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%I:%M %p FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 28de6467cbb..3e313654b94 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -4,8 +4,11 @@ DIRECTION=ltr SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%m/%d/%Y +FormatDateShortInput=%m/%d/%Y FormatDateShortJava=MM/dd/yyyy +FormatDateShortJavaInput=MM/dd/yyyy FormatDateShortJQuery=mm/dd/yy +FormatDateShortJQueryInput=mm/dd/yy FormatHourShort=%I:%M %p FormatHourShortDuration=%H:%M FormatDateTextShort=%b %d, %Y diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang index b1c231a4a67..aece1ad9d15 100644 --- a/htdocs/langs/es_ES/main.lang +++ b/htdocs/langs/es_ES/main.lang @@ -4,8 +4,11 @@ DIRECTION=ltr SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%H:%M FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y diff --git a/htdocs/langs/es_HN/main.lang b/htdocs/langs/es_HN/main.lang index 390b2055e2f..421e7598de5 100644 --- a/htdocs/langs/es_HN/main.lang +++ b/htdocs/langs/es_HN/main.lang @@ -3,15 +3,6 @@ CHARSET=UTF-8 DIRECTION=ltr SeparatorDecimal=, SeparatorThousand= -FormatDateShort=%d/%m/%Y -FormatDateShortJava=dd/MM/yyyy -FormatHourShort=%H:%M -FormatHourShortDuration=%H:%M -FormatDateTextShort=%d %b %Y -FormatDateText=%d %B %Y -FormatDateHourShort=%d/%m/%Y %H:%M -FormatDateHourTextShort=%d %b %Y %H:%M -FormatDateHourText=%d %B %Y %H:%M AmountVAT=Importe ISV TotalVAT=Total ISV IncludedVAT=ISV incluido diff --git a/htdocs/langs/es_PR/main.lang b/htdocs/langs/es_PR/main.lang index 401b367ff52..5cb39740ada 100644 --- a/htdocs/langs/es_PR/main.lang +++ b/htdocs/langs/es_PR/main.lang @@ -3,15 +3,6 @@ CHARSET=UTF-8 DIRECTION=ltr SeparatorDecimal=, SeparatorThousand= -FormatDateShort=%d/%m/%Y -FormatDateShortJava=dd/MM/yyyy -FormatHourShort=%H:%M -FormatHourShortDuration=%H:%M -FormatDateTextShort=%d %b %Y -FormatDateText=%d %B %Y -FormatDateHourShort=%d/%m/%Y %H:%M -FormatDateHourTextShort=%d %b %Y %H:%M -FormatDateHourText=%d %B %Y %H:%M AmountVAT=Importe IVU TotalVAT=Total IVU IncludedVAT=IVU incluido diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang index f02122fad5b..086bfe8b5b0 100644 --- a/htdocs/langs/et_EE/main.lang +++ b/htdocs/langs/et_EE/main.lang @@ -12,8 +12,11 @@ DIRECTION=ltr SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%m/%d/%Y +FormatDateShortInput=%m/%d/%Y FormatDateShortJava=MM/dd/yyyy +FormatDateShortJavaInput=MM/dd/yyyy FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%I:%M %p FormatHourShortDuration=%H:%M FormatDateTextShort=%b %d, %Y diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang index 4cb4fc7d9f7..6645152d1d2 100644 --- a/htdocs/langs/fa_IR/main.lang +++ b/htdocs/langs/fa_IR/main.lang @@ -15,7 +15,11 @@ FONTSIZEFORPDF=9 SeparatorDecimal=/ SeparatorThousand=, FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang index 734a3356dd9..b451e91e115 100644 --- a/htdocs/langs/fi_FI/main.lang +++ b/htdocs/langs/fi_FI/main.lang @@ -11,7 +11,11 @@ CHARSET=UTF-8 SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d.%m.%Y +FormatDateShortInput=%d.%m.%Y FormatDateShortJava=dd.MM.yyyy +FormatDateShortJavaInput=dd.MM.yyyy +FormatDateShortJQuery=dd.mm.yy +FormatDateShortJQueryInput=dd.mm.yy FormatHourShort=%H.%M FormatDateTextShort=%d. %b %Y FormatDateText=%d. %B %Y @@ -616,7 +620,6 @@ Prefix=Etuliite // START - Lines generated via autotranslator.php tool (2012-02-29 16:10:23). // Reference language: en_US -> fi_FI -FormatDateShortJQuery=dd/mm/yy AddLink=Lisää linkki Of=ja SearchOf=Etsi diff --git a/htdocs/langs/fr_BE/main.lang b/htdocs/langs/fr_BE/main.lang index 3a222bdd6b9..664e394aeba 100644 --- a/htdocs/langs/fr_BE/main.lang +++ b/htdocs/langs/fr_BE/main.lang @@ -3,7 +3,11 @@ CHARSET=UTF-8 SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/fr_CA/main.lang b/htdocs/langs/fr_CA/main.lang index 3cd76162e3d..ca4b13b8480 100644 --- a/htdocs/langs/fr_CA/main.lang +++ b/htdocs/langs/fr_CA/main.lang @@ -3,7 +3,11 @@ CHARSET=UTF-8 SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d.%m.%Y +FormatDateShortInput=%d.%m.%Y FormatDateShortJava=dd.MM.yyyy +FormatDateShortJavaInput=dd.MM.yyyy +FormatDateShortJQuery=dd.mm.yy +FormatDateShortJQueryInput=dd.mm.yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/fr_CH/main.lang b/htdocs/langs/fr_CH/main.lang index dbe4956c684..83cc40057ea 100644 --- a/htdocs/langs/fr_CH/main.lang +++ b/htdocs/langs/fr_CH/main.lang @@ -3,7 +3,11 @@ CHARSET=UTF-8 SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d-%m-%Y +FormatDateShortInput=%d-%m-%Y FormatDateShortJava=dd-MM-yyyy +FormatDateShortJavaInput=dd-MM-yyyy +FormatDateShortJQuery=dd-mm-yy +FormatDateShortJQueryInput=dd-mm-yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index b31b711f3a3..ad25de082f4 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -3,9 +3,12 @@ CHARSET=UTF-8 DIRECTION=ltr SeparatorDecimal=, SeparatorThousand= -FormatDateShort=%d/%m/%Y -FormatDateShortJava=dd/MM/yyyy +FormatDateShort=%d/%m/%y +FormatDateShortInput=%d/%m/%Y +FormatDateShortJava=dd/MM/yy +FormatDateShortJavaInput=dd/MM/yyyy FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%H:%M FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang index 1561f468861..03c0061acf1 100644 --- a/htdocs/langs/he_IL/main.lang +++ b/htdocs/langs/he_IL/main.lang @@ -15,8 +15,11 @@ FONTSIZEFORPDF=9 SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%m/%d/%Y +FormatDateShortInput=%m/%d/%Y FormatDateShortJava=MM/dd/yyyy -FormatDateShortJQuery=dd/mm/yy +FormatDateShortJavaInput=MM/dd/yyyy +FormatDateShortJQuery=mm/dd/yy +FormatDateShortJQueryInput=mm/dd/yy FormatHourShort=%I:%M %p FormatHourShortDuration=%H:%M FormatDateTextShort=%b %d, %Y diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang index 8ee7c826648..9fb2cf4f61d 100644 --- a/htdocs/langs/hu_HU/main.lang +++ b/htdocs/langs/hu_HU/main.lang @@ -5,7 +5,11 @@ FONTFORPDF=dejavusans SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%I:%M %p FormatHourShortDuration=%H:%M FormatDateTextShort=%b %d, %Y @@ -587,7 +591,6 @@ ShortSunday=V // START - Lines generated via autotranslator.php tool (2012-02-29 16:13:31). // Reference language: en_US -> hu_HU -FormatDateShortJQuery=dd/mm/yy AddLink=Link hozzáadása Of=A SearchOf=Keresés diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang index 619f60994d9..c89746ed401 100644 --- a/htdocs/langs/is_IS/main.lang +++ b/htdocs/langs/is_IS/main.lang @@ -12,7 +12,11 @@ DIRECTION=ltr SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y @@ -604,7 +608,6 @@ Reason=Ástæða // START - Lines generated via autotranslator.php tool (2012-02-29 16:26:19). // Reference language: en_US -> is_IS -FormatDateShortJQuery=dd/mm/yy AddLink=Bæta við tengli Of=á SearchOf=Leita diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang index 43e9b108b78..78664cd01f8 100644 --- a/htdocs/langs/it_IT/main.lang +++ b/htdocs/langs/it_IT/main.lang @@ -270,15 +270,18 @@ FollowingConstantsWillBeSubstituted =Le seguenti costanti saranno sostitute ForCustomer =Per i clienti FormatDateHourShort =%d/%m/%Y %H.%M FormatDateHourText =%d %B %Y %H:%M -FormatDateHourTextShort =%d %b %Y %H.%M +FormatDateHourTextShort =%d %b %Y %H.%M FormatDateShort =%d/%m/%Y +FormatDateShortInput =%d/%m/%Y FormatDateShortJava =dd/MM/yyyy -FormatDateShortJQuery =dd/mm/yy +FormatDateShortJavaInput =dd/MM/yyyy +FormatDateShortJQuery =dd/mm/yy +FormatDateShortJQueryInput =dd/mm/yy FormatDateText =%d %B %Y FormatDateTextShort =%d %b %Y -FormatHourShortDuration =%H:%M -FormatHourShort =%H.%M -For =Per +FormatHourShortDuration =%H:%M +FormatHourShort =%H.%M +For =Per FreeZone =Testo libero Frequency =Frequenza FridayMin =Ven diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang index 6f6201cb7ec..d4c93c068e5 100644 --- a/htdocs/langs/ja_JP/main.lang +++ b/htdocs/langs/ja_JP/main.lang @@ -9,9 +9,12 @@ FONTSIZEFORPDF=9 // Reference language: en_US -> ja_JP SeparatorDecimal=. SeparatorThousand=、 -FormatDateShort=%m/%d/%Y -FormatDateShortJava=MM/dd/yyyy -FormatDateShortJQuery=dd/mm/yy +FormatDateShort=%m/%d/%Y +FormatDateShortInput=%m/%d/%Y +FormatDateShortJava=MM/dd/yyyy +FormatDateShortJavaInput=MM/dd/yyyy +FormatDateShortJQuery=mm/dd/yy +FormatDateShortJQueryInput=mm/dd/yy FormatHourShort=%I:%M %p FormatHourShortDuration=%H:%M FormatDateTextShort=%b %d, %Y diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang index 203896ba362..123ed5a86ed 100644 --- a/htdocs/langs/nb_NO/main.lang +++ b/htdocs/langs/nb_NO/main.lang @@ -3,7 +3,11 @@ CHARSET=UTF-8 SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d.%m.%Y +FormatDateShortInput=%d.%m.%Y FormatDateShortJava=dd.MM.yyyy +FormatDateShortJavaInput=dd.MM.yyyy +FormatDateShortJQuery=dd.mm.yy +FormatDateShortJQueryInput=dd.mm.yy FormatHourShort=%H.%M FormatDateTextShort=%d. %b %Y FormatDateText=%d. %B %Y @@ -606,7 +610,6 @@ Day0=Søndag // START - Lines generated via autotranslator.php tool (2012-02-29 17:06:43). // Reference language: en_US -> nb_NO -FormatDateShortJQuery=dd/mm/yy AddLink=Legg til link Of=av SearchOf=Søk diff --git a/htdocs/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang index 3d16e786aed..d4aff86e9c3 100644 --- a/htdocs/langs/nl_BE/main.lang +++ b/htdocs/langs/nl_BE/main.lang @@ -3,7 +3,11 @@ CHARSET=UTF-8 SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang index 40947ca565f..100bd776c3a 100644 --- a/htdocs/langs/nl_NL/main.lang +++ b/htdocs/langs/nl_NL/main.lang @@ -4,7 +4,11 @@ DIRECTION = ltr SeparatorDecimal = , SeparatorThousand = . FormatDateShort = %d-%m-%Y +FormatDateShortInput = %d-%m-%Y FormatDateShortJava = dd-MM-yyyy +FormatDateShortJavaInput = dd-MM-yyyy +FormatDateShortJQuery=dd-mm-yy +FormatDateShortJQueryInput=dd-mm-yy FormatHourShort = %H:%M FormatHourShortDuration = %H:%M FormatDateTextShort = %d %b %Y @@ -590,7 +594,6 @@ ShortSunday = Zo // START - Lines generated via autotranslator.php tool (2011-10-10 01:46:39). // Reference language: en_US -> nl_NL -FormatDateShortJQuery=dd/mm/yy JanuaryMin=Jan FebruaryMin=Februari MarchMin=Mar diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang index 5f725587178..41236b3456a 100644 --- a/htdocs/langs/pl_PL/main.lang +++ b/htdocs/langs/pl_PL/main.lang @@ -15,7 +15,11 @@ FONTSIZEFORPDF=8 SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d-%m-%Y +FormatDateShortInput=%d-%m-%Y FormatDateShortJava=dd-MM-yyyy +FormatDateShortJavaInput=dd-MM-yyyy +FormatDateShortJQuery=dd-mm-yy +FormatDateShortJQueryInput=dd-mm-yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y @@ -620,7 +624,6 @@ Prefix=Przedrostek // START - Lines generated via autotranslator.php tool (2012-02-29 17:18:29). // Reference language: en_US -> pl_PL -FormatDateShortJQuery=dd/mm/yy AddLink=Dodaj link Of=z SearchOf=Szukaj diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang index 86d60b9b037..4df4d1ea5ec 100644 --- a/htdocs/langs/pt_PT/main.lang +++ b/htdocs/langs/pt_PT/main.lang @@ -3,7 +3,11 @@ CHARSET=UTF-8 SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y @@ -601,7 +605,6 @@ Prefix=Prefixo // START - Lines generated via autotranslator.php tool (2012-02-29 15:45:52). // Reference language: en_US -> pt_PT -FormatDateShortJQuery=dd/mm/yy AddLink=Adicionar link Of=de SearchOf=Pesquisar diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang index df4536746d8..8b7530a1702 100644 --- a/htdocs/langs/ro_RO/main.lang +++ b/htdocs/langs/ro_RO/main.lang @@ -13,7 +13,11 @@ FONTSIZEFORPDF=8 SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d.%m.%Y +FormatDateShortInput=%d.%m.%Y FormatDateShortJava=dd.MM.yyyy +FormatDateShortJavaInput=dd.MM.yyyy +FormatDateShortJQuery=dd.mm.yy +FormatDateShortJQueryInput=dd.mm.yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y @@ -618,7 +622,6 @@ Prefix=Prefix // START - Lines generated via autotranslator.php tool (2012-02-29 17:23:15). // Reference language: en_US -> ro_RO -FormatDateShortJQuery=dd/mm/yy AddLink=Adauga link-ul Of=de SearchOf=Căutare diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang index 1d203fb98f0..30be774c29f 100644 --- a/htdocs/langs/ru_RU/main.lang +++ b/htdocs/langs/ru_RU/main.lang @@ -15,7 +15,11 @@ DIRECTION=ltr SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d.%m.%Y +FormatDateShortInput=%d.%m.%Y FormatDateShortJava=dd.MM.yyyy +FormatDateShortJavaInput=dd.MM.yyyy +FormatDateShortJQuery=dd.mm.yy +FormatDateShortJQueryInput=dd.mm.yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y @@ -628,7 +632,6 @@ Person=Персона // START - Lines generated via autotranslator.php tool (2011-08-18 23:26:41). // Reference language: en_US -> ru_RU -FormatDateShortJQuery=dd/mm/yy AddLink=Добавить ссылку Of=из AmountByMonth=Сумма за месяц diff --git a/htdocs/langs/ru_UA/main.lang b/htdocs/langs/ru_UA/main.lang index cef3a719ae0..cac36234fbf 100644 --- a/htdocs/langs/ru_UA/main.lang +++ b/htdocs/langs/ru_UA/main.lang @@ -10,7 +10,11 @@ DIRECTION=ltr SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d.%m.%Y +FormatDateShortInput=%d.%m.%Y FormatDateShortJava=dd.MM.yyyy +FormatDateShortJavaInput=dd.MM.yyyy +FormatDateShortJQuery=dd.mm.yy +FormatDateShortJQueryInput=dd.mm.yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang index 793d9498587..c79ca0d5dc5 100644 --- a/htdocs/langs/sl_SI/main.lang +++ b/htdocs/langs/sl_SI/main.lang @@ -6,8 +6,11 @@ FONTSIZEFORPDF=8 SeparatorDecimal = , SeparatorThousand = . FormatDateShort = %d/%m/%Y +FormatDateShortInput = %d/%m/%Y FormatDateShortJava = dd/MM/yyyy +FormatDateShortJavaInput = dd/MM/yyyy FormatDateShortJQuery = dd/mm/yy +FormatDateShortJQueryInput = dd/mm/yy FormatHourShort = %I:%M %p FormatHourShortDuration = %H:%M FormatDateTextShort = %d. %b, %Y diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang index 55287b657a0..dde9641a208 100644 --- a/htdocs/langs/sv_SE/main.lang +++ b/htdocs/langs/sv_SE/main.lang @@ -12,7 +12,11 @@ DIRECTION=ltr SeparatorDecimal=, SeparatorThousand= FormatDateShort=%Y-%m-%d +FormatDateShortInput=%Y-%m-%d FormatDateShortJava=yyyy-MM-dd +FormatDateShortJavaInput=yyyy-MM-dd +FormatDateShortJQuery=yy-mm-dd +FormatDateShortJQueryInput=yy-mm-dd FormatHourShort=%H:%M FormatHourShortDuration=%H:%M FormatDateTextShort=%b %d %Y @@ -594,7 +598,6 @@ ShortSunday=S // START - Lines generated via autotranslator.php tool (2012-02-29 17:32:03). // Reference language: en_US -> sv_SE -FormatDateShortJQuery=dd/mm/yy AddLink=Tillsätt länk Of=av SearchOf=Sök diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang index 7f372bf7dd5..8862e8b7635 100644 --- a/htdocs/langs/tr_TR/main.lang +++ b/htdocs/langs/tr_TR/main.lang @@ -14,8 +14,11 @@ FONTSIZEFORPDF=8 SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%H:%M FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang index 04235a1bd69..04c6ee545bd 100644 --- a/htdocs/langs/zh_CN/main.lang +++ b/htdocs/langs/zh_CN/main.lang @@ -17,7 +17,11 @@ FONTSIZEFORPDF=9 SeparatorDecimal=. SeparatorThousand=None FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%I:%M %p FormatDateTextShort=%b %d, %Y FormatDateText=%B %d, %Y @@ -604,7 +608,6 @@ Prefix=字首 // START - Lines generated via autotranslator.php tool (2012-02-29 17:37:09). // Reference language: en_US -> zh_CN -FormatDateShortJQuery=dd/mm/yy AddLink=添加链接 Of=的 SearchOf=搜索 diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang index b853fbb6073..aff84edf1ef 100644 --- a/htdocs/langs/zh_TW/main.lang +++ b/htdocs/langs/zh_TW/main.lang @@ -13,7 +13,11 @@ FONTFORPDF=msungstdlight SeparatorDecimal=. SeparatorThousand=None FormatDateShort=%Y/%m/%d +FormatDateShortInput=%Y/%m/%d FormatDateShortJava=yyyy/MM/dd +FormatDateShortJavaInput=yyyy/MM/dd +FormatDateShortJQuery=yy/mm/dd +FormatDateShortJQueryInput=yy/mm/dd FormatHourShort=%I:%M %p FormatDateTextShort=%Y %b %d FormatDateText=%Y %B %d @@ -600,7 +604,6 @@ Prefix=字首 // START - Lines generated via autotranslator.php tool (2012-02-29 17:37:09). // Reference language: en_US -> zh_CN -FormatDateShortJQuery=dd/mm/yy AddLink=添加鏈接 Of=的 SearchOf=搜尋 From ac8868e2d2b7bc4624ee8f062f51defed28bc0ab Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 18 Apr 2013 19:56:14 +0200 Subject: [PATCH 35/36] Fix: Use correct format for js --- htdocs/core/get_menudiv.php | 5 ----- htdocs/core/search_page.php | 5 ----- htdocs/langs/de_AT/main.lang | 2 ++ htdocs/projet/ganttview.php | 4 ++-- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/htdocs/core/get_menudiv.php b/htdocs/core/get_menudiv.php index 0d9e3c0a54b..51bda89ffd0 100644 --- a/htdocs/core/get_menudiv.php +++ b/htdocs/core/get_menudiv.php @@ -40,11 +40,6 @@ $langs->load("main"); $right=($langs->trans("DIRECTION")=='rtl'?'left':'right'); $left=($langs->trans("DIRECTION")=='rtl'?'right':'left'); -//var_dump($langs->defaultlang); -//var_dump($conf->format_date_short_java); -//var_dump($langs->trans("FormatDateShortJava")); - - /* * View diff --git a/htdocs/core/search_page.php b/htdocs/core/search_page.php index 3cab48155ae..fe21a82c56f 100644 --- a/htdocs/core/search_page.php +++ b/htdocs/core/search_page.php @@ -40,11 +40,6 @@ $langs->load("main"); $right=($langs->trans("DIRECTION")=='rtl'?'left':'right'); $left=($langs->trans("DIRECTION")=='rtl'?'right':'left'); -//var_dump($langs->defaultlang); -//var_dump($conf->format_date_short_java); -//var_dump($langs->trans("FormatDateShortJava")); - - /* * View diff --git a/htdocs/langs/de_AT/main.lang b/htdocs/langs/de_AT/main.lang index 095cf44e5e2..6a44f3dbfee 100644 --- a/htdocs/langs/de_AT/main.lang +++ b/htdocs/langs/de_AT/main.lang @@ -13,6 +13,8 @@ FormatDateShort=%d/%m/%Y FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/MM/yy +FormatDateShortJQueryInput=dd/MM/yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php index 3a36fd1f591..e19571f9518 100644 --- a/htdocs/projet/ganttview.php +++ b/htdocs/projet/ganttview.php @@ -184,8 +184,8 @@ if (count($tasksarray)>0) // Show Gant diagram from $taskarray using JSGantt - $dateformat=$langs->trans("FormatDateShort"); - $dateformat=strtolower($langs->trans("FormatDateShortJava")); + $dateformat=$langs->trans("FormatDateShort"); // Used by include ganttchart.php later + $dateformat=$langs->trans("FormatDateShortJQuery"); // Used by include ganttchart.php later $array_contacts=array(); $tasks=array(); $project_dependencies=array(); From 6860aa05c7027152496bb3b304309f1764932320 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 19 Apr 2013 00:20:21 +0200 Subject: [PATCH 36/36] Fix: Missing test --- htdocs/societe/societe.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/societe/societe.php b/htdocs/societe/societe.php index 26583442b2c..93401eaebf0 100644 --- a/htdocs/societe/societe.php +++ b/htdocs/societe/societe.php @@ -122,7 +122,7 @@ if ($mode == 'search') if ($search_type > 0 && in_array($search_type,array('1,3','2,3'))) $sql .= " AND s.client IN (".$db->escape($search_type).")"; if ($search_type > 0 && in_array($search_type,array('4'))) $sql .= " AND s.fournisseur = 1"; if ($search_type == '0') $sql .= " AND s.client = 0 AND s.fournisseur = 0"; - + $result=$db->query($sql); if ($result) { @@ -365,13 +365,13 @@ if ($resql) print ''; - // Status + // Status print '
trans("FormatDateShortJava")."')\""; + echo " onClick=\"dpClickDay(".$mydate["year"].",parseInt('".dol_print_date($thedate,"%m")."',10),".$mydate["mday"].",'".$langs->trans("FormatDateShortJavaInput")."')\""; echo ">".sprintf("%02s",$mydate["mday"])."'; print ''; print ''; print '  ';