Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@frederic34
frederic34 committed Apr 9, 2013
2 parents 9099fe9 + b28c357 commit 61b4305
Show file tree
Hide file tree
Showing 28 changed files with 360 additions and 856 deletions.
7 changes: 3 additions & 4 deletions htdocs/adherents/admin/adherent_extrafields.php
View file
Expand Up @@ -70,7 +70,7 @@

$head = member_admin_prepare_head();

dol_fiche_head($head, 'attributes', $langs->trans("Member"), 0, 'user');
dol_fiche_head($head, 'attributes', $langs->trans("Members"), 0, 'user');


print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
Expand Down Expand Up @@ -105,7 +105,6 @@
print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=".$key."\">".img_delete()."</a></td>\n";
print "</tr>";
// $i++;
}

print "</table>";
Expand All @@ -124,8 +123,8 @@

/* ************************************************************************** */
/* */
/* Creation d'un champ optionnel
/* */
/* Creation d'un champ optionnel */
/* */
/* ************************************************************************** */

if ($action == 'create')
Expand Down
9 changes: 4 additions & 5 deletions htdocs/adherents/admin/adherent_type_extrafields.php
View file
Expand Up @@ -59,7 +59,7 @@
* View
*/

$textobject=$langs->transnoentitiesnoconv("Members");
$textobject=$langs->transnoentitiesnoconv("MembersTypes");

$help_url='EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros';
llxHeader('',$langs->trans("MembersSetup"),$help_url);
Expand All @@ -71,7 +71,7 @@

$head = member_admin_prepare_head();

dol_fiche_head($head, 'attributes_type', $langs->trans("Member"), 0, 'user');
dol_fiche_head($head, 'attributes_type', $langs->trans("Members"), 0, 'user');


print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
Expand Down Expand Up @@ -106,7 +106,6 @@
print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=".$key."\">".img_delete()."</a></td>\n";
print "</tr>";
// $i++;
}

print "</table>";
Expand All @@ -125,8 +124,8 @@

/* ************************************************************************** */
/* */
/* Creation d'un champ optionnel
/* */
/* Creation d'un champ optionnel */
/* */
/* ************************************************************************** */

if ($action == 'create')
Expand Down
9 changes: 5 additions & 4 deletions htdocs/admin/agenda_extrafields.php
View file
Expand Up @@ -35,6 +35,7 @@

$langs->load("admin");
$langs->load("other");
$langs->load("agenda");

$extrafields = new ExtraFields($db);
$form = new Form($db);
Expand Down Expand Up @@ -63,8 +64,9 @@
* View
*/

$textobject=$langs->transnoentitiesnoconv("Agenda");

llxHeader();
llxHeader('',$langs->trans("AgendaSetup"));

$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'setup');
Expand Down Expand Up @@ -107,7 +109,6 @@
print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
print "</tr>";
// $i++;
}

print "</table>";
Expand All @@ -126,8 +127,8 @@

/* ************************************************************************** */
/* */
/* Creation d'un champ optionnel
/* */
/* Creation d'un champ optionnel */
/* */
/* ************************************************************************** */

if ($action == 'create')
Expand Down
14 changes: 11 additions & 3 deletions htdocs/admin/commande.php
View file
Expand Up @@ -146,15 +146,15 @@
}
}

if ($action == 'setmod')
else if ($action == 'setmod')
{
// TODO Verifier si module numerotation choisi peut etre active
// par appel methode canBeActivated

dolibarr_set_const($db, "COMMANDE_ADDON",$value,'chaine',0,'',$conf->entity);
}

if ($action == 'set_COMMANDE_DRAFT_WATERMARK')
else if ($action == 'set_COMMANDE_DRAFT_WATERMARK')
{
$draft = GETPOST("COMMANDE_DRAFT_WATERMARK");
$res = dolibarr_set_const($db, "COMMANDE_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity);
Expand All @@ -171,7 +171,7 @@
}
}

if ($action == 'set_COMMANDE_FREE_TEXT')
else if ($action == 'set_COMMANDE_FREE_TEXT')
{
$freetext = GETPOST("COMMANDE_FREE_TEXT"); // No alpha here, we want exact string

Expand All @@ -188,6 +188,14 @@
$mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
}
}
else if ($action='setModuleOptions') {
if (dolibarr_set_const($db, "COMMANDE_ADDON_PDF_ODT_PATH",GETPOST('value1'),'chaine',0,'',$conf->entity))
{
// La constante qui a ete lue en avant du nouveau set
// on passe donc par une variable pour avoir un affichage coherent
$conf->global->COMMANDE_ADDON_PDF_ODT_PATH = GETPOST('value1');
}
}


