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

htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php

@@ -38,9 +38,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
  */
 class doc_generic_order_odt extends ModelePDFCommandes
 {
-	public $emetteur;	// Objet societe qui emet
+	/**
+	 * Issuer
+	 * @var Societe
+	 */
+	public $emetteur;
 
 	public $phpmin = array(5,4,0);	// Minimum version of PHP required by module
+
+	/**
+     * Dolibarr version of the loaded document
+     * @public string
+     */
 	public $version = 'dolibarr';
 
 

htdocs/core/modules/commande/doc/pdf_einstein.modules.php

@@ -115,9 +115,9 @@ class pdf_einstein extends ModelePDFCommandes
 	public $marge_basse;
 
 	/**
-	* Issuer
+	 * Issuer
-	* @var Societe
+	 * @var Societe
-	*/
+	 */
     public $emetteur;	// Objet societe qui emet
 
 

htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php

@@ -37,9 +37,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
  */
 class doc_generic_contract_odt extends ModelePDFContract
 {
-	public $emetteur;	// Objet societe qui emet
+	/**
+	 * Issuer
+	 * @var Societe
+	 */
+	public $emetteur;
 
 	public $phpmin = array(5,4,0);	// Minimum version of PHP required by module
+
+	/**
+     * Dolibarr version of the loaded document
+     * @public string
+     */
 	public $version = 'dolibarr';
 
 

htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php

@@ -39,9 +39,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
  */
 class doc_generic_shipment_odt extends ModelePdfExpedition
 {
-	public $emetteur;	// Objet societe qui emet
+	/**
+	 * Issuer
+	 * @var Societe
+	 */
+	public $emetteur;
 
 	public $phpmin = array(5,4,0);	// Minimum version of PHP required by module
+
+	/**
+     * Dolibarr version of the loaded document
+     * @public string
+     */
 	public $version = 'dolibarr';
 
 

htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php

@@ -38,9 +38,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
  */
 class doc_generic_invoice_odt extends ModelePDFFactures
 {
+	/**
+	 * Issuer
+	 * @var Societe
+	 */
 	public $emetteur;	// Objet societe qui emet
 
 	public $phpmin = array(5,4,0);	// Minimum version of PHP required by module
+
+	/**
+     * Dolibarr version of the loaded document
+     * @public string
+     */
 	public $version = 'dolibarr';
 
 

htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php

@@ -36,9 +36,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
  */
 class doc_generic_product_odt extends ModelePDFProduct
 {
-	public $emetteur;	// Objet societe qui emet
+	/**
+	 * Issuer
+	 * @var Societe
+	 */
+	public $emetteur;
 
 	public $phpmin = array(5,4,0);	// Minimum version of PHP required by module
+
+	/**
+     * Dolibarr version of the loaded document
+     * @public string
+     */
 	public $version = 'dolibarr';
 
 

htdocs/core/modules/product/doc/pdf_standard.modules.php

@@ -58,9 +58,9 @@ class pdf_standard extends ModelePDFProduct
 
 	/**
      * @var array() Minimum version of PHP required by module.
-	 * e.g.: PHP ≥ 5.3 = array(5, 3)
+	 * e.g.: PHP ≥ 5.4 = array(5, 4)
      */
-	public $phpmin = array(5, 2);
+	public $phpmin = array(5, 4);
 
 	/**
      * Dolibarr version of the loaded document
@@ -76,7 +76,11 @@ class pdf_standard extends ModelePDFProduct
 	public $marge_haute;
 	public $marge_basse;
 
-    public $emetteur;	// Objet societe qui emet
+    /**
+	 * Issuer
+	 * @var Societe
+	 */
+	public $emetteur;
 
 
 	/**

htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php

@@ -54,9 +54,18 @@ if (! empty($conf->agenda->enabled))      require_once DOL_DOCUMENT_ROOT.'/comm/
  */
 class doc_generic_task_odt extends ModelePDFTask
 {
+	/**
+	 * Issuer
+	 * @var Societe
+	 */
 	public $emetteur;	// Objet societe qui emet
 
 	public $phpmin = array(5,4,0);	// Minimum version of PHP required by module
+
+	/**
+     * Dolibarr version of the loaded document
+     * @public string
+     */
 	public $version = 'dolibarr';
 
 

htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php

@@ -37,9 +37,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
  */
 class doc_generic_proposal_odt extends ModelePDFPropales
 {
+	/**
+	 * Issuer
+	 * @var Societe
+	 */
 	public $emetteur;	// Objet societe qui emet
 
 	public $phpmin = array(5,4,0);	// Minimum version of PHP required by module
+
+	/**
+     * Dolibarr version of the loaded document
+     * @public string
+     */
 	public $version = 'dolibarr';
 
 

htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php

@@ -36,9 +36,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
  */
 class doc_generic_stock_odt extends ModelePDFStock
 {
-	public $emetteur;	// Objet societe qui emet
+	/**
+	 * Issuer
+	 * @var Societe
+	 */
+	public $emetteur;
 
 	public $phpmin = array(5,4,0);	// Minimum version of PHP required by module
+
+	/**
+     * Dolibarr version of the loaded document
+     * @public string
+     */
 	public $version = 'dolibarr';
 
 

htdocs/core/modules/stock/doc/pdf_standard.modules.php

@@ -58,9 +58,9 @@ class pdf_standard extends ModelePDFStock
 
 	/**
      * @var array() Minimum version of PHP required by module.
-	 * e.g.: PHP ≥ 5.3 = array(5, 3)
+	 * e.g.: PHP ≥ 5.4 = array(5, 4)
      */
-	public $phpmin = array(5, 2);
+	public $phpmin = array(5, 4);
 
 	/**
      * Dolibarr version of the loaded document
@@ -76,7 +76,11 @@ class pdf_standard extends ModelePDFStock
 	public $marge_haute;
 	public $marge_basse;
 
-    public $emetteur;	// Objet societe qui emet
+    /**
+	 * Issuer
+	 * @var Societe
+	 */
+	public $emetteur;
 
 
 	/**

htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php

@@ -59,9 +59,9 @@ class pdf_stdmovement extends ModelePDFMovement
 
 	/**
      * @var array() Minimum version of PHP required by module.
-	 * e.g.: PHP ≥ 5.3 = array(5, 3)
+	 * e.g.: PHP ≥ 5.4 = array(5, 4)
      */
-	public $phpmin = array(5, 2);
+	public $phpmin = array(5, 4);
 
 	/**
      * Dolibarr version of the loaded document
@@ -77,7 +77,11 @@ class pdf_stdmovement extends ModelePDFMovement
 	public $marge_haute;
 	public $marge_basse;
 
-    public $emetteur;	// Objet societe qui emet
+    /**
+	 * Issuer
+	 * @var Societe
+	 */
+	public $emetteur;
 
 
 	/**

htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php

@@ -37,9 +37,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
  */
 class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 {
-	public $emetteur;	// Objet societe qui emet
+	/**
+	 * Issuer
+	 * @var Societe
+	 */
+	public $emetteur;
 
 	public $phpmin = array(5,4,0);	// Minimum version of PHP required by module
+
+	/**
+     * Dolibarr version of the loaded document
+     * @public string
+     */
 	public $version = 'dolibarr';
 
 

htdocs/core/modules/ticket/mod_ticket_simple.php

@@ -30,7 +30,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/ticket/modules_ticket.php';
  */
 class mod_ticket_simple extends ModeleNumRefTicket
 {
-    public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+    /**
+     * Dolibarr version of the loaded document
+     * @public string
+     */
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+
     public $prefix = 'TS';
     public $error = '';
     public $nom = "Simple";

htdocs/core/modules/ticket/mod_ticket_universal.php

@@ -29,7 +29,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/ticket/modules_ticket.php';
  */
 class mod_ticket_universal extends ModeleNumRefTicket
 {
-    public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+    /**
+     * Dolibarr version of the loaded document
+     * @public string
+     */
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+
     public $error = '';
     public $nom = 'Universal';
     public $name = 'Universal';

htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php

@@ -35,9 +35,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
  */
 class doc_generic_user_odt extends ModelePDFUser
 {
-	public $emetteur;	// Objet societe qui emet
+	/**
+	 * Issuer
+	 * @var Societe
+	 */
+	public $emetteur;
 
 	public $phpmin = array(5,4,0);	// Minimum version of PHP required by module
+
+	/**
+     * Dolibarr version of the loaded document
+     * @public string
+     */
 	public $version = 'dolibarr';
 
 

htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php

@@ -37,9 +37,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
  */
 class doc_generic_usergroup_odt extends ModelePDFUserGroup
 {
-	public $emetteur;	// Objet societe qui emet
+	/**
+	 * Issuer
+	 * @var Societe
+	 */
+	public $emetteur;
 
 	public $phpmin = array(5,4,0);	// Minimum version of PHP required by module
+
+	/**
+     * Dolibarr version of the loaded document
+     * @public string
+     */
 	public $version = 'dolibarr';
 
 

htdocs/expedition/shipment.php

@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2012-2015	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018       Philippe Grand          <philippe.grand@atoo-net.com>
  *
  * 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
@@ -921,8 +922,8 @@ if ($id > 0 || ! empty($ref))
 	}
 	else
 	{
-		/* Commande non trouvee */
+		/* Order not found */
-		print "Commande inexistante";
+		setEventMessages($langs->trans("NonExistentOrder"), null, 'errors');
 	}
 }
 

htdocs/langs/en_US/deliveries.lang

@@ -28,3 +28,4 @@ ErrorStockIsNotEnough=There's not enough stock
 Shippable=Shippable
 NonShippable=Not Shippable
 ShowReceiving=Show delivery receipt
+NonExistentOrder=Non-existent order

htdocs/stripe/charge.php

@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2018 	PtibogXIV        <support@ptibogxiv.net>
+/* Copyright (C) 2018 	Thibault FOUCART        <support@ptibogxiv.net>
  *
  * 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
@@ -62,13 +62,13 @@ llxHeader('', $langs->trans("StripeChargeList"));
 if (! empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox','alpha')))
 {
 	$service = 'StripeTest';
-  $servicestatus = '0';
+	$servicestatus = '0';
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
 }
 else
 {
-  $service = 'StripeLive';
+	$service = 'StripeLive';
-  $servicestatus = '1';
+	$servicestatus = '1';
 }
 
 $stripeacc = $stripe->getStripeAccount($service);
@@ -150,7 +150,7 @@ if (!$rowid)
 
 		print '<tr class="oddeven">';
     
-    if (! empty($conf->stripe->enabled) && !empty($stripeacc)) $connect=$stripeacc.'/';
+    if (!empty($stripeacc)) $connect=$stripeacc.'/';
     
 		// Ref
 		$url='https://dashboard.stripe.com/'.$connect.'test/payments/'.$charge->id;

htdocs/stripe/transaction.php

@@ -26,9 +26,7 @@ require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-if (! empty($conf->accounting->enabled)) {
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
-    require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
-}
 
 // Load translation files required by the page
 $langs->loadLangs(array('compta', 'salaries', 'bills', 'hrm', 'stripe'));
@@ -65,16 +63,16 @@ llxHeader('', $langs->trans("StripeTransactionList"));
 if (! empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox','alpha')))
 {
 	$service = 'StripeTest';
-  $servicestatus = '0';
+	$servicestatus = '0';
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
 }
 else
 {
 	$service = 'StripeLive';
-  $servicestatus = '1';
+	$servicestatus = '1';
 }
 
-$stripeaccount = $stripe->getStripeAccount($service);
+$stripeacc = $stripe->getStripeAccount($service);
 /*if (empty($stripeaccount))
 {
 	print $langs->trans('ErrorStripeAccountNotDefined');
@@ -83,9 +81,8 @@ $stripeaccount = $stripe->getStripeAccount($service);
 if (! $rowid) {
 
 	print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '">';
-	if ($optioncss != '') {
+	if ($optioncss != '')
-        print '<input type="hidden" name="optioncss" value="' . $optioncss . '">';
+		print '<input type="hidden" name="optioncss" value="' . $optioncss . '">';
-    }
 	print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="list">';
@@ -94,7 +91,7 @@ if (! $rowid) {
 	print '<input type="hidden" name="page" value="' . $page . '">';
 
 	$title=$langs->trans("StripeTransactionList");
-	$title.=($stripeaccount?' (Stripe connection with Stripe OAuth Connect account '.$stripeaccount.')':' (Stripe connection with keys from Stripe module setup)');
+	$title.=($stripeaccount?' (Stripe connection with Stripe OAuth Connect account '.$stripeacc.')':' (Stripe connection with keys from Stripe module setup)');
 
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit);
 
@@ -115,9 +112,9 @@ if (! $rowid) {
 
 	print "</tr>\n";
 
-	if ($stripeaccount)
+	if ($stripeacc)
 	{
-		$txn = \Stripe\BalanceTransaction::all(array("limit" => $limit), array("stripe_account" => $stripeaccount));
+		$txn = \Stripe\BalanceTransaction::all(array("limit" => $limit), array("stripe_account" => $stripeacc));
 	}
 	else
 	{
@@ -162,10 +159,11 @@ if (! $rowid) {
 		$societestatic->societe_id = $obj->fk_soc;
 
 		print '<tr class="oddeven">';
-
+		
+		// Ref
+    if (!empty($stripeacc)) $connect=$stripeacc.'/';
+    
 		// Ref
-    if (! empty($conf->stripe->enabled) && !empty($stripeacc)) $connect=$stripeacc.'/';
-
     if (preg_match('/po_/i', $txn->source)){
     $origin="payouts";
     } elseif (preg_match('/fee_/i', $txn->source)) {
@@ -175,15 +173,14 @@ if (! $rowid) {
     }
 
 		$url='https://dashboard.stripe.com/'.$connect.'test/'.$origin.'/'.$txn->source;
-
+			if ($servicestatus)
-		if ($servicestatus)
+			{
-		{
+				$url='https://dashboard.stripe.com/'.$connect.$origin.'/'.$txn->source;
-		$url='https://dashboard.stripe.com/'.$connect.$origin.'/'.$txn->source;
+			}
-		}
-
     if ($txn->type == 'stripe_fee' || $txn->type == 'reserve_transaction') {
-    print "<td>".$txn->type."</td>";
+    print "<td>".$txn->type."</td>";  
-    } else print "<td><a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'object_globe')." " . $txn->source . "</a></td>\n";
+    } else print "<td><a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'object_globe')." " . $txn->source . "</a></td>\n";  
+
 		// Stripe customer
 		//print "<td>".$charge->customer."</td>\n";
 		// Link
@@ -198,16 +195,15 @@ if (! $rowid) {
 		}
 		print "</td>\n";*/
 		// Origine
-
 		//print "<td>";
 		////if ($charge->metadata->dol_type=="order"){
 		//	$object = new Commande($db);
 		//	$object->fetch($charge->metadata->dol_id);
-		//	print "<A href='".DOL_URL_ROOT."/commande/card.php?id=".$charge->metadata->dol_id."'>".img_picto('', 'object_order')." ".$object->ref."</A>";
+		//	print "<a href='".DOL_URL_ROOT."/commande/card.php?id=".$charge->metadata->dol_id."'>".img_picto('', 'object_order')." ".$object->ref."</a>";
 		//} elseif ($charge->metadata->dol_type=="invoice"){
 		//	$object = new Facture($db);
 		//	$object->fetch($charge->metadata->dol_id);
-		//	print "<A href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$charge->metadata->dol_id."'>".img_picto('', 'object_invoice')." ".$object->ref."</A>";
+		//	print "<a href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$charge->metadata->dol_id."'>".img_picto('', 'object_invoice')." ".$object->ref."</a>";
 		//}
 		//print "</td>\n";
 		// Date payment
@@ -219,13 +215,12 @@ if (! $rowid) {
 		print "<td align=\"right\">" . price(($txn->fee) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency)) . "</td>";
 		// Status
 		print "<td align='right'>";
-        if ($txn->status=='available') {
+		if ($txn->status=='available')
-            print img_picto($langs->trans("".$txn->status.""),'statut4');
+ 		{print img_picto($langs->trans("".$txn->status.""),'statut4');} 
-        } elseif ($txn->status=='pending') {
+		elseif ($txn->status=='pending')
-            print img_picto($langs->trans("".$txn->status.""),'statut7');
+		{print img_picto($langs->trans("".$txn->status.""),'statut7');}
-        } elseif ($txn->status=='failed') {
+		elseif ($txn->status=='failed')
-		    print img_picto($langs->trans("".$txn->status.""),'statut8');
+		{print img_picto($langs->trans("".$txn->status.""),'statut8');}        
-        }
 		print '</td>';
 		print "</tr>\n";
 	}