lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2012-11-20 17:46:44 +01:00
commit 733214733e
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/index.php
View File

@ -78,8 +78,6 @@ if ($action == 'del_bookmark' && ! empty($bid))
* View * View
*/ */
$now=dol_now();
$form = new Form($db); $form = new Form($db);
$formfile = new FormFile($db); $formfile = new FormFile($db);
$companystatic=new Societe($db); $companystatic=new Societe($db);

6
htdocs/comm/propal/index.php
View File

@ -43,7 +43,7 @@ $result = restrictedArea($user, 'propal');
/* /*
* View * View
*/ */
$now=dol_now();
$propalstatic=new Propal($db); $propalstatic=new Propal($db);
$companystatic=new Societe($db); $companystatic=new Societe($db);
$form = new Form($db); $form = new Form($db);
@ -288,7 +288,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
$now=dol_now(); $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.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."propal as p"; $sql.= ", ".MAIN_DB_PREFIX."propal as p";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; 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 $propalstatic->getNomUrl(1);
print '</td>'; print '</td>';
print '<td width="18" class="nobordernopadding" nowrap="nowrap">'; print '<td width="18" class="nobordernopadding" nowrap="nowrap">';
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 '</td>'; print '</td>';
print '<td width="16" align="center" class="nobordernopadding">'; print '<td width="16" align="center" class="nobordernopadding">';
$filename=dol_sanitizeFileName($obj->ref); $filename=dol_sanitizeFileName($obj->ref);

2
htdocs/imports/import.php
View File

@ -1498,7 +1498,7 @@ if ($step == 6 && $datatoimport)
// Source file format // Source file format
print '<tr><td width="25%">'.$langs->trans("SourceFileFormat").'</td>'; print '<tr><td width="25%">'.$langs->trans("SourceFileFormat").'</td>';
print '<td>'; print '<td>';
$text=$objmodelimport->getDriverDesc($format); $text=$objmodelimport->getDriverDescForKey($format);
print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format),$text); print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format),$text);
print '</td></tr>'; print '</td></tr>';

2
htdocs/langs/ca_ES/boxes.lang
View File

@ -3,6 +3,7 @@ CHARSET=UTF-8
BoxLastRssInfos=Fils d'informació RSS BoxLastRssInfos=Fils d'informació RSS
BoxLastProducts=Els %s últims productes/serveis BoxLastProducts=Els %s últims productes/serveis
BoxLastProductsInContract=Els %s últims productes/serveis contractats BoxLastProductsInContract=Els %s últims productes/serveis contractats
BoxProductsAlertStock=Productes en alerta d'estoc
BoxLastSupplierBills=Últimes factures de proveïdors BoxLastSupplierBills=Últimes factures de proveïdors
BoxLastCustomerBills=Últimes factures a clients BoxLastCustomerBills=Últimes factures a clients
BoxOldestUnpaidCustomerBills=Factures a clients més antigues pendents de pagament BoxOldestUnpaidCustomerBills=Factures a clients més antigues pendents de pagament
@ -25,6 +26,7 @@ BoxTitleLastBooks=Els %s darrers marcadors registrats
BoxTitleNbOfCustomers=Nombre de clients BoxTitleNbOfCustomers=Nombre de clients
BoxTitleLastRssInfos=Les %s últimes infos de %s BoxTitleLastRssInfos=Les %s últimes infos de %s
BoxTitleLastProducts=Els %s darrers productes/serveis registrats BoxTitleLastProducts=Els %s darrers productes/serveis registrats
BoxTitleProductsAlertStock=Productes en alerta d'estoc
BoxTitleLastCustomerOrders=Les %s darreres comandes de clients modificades BoxTitleLastCustomerOrders=Les %s darreres comandes de clients modificades
BoxTitleLastSuppliers=Els %s darrers proveïdors registrats BoxTitleLastSuppliers=Els %s darrers proveïdors registrats
BoxTitleLastCustomers=Els %s darrers clients registrats BoxTitleLastCustomers=Els %s darrers clients registrats

2
htdocs/langs/es_ES/boxes.lang
View File

@ -3,6 +3,7 @@ CHARSET=UTF-8
BoxLastRssInfos=Hilos de información RSS BoxLastRssInfos=Hilos de información RSS
BoxLastProducts=Los %s últimos productos/servicios BoxLastProducts=Los %s últimos productos/servicios
BoxLastProductsInContract=Los %s últimos productos/servicios contratados BoxLastProductsInContract=Los %s últimos productos/servicios contratados
BoxProductsAlertStock=Productos en alerta de stock
BoxLastSupplierBills=Últimas facturas de proveedores BoxLastSupplierBills=Últimas facturas de proveedores
BoxLastCustomerBills=Últimas facturas a clientes BoxLastCustomerBills=Últimas facturas a clientes
BoxOldestUnpaidCustomerBills=Facturas a clientes más antiguas pendientes de pago 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 BoxTitleNbOfCustomers=Número de clientes
BoxTitleLastRssInfos=Las %s últimas infos de %s BoxTitleLastRssInfos=Las %s últimas infos de %s
BoxTitleLastProducts=Los %s últimos productos/servicios registrados BoxTitleLastProducts=Los %s últimos productos/servicios registrados
BoxTitleProductsAlertStock=Productos en alerta de stock
BoxTitleLastCustomerOrders=Los %s últimos pedidos de clientes modificados BoxTitleLastCustomerOrders=Los %s últimos pedidos de clientes modificados
BoxTitleLastSuppliers=Los %s últimos proveedores registrados BoxTitleLastSuppliers=Los %s últimos proveedores registrados
BoxTitleLastCustomers=Los %s últimos clientes registrados BoxTitleLastCustomers=Los %s últimos clientes registrados