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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2017-02-08 10:57:02 +01:00
commit dc0856413c
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/admin/external_rss.php
View File

@ -46,14 +46,17 @@ $action=GETPOST('action');
*/ */
// positionne la variable pour le nombre de rss externes // positionne la variable pour le nombre de rss externes
$sql ="SELECT MAX(".$db->decrypt('name').") as name FROM ".MAIN_DB_PREFIX."const"; $sql ="SELECT ".$db->decrypt('name')." as name FROM ".MAIN_DB_PREFIX."const";
$sql.=" WHERE ".$db->decrypt('name')." LIKE 'EXTERNAL_RSS_URLRSS_%'"; $sql.=" WHERE ".$db->decrypt('name')." LIKE 'EXTERNAL_RSS_URLRSS_%'";
$result=$db->query($sql); //print $sql;
$result=$db->query($sql); // We can't use SELECT MAX() because EXTERNAL_RSS_URLRSS_10 is lower than EXTERNAL_RSS_URLRSS_9
if ($result) if ($result)
{ {
$obj = $db->fetch_object($result); while ($obj = $db->fetch_object($result))
preg_match('/([0-9]+)$/i',$obj->name,$reg); {
if ($reg[1]) $lastexternalrss = $reg[1]; preg_match('/([0-9]+)$/i',$obj->name,$reg);
if ($reg[1] && $reg[1] > $lastexternalrss) $lastexternalrss = $reg[1];
}
} }
else else
{ {

1
htdocs/fourn/facture/list.php
View File

@ -46,6 +46,7 @@ if (!$user->rights->fournisseur->facture->lire) accessforbidden();
$langs->load("bills"); $langs->load("bills");
$langs->load("companies"); $langs->load("companies");
$langs->load('products'); $langs->load('products');
$langs->load('projects');
$socid = GETPOST('socid','int'); $socid = GETPOST('socid','int');

5
htdocs/societe/class/societe.class.php
View File

@ -3471,7 +3471,9 @@ class Societe extends CommonObject
*/ */
public function setCategories($categories, $type) public function setCategories($categories, $type)
{ {
// Decode type require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
// Decode type
if ($type == 'customer') { if ($type == 'customer') {
$type_id = Categorie::TYPE_CUSTOMER; $type_id = Categorie::TYPE_CUSTOMER;
$type_text = 'customer'; $type_text = 'customer';
@ -3489,7 +3491,6 @@ class Societe extends CommonObject
} }
// Get current categories // Get current categories
require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
$c = new Categorie($this->db); $c = new Categorie($this->db);
$existing = $c->containing($this->id, $type_id, 'id'); $existing = $c->containing($this->id, $type_id, 'id');