' . $langs->trans('Error_OrderNotChecked') . '
'
- );
+if ($action == 'create')
+{
+ if (! is_array($selected))
+ {
+ $error++;
+ setEventMessages($langs->trans('Error_OrderNotChecked'), null, 'errors');
} else {
$origin = GETPOST('origin');
$originid = GETPOST('originid');
@@ -87,11 +88,12 @@ include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
$hookmanager = new HookManager($db);
$hookmanager->initHooks(array('orderstoinvoicesupplier'));
+
/*
* Actions
*/
-if (($action == 'create' || $action == 'add') && empty($mesgs)) {
+if (($action == 'create' || $action == 'add') && ! $error) {
require_once DOL_DOCUMENT_ROOT . '/core/lib/fourn.lib.php';
if (! empty($conf->projet->enabled))
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index d14a43764d7..d0edbd1f458 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1736,7 +1736,7 @@ else
{
$num = $db->num_rows($result);
$i = 0; $totalpaye = 0;
- print '';
+ print '';
print '';
print '| '.$langs->trans('Payments').' | ';
print ''.$langs->trans('Date').' | ';
diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index 70f1f3422ea..a07dbc48168 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -853,24 +853,30 @@ function write_conf_file($conffile)
fputs($fp,"\n");
/* Authentication */
+ fputs($fp, '// Authentication settings');
+ fputs($fp,"\n");
+
fputs($fp, '$dolibarr_main_authentication=\'dolibarr\';');
fputs($fp,"\n\n");
- fputs($fp, '// Specific settings');
+ fputs($fp, '//$dolibarr_main_demo=\'autologin,autopass\';');
fputs($fp,"\n");
- fputs($fp, '//$dolibarr_main_demo=\'autologin,autopass\';');
+ fputs($fp, '// Security settings');
fputs($fp,"\n");
fputs($fp, '$dolibarr_main_prod=\'0\';');
fputs($fp,"\n");
- fputs($fp, '$dolibarr_nocsrfcheck=\'0\';');
- fputs($fp,"\n");
-
fputs($fp, '$dolibarr_main_force_https=\''.$main_force_https.'\';');
fputs($fp,"\n");
+ fputs($fp, '$dolibarr_main_restrict_os_commands=\'mysqldump, mysql, pg_dump, pgrestore\';');
+ fputs($fp,"\n");
+
+ fputs($fp, '$dolibarr_nocsrfcheck=\'0\';');
+ fputs($fp,"\n");
+
fputs($fp, '$dolibarr_main_cookie_cryptkey=\''.$key.'\';');
fputs($fp,"\n");
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index d7936f43c32..df340688a67 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -512,6 +512,8 @@ Module5000Name=Multi-company
Module5000Desc=Allows you to manage multiple companies
Module6000Name=Workflow
Module6000Desc=Workflow management
+Module10000Name=Websites
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
Module20000Name=Leave Requests management
Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product lot
@@ -1589,3 +1591,4 @@ DetectionNotPossible=Detection not possible
UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on database user table and will be checked on each future access)
ListOfAvailableAPIs=List of available APIs
activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
+CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter $dolibarr_main_restrict_os_commands into conf.php file.
\ No newline at end of file
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 01e57a756b9..af2f6174315 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -323,6 +323,7 @@ NextDateToExecution=Date for next invoice generation
DateLastGeneration=Date of latest generation
MaxPeriodNumber=Max nb of invoice generation
NbOfGenerationDone=Nb of invoice generation already done
+MaxGenerationReached=Maximum nb of generations reached
InvoiceAutoValidate=Validate invoices automatically
GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
DateIsNotEnough=Date not reached yet
diff --git a/htdocs/langs/en_US/printing.lang b/htdocs/langs/en_US/printing.lang
index 14577a126e4..2da614e96f9 100644
--- a/htdocs/langs/en_US/printing.lang
+++ b/htdocs/langs/en_US/printing.lang
@@ -51,3 +51,5 @@ IPP_Supported=Type of media
DirectPrintingJobsDesc=This page lists printing jobs found for available printers.
GoogleAuthNotConfigured=Google OAuth setup not done. Enable module OAuth and set a Google ID/Secret.
GoogleAuthConfigured=Google OAuth credentials found into setup of module OAuth.
+PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
+PrintTestDescprintgcp=List of Printers for Google Cloud Print.
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index a6f2ba51f23..b1b8d601430 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -83,7 +83,7 @@ SetDefaultBarcodeType=Set barcode type
BarcodeValue=Barcode value
NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
ServiceLimitedDuration=If product is a service with limited duration:
-MultiPricesAbility=Several level of prices per product/service
+MultiPricesAbility=Several segment of prices per product/service (each customer is in one segment)
MultiPricesNumPrices=Number of prices
AssociatedProductsAbility=Activate the package feature
AssociatedProducts=Package product
@@ -174,13 +174,13 @@ AlwaysUseNewPrice=Always use current price of product/service
AlwaysUseFixedPrice=Use the fixed price
PriceByQuantity=Different prices by quantity
PriceByQuantityRange=Quantity range
-MultipriceRules=Price level rules
-UseMultipriceRules=Use price level rules (defined into product module setup) to autocalculate prices of all other level according to first level
+MultipriceRules=Price segment rules
+UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment
PercentVariationOver=%% variation over %s
PercentDiscountOver=%% discount over %s
### composition fabrication
Build=Produce
-ProductsMultiPrice=Products and prices for each price level
+ProductsMultiPrice=Products and prices for each price segment
ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
ProductSellByQuarterHT=Products turnover quarterly before tax
ServiceSellByQuarterHT=Services turnover quarterly before tax
@@ -201,9 +201,9 @@ DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar c
BarCodeDataForProduct=Barcode information of product %s :
BarCodeDataForThirdparty=Barcode information of thirdparty %s :
ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
-PriceByCustomer=Different price for each customer
-PriceCatalogue=Unique price per product/service
-PricingRule=Rules for customer prices
+PriceByCustomer=Different prices for each customer
+PriceCatalogue=A single sell price per product/service
+PricingRule=Rules for sell prices
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
PriceByCustomerLog=Log of previous customer prices
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index f77239535a6..45e86b50686 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -833,7 +833,8 @@ class Livraison extends CommonObject
$now=dol_now();
- // Charge tableau des produits prodids
+ // Load array of products prodids
+ $num_prods = 0;
$prodids = array();
$sql = "SELECT rowid";
$sql.= " FROM ".MAIN_DB_PREFIX."product";
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index faac1a20e10..a5addbc705a 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -416,7 +416,7 @@ if ($resql)
if (! empty($arrayfields['p.opp_amount']['checked'])) print_liste_field_titre($arrayfields['p.opp_amount']['label'],$_SERVER["PHP_SELF"],'p.opp_amount',"",$param,'align="right"',$sortfield,$sortorder);
if (! empty($arrayfields['p.fk_opp_status']['checked'])) print_liste_field_titre($arrayfields['p.fk_opp_status']['label'],$_SERVER["PHP_SELF"],'p.fk_opp_status',"",$param,'align="center"',$sortfield,$sortorder);
if (! empty($arrayfields['p.opp_percent']['checked'])) print_liste_field_titre($arrayfields['p.opp_percent']['label'],$_SERVER["PHP_SELF"],'p.opp_percent',"",$param,'align="right"',$sortfield,$sortorder);
- if (! empty($arrayfields['p.budget_amount']['checked'])) print_liste_field_titre($arrayfields['p.budget_amount']['label'],$_SERVER["PHP_SELF"],'p.budget_amount',"",$param,'align="center"',$sortfield,$sortorder);
+ if (! empty($arrayfields['p.budget_amount']['checked'])) print_liste_field_titre($arrayfields['p.budget_amount']['label'],$_SERVER["PHP_SELF"],'p.budget_amount',"",$param,'align="right"',$sortfield,$sortorder);
// Extra fields
if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
{
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index fd7f266e159..00efb287dcc 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -2186,7 +2186,8 @@ class SupplierProposal extends CommonObject
{
global $user,$langs,$conf;
- // Charge tableau des produits prodids
+ // Load array of products prodids
+ $num_prods = 0;
$prodids = array();
$sql = "SELECT rowid";
$sql.= " FROM ".MAIN_DB_PREFIX."product";
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 979c2622ae3..9e9cf97706c 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -4093,7 +4093,7 @@ select {
/* display: inline-block; */ /* We can't set this. This disable ability to make */
/* TODO modified by jmobile, replace jmobile with pure css*/
overflow:hidden;
- white-space: nowrap;
+ white-space: nowrap; /* Enabling this make behaviour strange when selecting the empty value if this empty value is '' instead of ' ' */
text-overflow: ellipsis;
}
.fiche .ui-controlgroup {
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 28b1040f579..032628e4e67 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -54,6 +54,7 @@ $mode = GETPOST('mode','alpha');
$confirm = GETPOST('confirm','alpha');
$subaction = GETPOST('subaction','alpha');
$group = GETPOST("group","int",3);
+$cancel = GETPOST('cancel');
// Define value to know what current user can do on users
$canadduser=(! empty($user->admin) || $user->rights->user->user->creer);
@@ -299,7 +300,8 @@ if (empty($reshook)) {
}
}
- if ($action == 'update' && !$_POST["cancel"]) {
+ if ($action == 'update' && ! $cancel)
+ {
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
if ($caneditfield) // Case we can edit all field
@@ -395,7 +397,7 @@ if (empty($reshook)) {
if (!$error) {
$ret = $object->update($user);
if ($ret < 0) {
- $error ++;
+ $error++;
if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
$langs->load("errors");
setEventMessages($langs->trans("ErrorLoginAlreadyExists", $object->login), null, 'errors');
@@ -1440,6 +1442,49 @@ else
print '
';
}
+ // Multicompany
+ // TODO This should be done with hook formObjectOption
+ if (is_object($mc))
+ {
+ if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
+ {
+ print '| '.$langs->trans("Entity").' | ';
+ if (empty($object->entity))
+ {
+ print $langs->trans("AllEntities");
+ }
+ else
+ {
+ $mc->getInfo($object->entity);
+ print $mc->label;
+ }
+ print " |
\n";
+ }
+ }
+
+ if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER))
+ {
+ print '| '.$langs->trans("OpenIDURL").' | ';
+ print ''.$object->openid.' | ';
+ print "
\n";
+ }
+
+ print '| '.$langs->trans("LastConnexion").' | ';
+ print ''.dol_print_date($object->datelastlogin,"dayhour").' | ';
+ print "
\n";
+
+ print '| '.$langs->trans("PreviousConnexion").' | ';
+ print ''.dol_print_date($object->datepreviouslogin,"dayhour").' | ';
+ print "
\n";
+
+ // Other attributes
+ $parameters=array();
+ $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+ if (empty($reshook) && ! empty($extrafields->attribute_label))
+ {
+ print $object->showOptionals($extrafields);
+ }
+
// Company / Contact
if (! empty($conf->societe->enabled))
{
@@ -1488,49 +1533,6 @@ else
print ''."\n";
}
- // Multicompany
- // TODO This should be done with hook formObjectOption
- if (is_object($mc))
- {
- if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
- {
- print '| '.$langs->trans("Entity").' | ';
- if (empty($object->entity))
- {
- print $langs->trans("AllEntities");
- }
- else
- {
- $mc->getInfo($object->entity);
- print $mc->label;
- }
- print " |
\n";
- }
- }
-
- if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER))
- {
- print '| '.$langs->trans("OpenIDURL").' | ';
- print ''.$object->openid.' | ';
- print "
\n";
- }
-
- print '| '.$langs->trans("LastConnexion").' | ';
- print ''.dol_print_date($object->datelastlogin,"dayhour").' | ';
- print "
\n";
-
- print '| '.$langs->trans("PreviousConnexion").' | ';
- print ''.dol_print_date($object->datepreviouslogin,"dayhour").' | ';
- print "
\n";
-
- // Other attributes
- $parameters=array();
- $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
- if (empty($reshook) && ! empty($extrafields->attribute_label))
- {
- print $object->showOptionals($extrafields);
- }
-
print "
\n";
print '';
@@ -2222,7 +2224,7 @@ else
print '';
$cate_arbo = $form->select_all_categories( Categorie::TYPE_CONTACT, null, null, null, null, 1 );
$c = new Categorie( $db );
- $cats = $c->containing( $object->id, 'user' );
+ $cats = $c->containing($object->id, Categorie::TYPE_USER);
foreach ($cats as $cat) {
$arrayselected[] = $cat->id;
}
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 6a19be4da1e..5b79447736e 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1332,14 +1332,14 @@ class User extends CommonObject
// If user is linked to a member, remove old link to this member
if ($this->fk_member > 0)
{
- $sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member = NULL where fk_member = ".$this->fk_member;
- dol_syslog(get_class($this)."::update", LOG_DEBUG);
+ dol_syslog(get_class($this)."::update remove link with member. We will recreate it later", LOG_DEBUG);
+ $sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member = NULL where fk_member = ".$this->fk_member;
$resql = $this->db->query($sql);
if (! $resql) { $this->error=$this->db->error(); $this->db->rollback(); return -5; }
}
// Set link to user
+ dol_syslog(get_class($this)."::update set link with member", LOG_DEBUG);
$sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member =".($this->fk_member>0?$this->fk_member:'null')." where rowid = ".$this->id;
- dol_syslog(get_class($this)."::update", LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql) { $this->error=$this->db->error(); $this->db->rollback(); return -5; }
@@ -1347,6 +1347,8 @@ class User extends CommonObject
{
if ($this->fk_member > 0 && ! $nosyncmember)
{
+ dol_syslog(get_class($this)."::update user is linked with a member. We try to update member too.", LOG_DEBUG);
+
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
// This user is linked with a member, so we also update members informations
@@ -1360,7 +1362,9 @@ class User extends CommonObject
$adh->lastname=$this->lastname;
$adh->login=$this->login;
$adh->gender=$this->gender;
+
$adh->pass=$this->pass;
+
$adh->societe=(empty($adh->societe) && $this->societe_id ? $this->societe_id : $adh->societe);
$adh->email=$this->email;
@@ -1373,17 +1377,19 @@ class User extends CommonObject
$adh->user_id=$this->id;
$adh->user_login=$this->login;
- $result=$adh->update($user,0,1);
- if ($result < 0)
+ $result=$adh->update($user,0,1,0);
+ if ($result < 0)
{
- $this->error=$luser->error;
- dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
+ $this->error=$adh->error;
+ $this->errors=$adh->errors;
+ dol_syslog(get_class($this)."::update error after calling adh->update to sync it with user: ".$this->error, LOG_ERR);
$error++;
}
}
else
{
$this->error=$adh->error;
+ $this->errors=$adh->errors;
$error++;
}
}
@@ -1495,7 +1501,7 @@ class User extends CommonObject
$password=getRandomPassword(false);
}
- // Crypte avec md5
+ // Crypt password
$password_crypted = dol_hash($password);
// Mise a jour
@@ -1539,7 +1545,7 @@ class User extends CommonObject
if ($result >= 0)
{
- $result=$adh->setPassword($user,$this->pass,0,1); // Cryptage non gere dans module adherent
+ $result=$adh->setPassword($user,$this->pass,(empty($conf->global->DATABASE_PWD_ENCRYPTED)?0:1),1); // Cryptage non gere dans module adherent
if ($result < 0)
{
$this->error=$adh->error;
diff --git a/scripts/product/migrate_picture_path.php b/scripts/product/migrate_picture_path.php
index 9d3cba8452f..f8624ebc040 100755
--- a/scripts/product/migrate_picture_path.php
+++ b/scripts/product/migrate_picture_path.php
@@ -1,6 +1,6 @@
#!/usr/bin/env php
+/* Copyright (C) 2007-2016 Laurent Destailleur
* Copyright (C) 2015 Jean Heimburger
*
* This program is free software; you can redistribute it and/or modify
@@ -21,7 +21,6 @@
* \file scripts/product/migrate_picture_path.php
* \ingroup scripts
* \brief Migrate pictures from old system prior to 3.7 to new path for 3.7+
- *
*/
$sapi_type = php_sapi_name();
@@ -119,7 +118,7 @@ function migrate_product_photospath($product)
$handle=opendir($origin_osencoded);
if (is_resource($handle))
{
- while (($file = readdir($handle)) != false)
+ while (($file = readdir($handle)) !== false)
{
if ($file != '.' && $file != '..' && is_dir($origin_osencoded.'/'.$file))
{
@@ -127,7 +126,7 @@ function migrate_product_photospath($product)
if (is_resource($thumbs))
{
dol_mkdir($destin.'/'.$file);
- while (($thumb = readdir($thumbs)) != false)
+ while (($thumb = readdir($thumbs)) !== false)
{
dol_move($origin.'/'.$file.'/'.$thumb, $destin.'/'.$file.'/'.$thumb);
}
diff --git a/test/phpunit/CategorieTest.php b/test/phpunit/CategorieTest.php
index d9e030ef9ef..574a8d793f9 100644
--- a/test/phpunit/CategorieTest.php
+++ b/test/phpunit/CategorieTest.php
@@ -200,7 +200,7 @@ class CategorieTest extends PHPUnit_Framework_TestCase
// Get list of categories for product
$localcateg=new Categorie($this->savdb);
- $listofcateg=$localcateg->containing($localobject2->id, 'product', 'label');
+ $listofcateg=$localcateg->containing($localobject2->id, Categorie::TYPE_PRODUCT, 'label');
$this->assertTrue(in_array('Specimen Category for product',$listofcateg), 'Categ not found linked to product when it should');
return $id;
diff --git a/test/phpunit/PgsqlTest.php b/test/phpunit/PgsqlTest.php
index f25ea3ea72f..05efcaeb30b 100644
--- a/test/phpunit/PgsqlTest.php
+++ b/test/phpunit/PgsqlTest.php
@@ -162,11 +162,17 @@ class PgsqlTest extends PHPUnit_Framework_TestCase
print __METHOD__." result=".$result."\n";
$this->assertEquals($result, $sql.' DEFERRABLE INITIALLY IMMEDIATE;');
- // Create a constraint
- $sql='SELECT a.b, GROUP_CONCAT(a.c) FROM table GROUP BY a.b';
+ // Test GROUP_CONCAT (without SEPARATOR)
+ $sql="SELECT a.b, GROUP_CONCAT(a.c) FROM table GROUP BY a.b";
$result=DoliDBPgsql::convertSQLFromMysql($sql);
print __METHOD__." result=".$result."\n";
- $this->assertEquals($result, "SELECT a.b, STRING_AGG(a.c, ',') FROM table GROUP BY a.b");
+ $this->assertEquals($result, "SELECT a.b, STRING_AGG(a.c, ',') FROM table GROUP BY a.b", 'Test GROUP_CONCAT (without SEPARATOR)');
+
+ // Test GROUP_CONCAT (with SEPARATOR)
+ $sql="SELECT a.b, GROUP_CONCAT(a.c SEPARATOR ',') FROM table GROUP BY a.b";
+ $result=DoliDBPgsql::convertSQLFromMysql($sql);
+ print __METHOD__." result=".$result."\n";
+ $this->assertEquals($result, "SELECT a.b, STRING_AGG(a.c, ',') FROM table GROUP BY a.b", 'Test GROUP_CONCAT (with SEPARATOR)');
return $result;
}
|
elseif (preg_match('/