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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2014-09-02 12:46:57 +02:00
commit 4fdfe05168
24 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -102,6 +102,8 @@ For users:
- Fix: debian script syntax error - Fix: debian script syntax error
- Fix: error "menu param is not inside list" into pos module. - Fix: error "menu param is not inside list" into pos module.
- Fix: Salary payments are not reflected on the reporting sheets - Fix: Salary payments are not reflected on the reporting sheets
- Fix: Unsubscribe emailing not working
- Fix: Trigger on create category call failed because user is not passed on card
***** ChangeLog for 3.6 compared to 3.5.* ***** ***** ChangeLog for 3.6 compared to 3.5.* *****
For users: For users:

4
htdocs/admin/limits.php
View File

@ -204,9 +204,9 @@ else
// Add vat rates examples specific to country // Add vat rates examples specific to country
$vat_rates=array(); $vat_rates=array();
$sql.="SELECT taux as vat_rate"; $sql="SELECT taux as vat_rate";
$sql.=" FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c"; $sql.=" FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
$sql.=" WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$mysoc->country_code."' AND taux != 0"; $sql.=" WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$mysoc->country_code."' AND taux <> 0";
$sql.=" ORDER BY t.taux ASC"; $sql.=" ORDER BY t.taux ASC";
$resql=$db->query($sql); $resql=$db->query($sql);
if ($resql) if ($resql)

2
htdocs/core/lib/admin.lib.php
View File