/*
Expand Down
6 changes: 3 additions & 3 deletions htdocs/admin/company.php
View file
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2011 Philippe Grand <philippe.grand@atoo-net.com>
Expand Down Expand Up @@ -268,7 +268,7 @@
$var=true;

print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td width="35%">'.$langs->trans("CompanyInfo").'</td><td>'.$langs->trans("Value").'</td></tr>'."\n";
print '<tr class="liste_titre"><th width="35%">'.$langs->trans("CompanyInfo").'</th><th>'.$langs->trans("Value").'</th></tr>'."\n";

$var=!$var;
print '<tr '.$bc[$var].'><td class="fieldrequired">'.$langs->trans("CompanyName").'</td><td>';
Expand Down Expand Up @@ -336,7 +336,7 @@

// Logo
$var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("Logo").' (png,jpg)</td><td>';
print '<tr'.dol_bc($var,'hideonsmartphone').'><td>'.$langs->trans("Logo").' (png,jpg)</td><td>';
print '<table width="100%" class="nocellnopadd"><tr class="nocellnopadd"><td valign="middle" class="nocellnopadd">';
print '<input type="file" class="flat" name="logo" size="50">';
print '</td><td valign="middle" align="right">';
Expand Down
18 changes: 10 additions & 8 deletions htdocs/admin/order_extrafields.php
View file
Expand Up @@ -4,6 +4,7 @@
* Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2012 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2013 Philippe Grand <philippe.grand@atoo-net.com>
*
* 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
Expand All @@ -20,9 +21,9 @@
*/

/**
* \file htdocs/admin/agenda_extrafields.php
* \ingroup agenda
* \brief Page to setup extra fields of agenda
* \file htdocs/admin/order_extrafields.php
* \ingroup order
* \brief Page to setup extra fields of order
*/

require '../main.inc.php';
Expand All @@ -35,6 +36,7 @@

$langs->load("admin");
$langs->load("other");
$langs->load("orders");

$extrafields = new ExtraFields($db);
$form = new Form($db);
Expand Down Expand Up @@ -63,11 +65,12 @@
* View
*/

$textobject=$langs->transnoentitiesnoconv("Orders");

llxHeader();
llxHeader('',$langs->trans("OrdersSetup"));

$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'setup');
print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'setup');
print "<br>\n";

$head = order_admin_prepare_head(null);
Expand Down Expand Up @@ -107,7 +110,6 @@
print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
print "</tr>";
// $i++;
}

print "</table>";
Expand All @@ -126,8 +128,8 @@

/* ************************************************************************** */
/* */
/* Creation d'un champ optionnel
/* */
/* Creation d'un champ optionnel */
/* */
/* ************************************************************************** */

if ($action == 'create')
Expand Down
9 changes: 8 additions & 1 deletion htdocs/admin/project.php
View file
Expand Up @@ -152,7 +152,14 @@

dolibarr_set_const($db, "PROJECT_ADDON",$value,'chaine',0,'',$conf->entity);
}

else if ($action='setModuleOptions') {
if (dolibarr_set_const($db, "PROJECT_ADDON_PDF_ODT_PATH",GETPOST('value1'),'chaine',0,'',$conf->entity))
{
// La constante qui a ete lue en avant du nouveau set
// on passe donc par une variable pour avoir un affichage coherent
$conf->global->PROJECT_ADDON_PDF_ODT_PATH = GETPOST('value1');
}
}
/*
* View
*/
Expand Down
16 changes: 3 additions & 13 deletions htdocs/admin/supplier_invoice.php
View file
Expand Up @@ -29,6 +29,7 @@

require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';

Expand Down Expand Up @@ -197,20 +198,9 @@

print "<br>";

$h = 0;
$head = supplierorder_admin_prepare_head(null);

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

$head[$h][0] = DOL_URL_ROOT."/admin/supplier_invoice.php";
$head[$h][1] = $langs->trans("SuppliersInvoice");
$head[$h][2] = 'Invoice';
$hselected=$h;
$h++;

dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
dol_fiche_head($head, 'invoice', $langs->trans("ModuleSetup"));


// Supplier invoice numbering module
Expand Down
17 changes: 3 additions & 14 deletions htdocs/admin/supplier_order.php
View file
Expand Up @@ -29,6 +29,7 @@

require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';

Expand Down Expand Up @@ -197,21 +198,9 @@

print "<br>";

$h = 0;
$head = supplierorder_admin_prepare_head(null);

$head[$h][0] = DOL_URL_ROOT."/admin/supplier_order.php";
$head[$h][1] = $langs->trans("SupplierOrder");
$head[$h][2] = 'Order';
$hselected=$h;
$h++;

$head[$h][0] = DOL_URL_ROOT."/admin/supplier_invoice.php";
$head[$h][1] = $langs->trans("SuppliersInvoice");
$head[$h][2] = 'Invoice';

$h++;

dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
dol_fiche_head($head, 'order', $langs->trans("ModuleSetup"));


// Supplier order numbering module
Expand Down

0 comments on commit 61b4305

Please sign in to comment.