'."\n";
print '| '.$langs->trans("Name").' | ';
- print ''.$langs->trans("Poste").' | '.$langs->trans("Tel").' | ';
- print ''.$langs->trans("Fax").' | '.$langs->trans("EMail").' | ';
+ print ''.$langs->trans("Poste").' | ';
+ print ''.$langs->trans("PhonePro").' | ';
+ print ''.$langs->trans("PhoneMobile").' | ';
+ print ''.$langs->trans("Fax").' | '; // TODO Fax is obsolete, not used by several companies
+ print ''.$langs->trans("EMail").' | ';
print " | ";
if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
{
@@ -536,7 +539,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
}
print "
";
- $sql = "SELECT p.rowid, p.name, p.firstname, p.fk_pays, p.poste, p.phone, p.fax, p.email, p.note ";
+ $sql = "SELECT p.rowid, p.name, p.firstname, p.fk_pays, p.poste, p.phone, p.phone_mobile, p.fax, p.email, p.note ";
$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p";
$sql .= " WHERE p.fk_soc = ".$object->id;
$sql .= " ORDER by p.datec";
@@ -572,7 +575,10 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
print dol_print_phone($obj->phone,$country_code,$obj->rowid,$object->id,'AC_TEL');
print '';
print '';
- print dol_print_phone($obj->fax,$country_code,$obj->rowid,$object->id,'AC_FAX');
+ print dol_print_phone($obj->phone_mobile,$country_code,$obj->rowid,$object->id,'AC_TEL');
+ print ' | ';
+ print '';
+ print dol_print_phone($obj->fax,$country_code,$obj->rowid,$object->id,'AC_FAX'); // TODO Fax is obsolete, not used by several companies
print ' | ';
print '';
print dol_print_email($obj->email,$obj->rowid,$object->id,'AC_EMAIL');
diff --git a/htdocs/core/modules/modCommissions.class.php b/htdocs/core/modules/modCommissions.class.php
index 58b6daeed1b..bffd5907f2a 100644
--- a/htdocs/core/modules/modCommissions.class.php
+++ b/htdocs/core/modules/modCommissions.class.php
@@ -1,5 +1,6 @@
+/* Copyright (C) 2012 Christophe Battarel
+ * Copyright (C) 2012 Laurent Destailleur
*
* 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
@@ -12,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see .
*/
/**
diff --git a/htdocs/core/tpl/freeproductline_create.tpl.php b/htdocs/core/tpl/freeproductline_create.tpl.php
index 722b556fd28..17da725a80d 100644
--- a/htdocs/core/tpl/freeproductline_create.tpl.php
+++ b/htdocs/core/tpl/freeproductline_create.tpl.php
@@ -61,8 +61,10 @@
>
global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>
';
echo $form->select_type_of_lines(isset($_POST["type"])?$_POST["type"]:-1,'type',1);
- if ((! empty($conf->product->enabled) && ! empty($conf->service->enabled)) || (empty($conf->product->enabled) && empty($conf->service->enabled))) echo '
';
+ echo '';
if (is_object($hookmanager))
{
@@ -70,6 +72,8 @@
$reshook=$hookmanager->executeHooks('formCreateProductOptions',$parameters,$object,$action);
}
+ if ((! empty($conf->product->enabled) && ! empty($conf->service->enabled)) || (empty($conf->product->enabled) && empty($conf->service->enabled))) echo '
';
+
// Editor wysiwyg
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$nbrows=ROWS_2;
diff --git a/htdocs/core/tpl/objectline_add.tpl.php b/htdocs/core/tpl/objectline_add.tpl.php
index b9ec775b592..d9f35ad6971 100644
--- a/htdocs/core/tpl/objectline_add.tpl.php
+++ b/htdocs/core/tpl/objectline_add.tpl.php
@@ -84,9 +84,9 @@ if (! empty($conf->margin->enabled)) {
'update_textarea' => array(
'product_desc' => 'desc'
),
- 'show' => array(
- 'price_base_type_area'
- ),
+ //'show' => array(
+ //'price_base_type_area'
+ //),
'disabled' => array(
'select_type'
)
@@ -236,7 +236,7 @@ $(document).ready(function() {
//$('#origin_price_ttc_cache').val(data.price_ttc);
$('#origin_tva_tx_cache').val(data.tva_tx);
$('#select_type').val(data.type).attr('disabled','disabled').trigger('change');
- $('#price_base_type_area').show();
+ //$('#price_base_type_area').show();
if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined" && CKEDITOR.instances['product_desc'] != "undefined") {
CKEDITOR.instances['product_desc'].setData(data.desc).focus();
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index 71da7fd4e69..4629e2dcb22 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -87,6 +87,8 @@
$reshook=$hookmanager->executeHooks('formEditProductOptions',$parameters,$this,$action);
}
+ echo '
';
+
// editeur wysiwyg
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$nbrows=ROWS_2;
diff --git a/htdocs/core/tpl/predefinedproductline_create.tpl.php b/htdocs/core/tpl/predefinedproductline_create.tpl.php
index 3fadf385543..a3dc4f412dc 100644
--- a/htdocs/core/tpl/predefinedproductline_create.tpl.php
+++ b/htdocs/core/tpl/predefinedproductline_create.tpl.php
@@ -72,8 +72,9 @@ jQuery(document).ready(function() {
global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="4"' : ' colspan="3"'); ?>>
';
$form->select_produits('','idprod','',$conf->product->limit_size,$buyer->price_level);
- print '
';
+ echo '';
if (is_object($hookmanager))
{
@@ -81,6 +82,8 @@ jQuery(document).ready(function() {
$reshook=$hookmanager->executeHooks('formCreateProductOptions',$parameters,$object,$action);
}
+ echo '
';
+
// Editor wysiwyg
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$nbrows=ROWS_2;
diff --git a/htdocs/fourn/liste.php b/htdocs/fourn/liste.php
index 7589e021e6e..6ed18f2392c 100644
--- a/htdocs/fourn/liste.php
+++ b/htdocs/fourn/liste.php
@@ -33,6 +33,7 @@ $langs->load("companies");
$socname = GETPOST("socname");
$search_nom = GETPOST("search_nom");
+$search_zipcode = GETPOST("search_zipcode");
$search_ville = GETPOST("search_ville");
$search_code_fournisseur = GETPOST("search_code_fournisseur");
$search_compta_fournisseur = GETPOST("search_compta_fournisseur");
@@ -55,6 +56,17 @@ $pagenext = $page + 1;
if (! $sortorder) $sortorder="ASC";
if (! $sortfield) $sortfield="nom";
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+$hookmanager=new HookManager($db);
+$hookmanager->initHooks(array('supplierlist'));
+
+/*
+ * Actions
+ */
+
+$parameters=array();
+$reshook=$hookmanager->executeHooks('doActions',$parameters); // Note that $action and $object may have been modified by some hooks
/*
@@ -67,7 +79,7 @@ $thirdpartystatic=new Societe($db);
$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
llxHeader('',$langs->trans("ThirdParty"),$help_url);
-$sql = "SELECT s.rowid as socid, s.nom, s.ville, s.datec, s.datea, st.libelle as stcomm, s.prefix_comm, s.status as status, ";
+$sql = "SELECT s.rowid as socid, s.nom, s.cp as zip, s.ville, s.datec, s.datea, st.libelle as stcomm, s.prefix_comm, s.status as status, ";
$sql.= "code_fournisseur, code_compta_fournisseur";
if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
@@ -85,6 +97,7 @@ if ($socname)
$sortorder = "ASC";
}
if ($search_nom) $sql .= " AND s.nom LIKE '%".$db->escape($search_nom)."%'";
+if ($search_zipcode) $sql .= " AND s.cp LIKE '%".$db->escape($search_zipcode)."%'";
if ($search_ville) $sql .= " AND s.ville LIKE '%".$db->escape($search_ville)."%'";
if ($search_code_fournisseur) $sql .= " AND s.code_fournisseur LIKE '%".$db->escape($search_code_fournisseur)."%'";
if ($search_compta_fournisseur) $sql .= " AND s.code_compta_fournisseur LIKE '%".$db->escape($search_compta_fournisseur)."%'";
@@ -114,8 +127,7 @@ if ($resql)
print_barre_liste($langs->trans("ListOfSuppliers"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords);
- print ' |