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

Merge remote-tracking branch 'origin/3.6' into develop

Browse Source 
Conflicts:
	ChangeLog
	htdocs/fourn/class/fournisseur.commande.class.php
This commit is contained in:
Laurent Destailleur 2014-08-30 18:27:34 +02:00
commit f64cb085a7
10 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/debian/dolibarr.postinst
View File

@ -129,7 +129,7 @@ case "$1" in
then
# Create an empty conf.php with permission to web server
setup_empty_conf
else
#else
# File already exist. We add params not found.
#echo Add new params to overwrite path to use shared libraries/fonts
#grep -q -c "dolibarr_lib_ADODB_PATH" $config || [ ! -d "/usr/share/php/adodb" ] || echo "<?php \$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; ?>" >> $config

2
build/exe/doliwamp/doliwamp.iss
View File

@ -32,7 +32,7 @@ AppPublisherURL=http://www.nltechno.com
AppSupportURL=http://www.dolibarr.org
AppUpdatesURL=http://www.dolibarr.org
AppComments=DoliWamp includes Dolibarr, Apache, PHP and Mysql softwares.
AppCopyright=Copyright (C) 2008-2013 Laurent Destailleur, NLTechno
AppCopyright=Copyright (C) 2008-2014 Laurent Destailleur, NLTechno
DefaultDirName=c:\dolibarr
DefaultGroupName=Dolibarr
;LicenseFile=COPYING

2
htdocs/cashdesk/affContenu.php
View File

