Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 09:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #910 from marcosgdf/3.3-translations

Browse Source 
Translation improvements + fixed statut image of returned prelevement
This commit is contained in:
Laurent Destailleur
2013-05-02 10:42:53 -07:00
parent 3a531f048a 97478ccbf2
commit 4687350337
9 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/clients.php
View File

@@ -140,6 +140,8 @@ if ($resql)
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
$i = 0; $i = 0;
$langs->load('commercial');
print_barre_liste($langs->trans("ListOfCustomers"), $page, $_SERVER["PHP_SELF"],"",$sortfield,$sortorder,'',$num); print_barre_liste($langs->trans("ListOfCustomers"), $page, $_SERVER["PHP_SELF"],"",$sortfield,$sortorder,'',$num);
print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">'; print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';

2
htdocs/compta/prelevement/bons.php
View File

@@ -27,7 +27,7 @@
require '../bank/pre.inc.php'; require '../bank/pre.inc.php';
require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
$langs->load("widthdrawals"); $langs->load("withdrawals");
$langs->load("categories"); $langs->load("categories");
// Security check // Security check

1
htdocs/compta/prelevement/factures.php
View File

@@ -33,6 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
$langs->load("companies"); $langs->load("companies");
$langs->load("categories"); $langs->load("categories");
$langs->load('withdrawals'); $langs->load('withdrawals');
$langs->load('bills');
// Securite acces client // Securite acces client
if ($user->societe_id > 0) accessforbidden(); if ($user->societe_id > 0) accessforbidden();

1
htdocs/compta/prelevement/fiche-rejet.php
View File

@@ -32,6 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
$langs->load("categories"); $langs->load("categories");
$langs->load('withdrawals'); $langs->load('withdrawals');
$langs->load('bills');
// Securite acces client // Securite acces client
if ($user->societe_id > 0) accessforbidden(); if ($user->societe_id > 0) accessforbidden();

1
htdocs/compta/prelevement/fiche-stat.php
View File

@@ -33,6 +33,7 @@ if ($user->societe_id > 0) accessforbidden();
$langs->load("withdrawals"); $langs->load("withdrawals");
$langs->load("categories"); $langs->load("categories");
$langs->load('bills');
// Get supervariables // Get supervariables
$prev_id = GETPOST('id','int'); $prev_id = GETPOST('id','int');

1
htdocs/compta/prelevement/lignes.php
View File

@@ -36,6 +36,7 @@ if ($user->societe_id > 0) accessforbidden();
$langs->load("categories"); $langs->load("categories");
$langs->load('withdrawals'); $langs->load('withdrawals');
$langs->load('bills');
// Get supervariables // Get supervariables
$prev_id = GETPOST('id','int'); $prev_id = GETPOST('id','int');

6
htdocs/compta/prelevement/rejets.php
View File

@@ -26,6 +26,7 @@
require '../bank/pre.inc.php'; require '../bank/pre.inc.php';
require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
$langs->load("withdrawals"); $langs->load("withdrawals");
@@ -56,6 +57,7 @@ if ($sortorder == "") $sortorder="DESC";
if ($sortfield == "") $sortfield="p.datec"; if ($sortfield == "") $sortfield="p.datec";
$rej = new RejetPrelevement($db, $user); $rej = new RejetPrelevement($db, $user);
$ligne = new LignePrelevement($db);
/* /*
* Liste des factures * Liste des factures
@@ -84,7 +86,7 @@ if ($result)
print"\n<!-- debut table -->\n"; print"\n<!-- debut table -->\n";
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">'; print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Nb"),"rejets.php","p.ref",'',$urladd); print_liste_field_titre($langs->trans("Line"),"rejets.php","p.ref",'',$urladd);
print_liste_field_titre($langs->trans("ThirdParty"),"rejets.php","s.nom",'',$urladd); print_liste_field_titre($langs->trans("ThirdParty"),"rejets.php","s.nom",'',$urladd);
print_liste_field_titre($langs->trans("Reason"),"rejets.php","pr.motif","",$urladd); print_liste_field_titre($langs->trans("Reason"),"rejets.php","pr.motif","",$urladd);
print '</tr>'; print '</tr>';
@@ -98,7 +100,7 @@ if ($result)
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
print "<tr $bc[$var]><td>"; print "<tr $bc[$var]><td>";
print '<img border="0" src="./img/statut'.$obj->statut.'.png"></a>&nbsp;'; print $ligne->LibStatut($obj->statut,2).'&nbsp;';
print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$obj->rowid.'">'; print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$obj->rowid.'">';
print substr('000000'.$obj->rowid, -6)."</a></td>"; print substr('000000'.$obj->rowid, -6)."</a></td>";

4
htdocs/langs/es_ES/admin.lang
View File

@@ -646,8 +646,8 @@ Permission1002=Crear/modificar stocks
Permission1003=Eliminar stocks Permission1003=Eliminar stocks
Permission1004=Consultar movimientos de stock Permission1004=Consultar movimientos de stock
Permission1005=Crear/modificar movimientos de stock Permission1005=Crear/modificar movimientos de stock
Permission1101=Consultar ordenes de envío Permission1101=Consultar órdenes de envío
Permission1102=Crear/modificar ordenes de envío Permission1102=Crear/modificar órdenes de envío
Permission1104=Validar orden de envío Permission1104=Validar orden de envío
Permission1109=Eliminar orden de envío Permission1109=Eliminar orden de envío
Permission1181=Consultar proveedores Permission1181=Consultar proveedores

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

@@ -9,7 +9,7 @@ StandingOrderToProcess=A procesar
StandingOrderProcessed=Procesados StandingOrderProcessed=Procesados
Withdrawals=Reintegros Withdrawals=Reintegros
Withdrawal=Reintegro Withdrawal=Reintegro
WithdrawalsReceipts=Ordenes domiciliadas WithdrawalsReceipts=Órdenes domiciliadas
WithdrawalReceipt=Orden domiciliación WithdrawalReceipt=Orden domiciliación
WithdrawalReceiptShort=Orden WithdrawalReceiptShort=Orden
LastWithdrawalReceipts=Las %s últimas órdenes de domiciliación LastWithdrawalReceipts=Las %s últimas órdenes de domiciliación