Skip to content

Commit

Permalink
Trans: Missing trans
Browse files Browse the repository at this point in the history
  • Loading branch information
Juanjo Menent committed Aug 17, 2011
1 parent 7de25ee commit 3783b07
Show file tree
Hide file tree
Showing 9 changed files with 140 additions and 292 deletions.
14 changes: 6 additions & 8 deletions htdocs/lib/company.lib.php
View file
Expand Up @@ -23,7 +23,7 @@
* \file htdocs/lib/company.lib.php
* \brief Ensemble de fonctions de base pour le module societe
* \ingroup societe
* \version $Id: company.lib.php,v 1.124 2011/08/17 19:43:18 hregis Exp $
* \version $Id: company.lib.php,v 1.123 2011/07/31 23:25:41 eldy Exp $
*/

/**
Expand Down Expand Up @@ -190,18 +190,16 @@ function societe_admin_prepare_head($object)
$head[$h][2] = 'general';
$h++;

$head[$h][0] = DOL_URL_ROOT.'/admin/societe_extrafields.php';
$head[$h][1] = $langs->trans("ExtraFields");
$head[$h][2] = 'attributes';
$h++;

// Show more tabs from modules
// Entries must be declared in modules descriptor with line
// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab
complete_head_from_modules($conf,$langs,$object,$head,$h,'company_admin');

$head[$h][0] = DOL_URL_ROOT.'/admin/societe_extrafields.php';
$head[$h][1] = $langs->trans("ExtraFields");
$head[$h][2] = 'attributes';
$h++;

complete_head_from_modules($conf,$langs,$object,$head,$h,'company_admin','remove');

return $head;
}
Expand Down
16 changes: 7 additions & 9 deletions htdocs/lib/member.lib.php
View file
Expand Up @@ -19,7 +19,7 @@
/**
* \file htdocs/lib/member.lib.php
* \brief Ensemble de fonctions de base pour les adherents
* \version $Id: member.lib.php,v 1.26 2011/08/17 19:43:18 hregis Exp $
* \version $Id: member.lib.php,v 1.25 2011/07/31 23:26:02 eldy Exp $
*
* Ensemble de fonctions de base de dolibarr sous forme d'include
*/
Expand Down Expand Up @@ -110,12 +110,6 @@ function member_admin_prepare_head($object)
$head[$h][2] = 'general';
$h++;

// Show more tabs from modules
// Entries must be declared in modules descriptor with line
// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab
complete_head_from_modules($conf,$langs,$object,$head,$h,'member_admin');

$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_extrafields.php';
$head[$h][1] = $langs->trans("ExtraFields");
$head[$h][2] = 'attributes';
Expand All @@ -125,8 +119,12 @@ function member_admin_prepare_head($object)
$head[$h][1] = $langs->trans("BlankSubscriptionForm");
$head[$h][2] = 'public';
$h++;

complete_head_from_modules($conf,$langs,$object,$head,$h,'member_admin','remove');

// Show more tabs from modules
// Entries must be declared in modules descriptor with line
// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab
complete_head_from_modules($conf,$langs,$object,$head,$h,'member_admin');

return $head;
}
Expand Down
35 changes: 28 additions & 7 deletions htdocs/main.inc.php
View file
Expand Up @@ -25,7 +25,7 @@
* \file htdocs/main.inc.php
* \ingroup core
* \brief File that defines environment for Dolibarr pages only (variables not required by scripts)
* \version $Id: main.inc.php,v 1.763 2011/08/17 19:26:48 eldy Exp $
* \version $Id: main.inc.php,v 1.762 2011/08/17 09:51:39 cdelambert Exp $
*/

@ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP
Expand Down Expand Up @@ -137,6 +137,31 @@ function analyse_sql_and_script(&$var,$get)
// This include will set: $conf, $db, $langs, $user, $mysoc objects
require_once("master.inc.php");

// Activate error interceptions
/*
function processError($code, $message, $file, $line, $context)
{
$errmess='ERROR '.$file.' - '.$line.' - '.error_reporting()." - ".$code."<br>\n";
//print $errmess;
if (error_reporting() & $code) {
print $errmess;
throw new Exception($message, $code);
}
}
set_error_handler('processError');
*/

// GET and POST converter
/*
foreach($_REQUEST as $key => $value)
{
// For prevent conflict
$var = '__'.$key;
// Create variable with tested value
$$var = GETPOST($key);
}
*/

// Activate end of page function
register_shutdown_function('dol_shutdown');

Expand Down Expand Up @@ -1202,13 +1227,9 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
if (! empty($conf->browser->phone)) $loginhtmltext.='<br><b>'.$langs->trans("Phone").'</b>: '.$conf->browser->phone;
if (! empty($_SESSION["disablemodules"])) $loginhtmltext.='<br><b>'.$langs->trans("DisabledModules").'</b>: <br>'.join(', ',explode(',',$_SESSION["disablemodules"]));

$appli='Dolibarr';
if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;

// Link info
$logouttext='';
$logouthtmltext=$appli.' '.DOL_VERSION.'<br>';
$logouthtmltext.=$langs->trans("Logout").'<br>';
$logouthtmltext=''; $logouttext='';
$logouthtmltext=$langs->trans("Logout").'<br>';
//$logouthtmltext.="<br>";
if ($_SESSION["dol_authmode"] != 'forceuser'
&& $_SESSION["dol_authmode"] != 'http')
Expand Down
8 changes: 4 additions & 4 deletions htdocs/product/fournisseurs.php
View file
Expand Up @@ -23,7 +23,7 @@
* \file htdocs/product/fournisseurs.php
* \ingroup product
* \brief Page of tab suppliers for products
* \version $Id: fournisseurs.php,v 1.99 2011/08/17 16:44:38 simnandez Exp $
* \version $Id: fournisseurs.php,v 1.98 2011/08/17 15:22:39 simnandez Exp $
*/