@ -55,6 +55,8 @@ print '</div>';
print '<div class="principal">';
$page=GETPOST('menu','alpha');
if (empty($page)) $page='facturation';
if (in_array(
$page,
array(

29
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -194,7 +194,7 @@ class CommandeFournisseur extends CommonOrder
$this->extraparams = (array) json_decode($obj->extraparams, true);
$this->db->free($resql);
// Retreive all extrafield
// fetch optionals attributes and labels
require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
@ -658,7 +658,7 @@ class CommandeFournisseur extends CommonOrder
{
// Call trigger
$result=$this->call_trigger('ORDER_SUPPLIER_APPROVE',$user);
if ($result < 0) $error++;
if ($result < 0) $error++;
// End call triggers
}
@ -722,7 +722,7 @@ class CommandeFournisseur extends CommonOrder
$error++;
$this->db->rollback();
}
else
else
$this->db->commit();
// End call triggers
}
@ -774,7 +774,7 @@ class CommandeFournisseur extends CommonOrder
// Call trigger
$result=$this->call_trigger('ORDER_SUPPLIER_CANCEL',$user);
if ($result < 0) $error++;
if ($result < 0) $error++;
// End call triggers
if ($error == 0)
@ -967,7 +967,7 @@ class CommandeFournisseur extends CommonOrder
{
// Call trigger
$result=$this->call_trigger('ORDER_SUPPLIER_CREATE',$user);
if ($result < 0)
if ($result < 0)
{
$this->db->rollback();
return -1;
@ -1037,7 +1037,7 @@ class CommandeFournisseur extends CommonOrder
// Call trigger
$result=$this->call_trigger('ORDER_SUPPLIER_CLONE',$user);
if ($result < 0) $error++;
if ($result < 0) $error++;
// End call triggers
}
@ -1216,7 +1216,7 @@ class CommandeFournisseur extends CommonOrder
global $conf, $langs, $user;
// Call trigger
$result=$this->call_trigger('LINEORDER_SUPPLIER_CREATE',$user);
if ($result < 0)
if ($result < 0)
{
$this->db->rollback();
return -1;
@ -1285,7 +1285,7 @@ class CommandeFournisseur extends CommonOrder
global $conf, $langs, $user;
// Call trigger
$result=$this->call_trigger('LINEORDER_SUPPLIER_DISPATCH',$user);
if ($result < 0)
if ($result < 0)
{
$this->db->rollback();
return -1;
@ -1347,6 +1347,7 @@ class CommandeFournisseur extends CommonOrder
*/
function deleteline($idline, $notrigger=0)
{
global $user,$langs,$conf;
if ($this->statut == 0)
{
$this->db->begin();
@ -1355,7 +1356,7 @@ class CommandeFournisseur extends CommonOrder
{
// Call trigger
$result=$this->call_trigger('LINEORDER_SUPPLIER_DELETE',$user);
if ($result < 0) $error++;
if ($result < 0) $error++;
// End call triggers
}
@ -1403,7 +1404,7 @@ class CommandeFournisseur extends CommonOrder
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$error = 0;
// Call trigger
$result=$this->call_trigger('ORDER_SUPPLIER_DELETE',$user);
if ($result < 0)
@ -1412,7 +1413,7 @@ class CommandeFournisseur extends CommonOrder
return -1;
}
// End call triggers
$this->db->begin();
@ -1807,7 +1808,7 @@ class CommandeFournisseur extends CommonOrder
global $conf, $langs, $user;
// Call trigger
$result=$this->call_trigger('LINEORDER_SUPPLIER_UPDATE',$user);
if ($result < 0)
if ($result < 0)
{
$this->db->rollback();
return -1;
@ -1951,8 +1952,8 @@ class CommandeFournisseur extends CommonOrder
while ($obj=$this->db->fetch_object($resql))
{
$this->nbtodo++;
$date_to_test = empty($obj->delivery_date) ? $obj->datec : $obj->delivery_date;
$date_to_test = empty($obj->delivery_date) ? $obj->datec : $obj->delivery_date;
if ($obj->fk_statut != 3 && $this->db->jdate($date_to_test) < ($now - $conf->commande->fournisseur->warning_delay)) $this->nbtodolate++;
}
return 1;

2
htdocs/includes/ckeditor/contents.css
View File

@ -15,7 +15,7 @@ body
/* Remove the background color to make it transparent */
background-color: #fff;
margin: 20px;
margin: 8px;
}
.cke_editable

3
htdocs/install/mysql/migration/3.5.0-3.6.0.sql
View File

@ -297,6 +297,9 @@ create table llx_c_type_resource
active tinyint DEFAULT 1 NOT NULL
)ENGINE=innodb;
-- Fix llx_c_type_resource when you update from a 3.6-beta
ALTER TABLE llx_c_type_resource CHANGE libelle label VARCHAR(64) NOT NULL;
ALTER TABLE llx_c_type_resource ADD UNIQUE INDEX uk_c_type_resource_id (label, code);
-- Fix :: account_parent must be an int, not an account number

3
htdocs/langs/en_US/products.lang
View File

@ -80,11 +80,12 @@ ContractStatusClosed=Closed
ContractStatusRunning=Running
ContractStatusExpired=expired
ContractStatusOnHold=Not running
ContractStatusToRun=A mettre en service
ContractStatusToRun=To get running
ContractNotRunning=This contract is not running
ErrorProductAlreadyExists=A product with reference %s already exists.
ErrorProductBadRefOrLabel=Wrong value for reference or label.
ErrorProductClone=There was a problem while trying to clone the product or service.
ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
Suppliers=Suppliers
SupplierRef=Supplier's product ref.
ShowProduct=Show product

2
htdocs/product/class/product.class.php
View File

@ -1205,7 +1205,7 @@ class Product extends CommonObject
if ($newvat == '') $newvat=$this->tva_tx;
if (! empty($newminprice) && ($newminprice > $newprice))
{
$this->error='ErrorPricCanBeLowerThanMinPrice';
$this->error='ErrorPriceCantBeLowerThanMinPrice';
return -1;
}

2
htdocs/product/document.php
View File

@ -141,7 +141,7 @@ if ($object->id)
print '</div>';
$modulepart = 'produit';
$permission = $user->rights->produit->creer;
$permission = (($object->type == 0 && $user->rights->produit->creer) || ($object->type == 1 && $user->rights->service->creer));
$param = '&id=' . $object->id;
include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
}

8
htdocs/theme/eldy/style.css.php
View File

@ -244,6 +244,10 @@ a:hover { text-decoration: underline; color: #000000;}
input:focus, textarea:focus, button:focus, select:focus {
box-shadow: 0 0 4px #8091BF;
}
textarea.cke_source:focus
{
box-shadow: none;
}
input, input.flat, textarea, textarea.flat, form.flat select, select.flat {
font-size: <?php print $fontsize ?>px;
@ -2555,6 +2559,10 @@ A.none, A.none:active, A.none:visited, A.none:hover {
/* CKEditor */
/* ============================================================================== */
.cke_editable
{
margin: 5px !important;
}
.cke_editor table, .cke_editor tr, .cke_editor td
{
border: 0px solid #FF0000 !important;