Permalink
Browse files

Merge remote-tracking branch 'dolibarr/develop' into develop

  • Loading branch information...
2 parents 6fccdad + 4077ed9 commit fcedea7aad2ae350afdb35b334e0223338a8cdb7 Regis Houssin committed Apr 12, 2012
@@ -31,7 +31,7 @@ PROJECT_NAME = dolibarr
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 3.2.0
+PROJECT_NUMBER = 3.3.0
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
@@ -2163,7 +2163,7 @@ function dol_print_error($db='',$error='')
$syslog.=", msg=".$msg;
}
}
- if (empty($dolibarr_main_prod) && $_SERVER['DOCUMENT_ROOT'] && function_exists('xdebug_call_file'))
+ if (empty($dolibarr_main_prod) && $_SERVER['DOCUMENT_ROOT'] && function_exists('xdebug_print_function_stack') && function_exists('xdebug_call_file'))
{
xdebug_print_function_stack();
$out.='<b>XDebug informations:</b>'."<br>\n";
@@ -69,6 +69,9 @@ class CommandeFournisseur extends Commande
var $cond_reglement_code;
var $mode_reglement_id;
var $mode_reglement_code;
+ var $user_author_id;
+ var $user_valid_id;
+ var $user_cloture_id;
var $extraparams=array();
@@ -111,8 +114,9 @@ function fetch($id,$ref='')
// Check parameters
if (empty($id) && empty($ref)) return -1;
- $sql = "SELECT c.rowid, c.ref, ref_supplier, c.date_creation, c.fk_soc, c.fk_user_author, c.fk_statut, c.amount_ht, c.total_ht, c.total_ttc, c.tva,";
+ $sql = "SELECT c.rowid, c.ref, ref_supplier, c.date_creation, c.fk_soc, c.fk_statut, c.amount_ht, c.total_ht, c.total_ttc, c.tva,";
$sql.= " c.localtax1, c.localtax2, ";
+ $sql.= " c.fk_user_author, c.fk_user_valid, c.fk_user_cloture,";
$sql.= " c.date_commande as date_commande, c.date_livraison as date_livraison, c.fk_cond_reglement, c.fk_mode_reglement, c.fk_projet as fk_project, c.remise_percent, c.source, c.fk_methode_commande,";
$sql.= " c.note as note_private, c.note_public, c.model_pdf, c.extraparams,";
$sql.= " cm.libelle as methode_commande,";
@@ -145,6 +149,8 @@ function fetch($id,$ref='')
$this->fourn_id = $obj->fk_soc;
$this->statut = $obj->fk_statut;
$this->user_author_id = $obj->fk_user_author;
+ $this->user_valid_id = $obj->fk_user_valid;
+ $this->user_cloture_id = $obj->fk_user_cloture;
$this->total_ht = $obj->total_ht;
$this->total_tva = $obj->tva;
$this->total_localtax1 = $obj->localtax1;
@@ -110,6 +110,7 @@ PaymentOrderRef=Paiement commande %s
CloneOrder=Cloner commande
ConfirmCloneOrder=Êtes-vous sûr de vouloir cloner cette commande <b>%s</b> ?
DispatchSupplierOrder=Réception de la commande fournisseur %s
+DateDeliveryPlanned=Date de livraison prévue
##### Types de contacts #####
TypeContact_commande_internal_SALESREPFOLL=Responsable suivi commande client
TypeContact_commande_internal_SHIPPING=Responsable envoi commande client

0 comments on commit fcedea7

Please sign in to comment.