require("../main.inc.php");
Expand Down Expand Up @@ -355,16 +355,16 @@
else $nblignefour=4;

$param="&id=".$product->id;
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Suppliers"),$_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
print '<td class="liste_titre">'.$langs->trans("SupplierRef").'</td>';
if(!empty($conf->global->FOURN_PRODUCT_AVAILABILITY))
print_liste_field_titre($langs->trans("Availability"),$_SERVER["PHP_SELF"],"pfp.fk_availability","",$param,"",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("QtyMin"),$_SERVER["PHP_SELF"],"pfp.quantity","",$param,"",$sortfield,$sortorder);
print '<td class="liste_titre" align="right">'.$langs->trans("PriceQtyMinHT").'</td>';
print_liste_field_titre($langs->trans("UnitPriceHT"),$_SERVER["PHP_SELF"],"pfp.unitprice","",$param,'align="right"',$sortfield,$sortorder);

print '<td class="liste_titre"></td>';
print "</tr>\n";
print '</tr>';

// Suppliers list
$sql = "SELECT s.nom, s.rowid as socid,";
Expand Down Expand Up @@ -453,5 +453,5 @@

$db->close();

llxFooter('$Date: 2011/08/17 16:44:38 $ - $Revision: 1.99 $');
llxFooter('$Date: 2011/08/17 15:22:39 $ - $Revision: 1.98 $');
?>
25 changes: 4 additions & 21 deletions htdocs/societe/class/societe.class.php
View file
Expand Up @@ -26,7 +26,7 @@
* \file htdocs/societe/class/societe.class.php
* \ingroup societe
* \brief File for third party class
* \version $Id: societe.class.php,v 1.99 2011/08/17 19:43:19 hregis Exp $
* \version $Id: societe.class.php,v 1.98 2011/08/12 06:55:55 simnandez Exp $
*/
require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");

Expand Down Expand Up @@ -219,7 +219,7 @@ function create($user='')
{
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe");

$ret = $this->update($this->id,$user,0,1,1,'add');
$ret = $this->update($this->id,$user,0,1,1);

// si un commercial cree un client il lui est affecte automatiquement
if (!$user->rights->societe->client->voir)
Expand Down Expand Up @@ -368,7 +368,7 @@ function verify()
* @param allowmodcodefournisseur Inclut modif code fournisseur et code compta fournisseur
* @return int <0 if KO, >=0 if OK
*/
function update($id, $user='', $call_trigger=1, $allowmodcodeclient=0, $allowmodcodefournisseur=0, $action='update')
function update($id, $user='', $call_trigger=1, $allowmodcodeclient=0, $allowmodcodefournisseur=0)
{
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");

Expand Down Expand Up @@ -975,25 +975,8 @@ function delete($id)
$this->error = $this->db->lasterror();
dol_syslog("Societe::Delete erreur -3 ".$this->error, LOG_ERR);
}

if ($sqr == 4)
{
// Actions on extra fields (by external module or standard code)
include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php');
$hookmanager=new HookManager($this->db);
$hookmanager->callHooks(array('thirdparty_extrafields'));
$parameters=array();
$reshook=$hookmanager->executeHooks('deleteExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
if (empty($reshook))
{
//TODO add deleteExtraFields function
//$result=$this->deleteExtraFields($this);
//if ($result > 0) $sqr++;
}
else if ($reshook > 0) $sqr++;
}

if ($sqr == 5)
if ($sqr == 4)
{
// Appel des triggers
include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
Expand Down
10 changes: 5 additions & 5 deletions htdocs/societe/soc.php
View file
Expand Up @@ -25,7 +25,7 @@
* \file htdocs/societe/soc.php
* \ingroup societe
* \brief Third party card page
* \version $Id: soc.php,v 1.136 2011/08/17 19:43:19 hregis Exp $
* \version $Id: soc.php,v 1.135 2011/08/13 00:48:00 eldy Exp $
*/

require("../main.inc.php");
Expand Down Expand Up @@ -1013,7 +1013,7 @@
}

// Other attributes
$parameters=array('colspan' => ' colspan="3"');
$parameters=array();
$reshook=$hookmanager->executeHooks('showInputFields',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
if (empty($reshook))
{
Expand Down Expand Up @@ -1442,7 +1442,7 @@
}

// Other attributes
$parameters=array('colspan' => ' colspan="3"');
$parameters=array();
$reshook=$hookmanager->executeHooks('showInputFields',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
if (empty($reshook))
{
Expand Down Expand Up @@ -1783,7 +1783,7 @@
}

// Other attributes
$parameters=array('socid'=>$socid, 'colspan' => ' colspan="3"');
$parameters=array('socid'=>$socid);
$reshook=$hookmanager->executeHooks('showOutputFields',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
if (empty($reshook))
{
Expand Down Expand Up @@ -1973,5 +1973,5 @@

$db->close();

llxFooter('$Date: 2011/08/17 19:43:19 $ - $Revision: 1.136 $');
llxFooter('$Date: 2011/08/13 00:48:00 $ - $Revision: 1.135 $');
?>
Binary file modified htdocs/theme/bureau2crea/img/bg_centerBlock-title.jpg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified htdocs/theme/bureau2crea/img/bg_navHorizontal.jpg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 3783b07

Please sign in to comment.