@ -508,7 +508,7 @@ function dolibarr_set_const($db, $name, $value, $type='chaine', $visible=0, $not
/** /**
* Prepare array with list of tabs * Prepare array with list of tabs
* *
* @return array Array of tabs to shoc * @return array Array of tabs to show
*/ */
function security_prepare_head() function security_prepare_head()
{ {

4
htdocs/core/lib/agenda.lib.php
View File

@ -360,7 +360,7 @@ function show_array_last_actions_done($max=5)
/** /**
* Prepare array with list of tabs * Prepare array with list of tabs
* *
* @return array Array of tabs to shoc * @return array Array of tabs to show
*/ */
function agenda_prepare_head() function agenda_prepare_head()
{ {
@ -405,7 +405,7 @@ function agenda_prepare_head()
* Prepare array with list of tabs * Prepare array with list of tabs
* *
* @param object $object Object related to tabs * @param object $object Object related to tabs
* @return array Array of tabs to shoc * @return array Array of tabs to show
*/ */
function actions_prepare_head($object) function actions_prepare_head($object)
{ {

2
htdocs/core/lib/bank.lib.php
View File

@ -28,7 +28,7 @@
* Prepare array with list of tabs * Prepare array with list of tabs
* *
* @param Object $object Object related to tabs * @param Object $object Object related to tabs
* @return array Array of tabs to shoc * @return array Array of tabs to show
*/ */
function bank_prepare_head($object) function bank_prepare_head($object)
{ {

2
htdocs/core/lib/categories.lib.php
View File

@ -27,7 +27,7 @@
* *
* @param Object $object Object related to tabs * @param Object $object Object related to tabs
* @param string $type Type of category * @param string $type Type of category
* @return array Array of tabs to shoc * @return array Array of tabs to show
*/ */
function categories_prepare_head($object,$type) function categories_prepare_head($object,$type)
{ {

2
htdocs/core/lib/contact.lib.php
View File

@ -26,7 +26,7 @@
* Prepare array with list of tabs * Prepare array with list of tabs
* *
* @param Object $object Object related to tabs * @param Object $object Object related to tabs
* @return array Array of tabs to shoc * @return array Array of tabs to show
*/ */
function contact_prepare_head($object) function contact_prepare_head($object)
{ {

2
htdocs/core/lib/contract.lib.php
View File

@ -26,7 +26,7 @@
* Prepare array with list of tabs * Prepare array with list of tabs
* *
* @param Object $object Object related to tabs * @param Object $object Object related to tabs
* @return array Array of tabs to shoc * @return array Array of tabs to show
*/ */
function contract_prepare_head($object) function contract_prepare_head($object)
{ {

8
htdocs/core/lib/ecm.lib.php
View File

@ -27,7 +27,7 @@
* Prepare array with list of different ecm main dashboard * Prepare array with list of different ecm main dashboard
* *
* @param object $object Object related to tabs * @param object $object Object related to tabs
* @return array Array of tabs to shoc * @return array Array of tabs to show
*/ */
function ecm_prepare_dasboard_head($object) function ecm_prepare_dasboard_head($object)
{ {
@ -64,7 +64,7 @@ function ecm_prepare_dasboard_head($object)
* Prepare array with list of tabs * Prepare array with list of tabs
* *
* @param object $object Object related to tabs * @param object $object Object related to tabs
* @return array Array of tabs to shoc * @return array Array of tabs to show
*/ */
function ecm_prepare_head($object) function ecm_prepare_head($object)
{ {
@ -84,7 +84,7 @@ function ecm_prepare_head($object)
* Prepare array with list of tabs * Prepare array with list of tabs
* *
* @param Object $object Object related to tabs * @param Object $object Object related to tabs
* @return array Array of tabs to shoc * @return array Array of tabs to show
*/ */
function ecm_file_prepare_head($object) function ecm_file_prepare_head($object)
{ {
@ -104,7 +104,7 @@ function ecm_file_prepare_head($object)
* Prepare array with list of tabs * Prepare array with list of tabs
* *
* @param object $object Object related to tabs * @param object $object Object related to tabs
* @return array Array of tabs to shoc * @return array Array of tabs to show
*/ */
function ecm_prepare_head_fm($object) function ecm_prepare_head_fm($object)
{ {

2
htdocs/core/lib/emailing.lib.php
View File

@ -25,7 +25,7 @@
* Prepare array with list of tabs * Prepare array with list of tabs
* *
* @param Object $object Object related to tabs * @param Object $object Object related to tabs
* @return array Array of tabs to shoc * @return array Array of tabs to show
*/ */
function emailing_prepare_head($object) function emailing_prepare_head($object)
{ {

2
htdocs/core/lib/fichinter.lib.php
View File

@ -28,7 +28,7 @@
* Prepare array with list of tabs * Prepare array with list of tabs
* *
* @param Object $object Object related to tabs * @param Object $object Object related to tabs
* @return array Array of tabs to shoc * @return array Array of tabs to show
*/ */
function fichinter_prepare_head($object) function fichinter_prepare_head($object)
{ {

2
htdocs/core/lib/fiscalyear.lib.php
View File

@ -25,7 +25,7 @@
* Prepare array with list of tabs * Prepare array with list of tabs
* *
* @param Object $object Object related to tabs * @param Object $object Object related to tabs
* @return array Array of tabs to shoc * @return array Array of tabs to show
*/ */
function fiscalyear_prepare_head($object) function fiscalyear_prepare_head($object)
{ {

4
htdocs/core/lib/fourn.lib.php
View File

@ -29,7 +29,7 @@
* Prepare array with list of tabs * Prepare array with list of tabs
* *
* @param Object $object Object related to tabs * @param Object $object Object related to tabs
* @return array Array of tabs to shoc * @return array Array of tabs to show
*/ */
function facturefourn_prepare_head($object) function facturefourn_prepare_head($object)
{ {
@ -92,7 +92,7 @@ function facturefourn_prepare_head($object)
* Prepare array with list of tabs * Prepare array with list of tabs
* *
* @param Object $object Object related to tabs * @param Object $object Object related to tabs
* @return array Array of tabs to shoc * @return array Array of tabs to show
*/ */
function ordersupplier_prepare_head($object) function ordersupplier_prepare_head($object)
{ {

2
htdocs/core/lib/order.lib.php
View File

@ -29,7 +29,7 @@
* Prepare array with list of tabs * Prepare array with list of tabs
* *
* @param Object $object Object related to tabs * @param Object $object Object related to tabs
* @return array Array of tabs to shoc * @return array Array of tabs to show
*/ */
function commande_prepare_head($object) function commande_prepare_head($object)
{ {

2
htdocs/core/lib/prelevement.lib.php
View File

@ -29,7 +29,7 @@
* Prepare array with list of tabs * Prepare array with list of tabs
* *
* @param Object $object Object related to tabs * @param Object $object Object related to tabs
* @return array Array of tabs to shoc * @return array Array of tabs to show
*/ */
function prelevement_prepare_head($object) function prelevement_prepare_head($object)
{ {

2
htdocs/core/lib/product.lib.php
View File

@ -29,7 +29,7 @@
* *
* @param Object $object Object related to tabs * @param Object $object Object related to tabs
* @param User $user Object user * @param User $user Object user
* @return array Array of tabs to shoc * @return array Array of tabs to show
*/ */
function product_prepare_head($object, $user) function product_prepare_head($object, $user)
{ {

6
htdocs/core/lib/project.lib.php
View File

@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
* Prepare array with list of tabs * Prepare array with list of tabs
* *
* @param Object $object Object related to tabs * @param Object $object Object related to tabs
* @return array Array of tabs to shoc * @return array Array of tabs to show
*/ */
function project_prepare_head($object) function project_prepare_head($object)
{ {
@ -113,7 +113,7 @@ function project_prepare_head($object)
* Prepare array with list of tabs * Prepare array with list of tabs
* *
* @param Object $object Object related to tabs * @param Object $object Object related to tabs
* @return array Array of tabs to shoc * @return array Array of tabs to show
*/ */
function task_prepare_head($object) function task_prepare_head($object)
{ {
@ -170,7 +170,7 @@ function task_prepare_head($object)
/** /**
* Prepare array with list of tabs * Prepare array with list of tabs
* *
* @return array Array of tabs to shoc * @return array Array of tabs to show
*/ */
function project_admin_prepare_head() function project_admin_prepare_head()
{ {

2
htdocs/core/lib/propal.lib.php
View File

@ -27,7 +27,7 @@
* Prepare array with list of tabs * Prepare array with list of tabs
* *
* @param object $object Object related to tabs * @param object $object Object related to tabs
* @return array Array of tabs to shoc * @return array Array of tabs to show
*/ */
function propal_prepare_head($object) function propal_prepare_head($object)
{ {

4
htdocs/core/lib/sendings.lib.php
View File

@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
* Prepare array with list of tabs * Prepare array with list of tabs
* *
* @param Object $object Object related to tabs * @param Object $object Object related to tabs
* @return array Array of tabs to shoc * @return array Array of tabs to show
*/ */
function shipping_prepare_head($object) function shipping_prepare_head($object)
{ {
@ -85,7 +85,7 @@ function shipping_prepare_head($object)
* Prepare array with list of tabs * Prepare array with list of tabs
* *
* @param Object $object Object related to tabs * @param Object $object Object related to tabs
* @return array Array of tabs to shoc * @return array Array of tabs to show
*/ */
function delivery_prepare_head($object) function delivery_prepare_head($object)
{ {

2
htdocs/core/lib/stock.lib.php
View File

@ -25,7 +25,7 @@
* Prepare array with list of tabs * Prepare array with list of tabs
* *
* @param Object $object Object related to tabs * @param Object $object Object related to tabs
* @return array Array of tabs to shoc * @return array Array of tabs to show
*/ */
function stock_prepare_head($object) function stock_prepare_head($object)
{ {

2
htdocs/core/lib/tax.lib.php
View File

@ -29,7 +29,7 @@
* Prepare array with list of tabs * Prepare array with list of tabs
* *
* @param Object $object Object related to tabs * @param Object $object Object related to tabs
* @return array Array of tabs to shoc * @return array Array of tabs to show
*/ */
function tax_prepare_head($object) function tax_prepare_head($object)
{ {

2
htdocs/core/lib/trip.lib.php
View File

@ -25,7 +25,7 @@
* Prepare array with list of tabs * Prepare array with list of tabs
* *
* @param Object $object Object related to tabs * @param Object $object Object related to tabs
* @return array Array of tabs to shoc * @return array Array of tabs to show
*/ */
function trip_prepare_head($object) function trip_prepare_head($object)
{ {

4
htdocs/core/lib/usergroups.lib.php
View File

@ -27,7 +27,7 @@
* Prepare array with list of tabs * Prepare array with list of tabs
* *
* @param Object $object Object related to tabs * @param Object $object Object related to tabs
* @return array Array of tabs to shoc * @return array Array of tabs to show
*/ */
function user_prepare_head($object) function user_prepare_head($object)
{ {
@ -178,7 +178,7 @@ function group_prepare_head($object)
/** /**
* Prepare array with list of tabs * Prepare array with list of tabs
* *
* @return array Array of tabs to shoc * @return array Array of tabs to show
*/ */
function user_admin_prepare_head() function user_admin_prepare_head()
{ {

3
htdocs/public/emailing/mailing-unsubscribe.php
View File

@ -3,6 +3,7 @@
* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2005-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2012 Florian Henry <florian.henry@open-concept.pro> * Copyright (C) 2012 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -85,7 +86,7 @@ if (! empty($tag) && ($unsuscrib=='1'))
$resql=$db->query($sql); $resql=$db->query($sql);
//Update status communication of contact prospect //Update status communication of contact prospect
$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET no_email=1 WHERE rowid IN (SELECT rowid FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.tag = '".$db->escape($tag)."' AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)"; $sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET no_email=1 WHERE rowid IN (SELECT sc.rowid FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.tag = '".$db->escape($tag)."' AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
dol_syslog("public/emailing/mailing-unsubscribe.php : Mail unsubcribe contact : ".$sql, LOG_DEBUG); dol_syslog("public/emailing/mailing-unsubscribe.php : Mail unsubcribe contact : ".$sql, LOG_DEBUG);
$resql=$db->query($sql); $resql=$db->query($sql);