From d687d37573140982aa64363f7b0994e9e730e363 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Wed, 14 Nov 2012 22:31:54 +0100 Subject: [PATCH 1/4] Fix : $now defined twice --- htdocs/comm/index.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index d290ec43a75..e928de437b9 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -78,8 +78,6 @@ if ($action == 'del_bookmark' && ! empty($bid)) * View */ -$now=dol_now(); - $form = new Form($db); $formfile = new FormFile($db); $companystatic=new Societe($db); From 9911c64f0b4c197d858daec58a863ec4d62c02ee Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Wed, 14 Nov 2012 22:32:20 +0100 Subject: [PATCH 2/4] Fix : $now not defined and proposal date used instead of end validity to display warning --- htdocs/comm/propal/index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php index fb6fa29902e..895f922395d 100644 --- a/htdocs/comm/propal/index.php +++ b/htdocs/comm/propal/index.php @@ -43,7 +43,7 @@ $result = restrictedArea($user, 'propal'); /* * View */ - +$now=dol_now(); $propalstatic=new Propal($db); $companystatic=new Societe($db); $form = new Form($db); @@ -288,7 +288,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire) $now=dol_now(); - $sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client, p.rowid as propalid, p.total as total_ttc, p.total_ht, p.ref, p.fk_statut, p.datep as dp"; + $sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client, p.rowid as propalid, p.total as total_ttc, p.total_ht, p.ref, p.fk_statut, p.datep as dp, p.fin_validite as dfv"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."propal as p"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -328,7 +328,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire) print $propalstatic->getNomUrl(1); print ''; print ''; - if ($db->jdate($obj->dp) < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late")); + if ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late")); print ''; print ''; $filename=dol_sanitizeFileName($obj->ref); From fc4c5f333ff23294e9d346ca906d8046c43f381c Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Sat, 17 Nov 2012 10:19:26 +0100 Subject: [PATCH 3/4] Fix : fatal error while importing, function name wasn't complete --- htdocs/imports/import.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index c942bd23efe..8b90a1178c6 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -1498,7 +1498,7 @@ if ($step == 6 && $datatoimport) // Source file format print ''.$langs->trans("SourceFileFormat").''; print ''; - $text=$objmodelimport->getDriverDesc($format); + $text=$objmodelimport->getDriverDescForKey($format); print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format),$text); print ''; From b593fa2df6d064e13c7d37d55f37f32b474d1e57 Mon Sep 17 00:00:00 2001 From: simnandez Date: Tue, 20 Nov 2012 09:04:24 +0100 Subject: [PATCH 4/4] Trad: Add ca_ES and es_ES translations --- htdocs/langs/ca_ES/boxes.lang | 2 ++ htdocs/langs/es_ES/boxes.lang | 2 ++ 2 files changed, 4 insertions(+) diff --git a/htdocs/langs/ca_ES/boxes.lang b/htdocs/langs/ca_ES/boxes.lang index aabee817076..c9630609526 100644 --- a/htdocs/langs/ca_ES/boxes.lang +++ b/htdocs/langs/ca_ES/boxes.lang @@ -3,6 +3,7 @@ CHARSET=UTF-8 BoxLastRssInfos=Fils d'informació RSS BoxLastProducts=Els %s últims productes/serveis BoxLastProductsInContract=Els %s últims productes/serveis contractats +BoxProductsAlertStock=Productes en alerta d'estoc BoxLastSupplierBills=Últimes factures de proveïdors BoxLastCustomerBills=Últimes factures a clients BoxOldestUnpaidCustomerBills=Factures a clients més antigues pendents de pagament @@ -25,6 +26,7 @@ BoxTitleLastBooks=Els %s darrers marcadors registrats BoxTitleNbOfCustomers=Nombre de clients BoxTitleLastRssInfos=Les %s últimes infos de %s BoxTitleLastProducts=Els %s darrers productes/serveis registrats +BoxTitleProductsAlertStock=Productes en alerta d'estoc BoxTitleLastCustomerOrders=Les %s darreres comandes de clients modificades BoxTitleLastSuppliers=Els %s darrers proveïdors registrats BoxTitleLastCustomers=Els %s darrers clients registrats diff --git a/htdocs/langs/es_ES/boxes.lang b/htdocs/langs/es_ES/boxes.lang index 948d023efcf..72c4363ebe5 100644 --- a/htdocs/langs/es_ES/boxes.lang +++ b/htdocs/langs/es_ES/boxes.lang @@ -3,6 +3,7 @@ CHARSET=UTF-8 BoxLastRssInfos=Hilos de información RSS BoxLastProducts=Los %s últimos productos/servicios BoxLastProductsInContract=Los %s últimos productos/servicios contratados +BoxProductsAlertStock=Productos en alerta de stock BoxLastSupplierBills=Últimas facturas de proveedores BoxLastCustomerBills=Últimas facturas a clientes BoxOldestUnpaidCustomerBills=Facturas a clientes más antiguas pendientes de pago @@ -25,6 +26,7 @@ BoxTitleLastBooks=Los %s últimos marcadores registrados BoxTitleNbOfCustomers=Número de clientes BoxTitleLastRssInfos=Las %s últimas infos de %s BoxTitleLastProducts=Los %s últimos productos/servicios registrados +BoxTitleProductsAlertStock=Productos en alerta de stock BoxTitleLastCustomerOrders=Los %s últimos pedidos de clientes modificados BoxTitleLastSuppliers=Los %s últimos proveedores registrados BoxTitleLastCustomers=Los %s últimos clientes registrados