Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc

CONTRIBUTING.md

@@ -40,17 +40,30 @@ Please don't edit the ChangeLog file. A project manager will update it from your
 Use clear commit messages with the following structure:
 
 <pre>
-KEYWORD Short description
+KEYWORD Short description (may be the bug number #456)
 
 Long description (Can span accross multiple lines).
 </pre>
 
 Where KEYWORD is one of:
 
-- "FIXED:" for bug fixes. In upper case to appear into ChangeLog. (May be followed by the bug number i.e: #456)
+- "Fixed" for bug fixes (May be followed by the bug number i.e: #456)
-- "NEW:" for new features. In upper case to appear into ChangeLog. (May be followed by the task number i.e: #123)
+- "Closed" for a commit to close a feature request issue (May be followed by the bug number i.e: #456)
 - void, don't put a keyword if the commit is not introducing feature or closing a bug.
 
+### Pull Requests
+When submitting a pull request, use following syntax:
+
+<pre>
+KEYWORD Short description (may be the bug number #456)
+</pre>
+
+Where KEYWORD is one of:
+
+- "FIXED" or "Fixed" for bug fixes. In upper case to appear into ChangeLog. (May be followed by the bug number i.e: #456)
+- "NEW" or "New" for new features. In upper case to appear into ChangeLog. (May be followed by the task number i.e: #123)
+
+
 ### Resources
 [Developer documentation](http://wiki.dolibarr.org/index.php/Developer_documentation)
 

htdocs/comm/card.php

@@ -7,6 +7,7 @@
  * Copyright (C) 2008      Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
  * Copyright (C) 2010-2014 Juanjo Menent               <jmenent@2byte.es>
  * Copyright (C) 2013      Alexandre Spangaro          <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015      Frederic France             <frederic.france@free.fr>
  *
  * 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
@@ -37,6 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 if (! empty($conf->facture->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 if (! empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+if (! empty($conf->expedition->enabled)) require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 if (! empty($conf->contrat->enabled)) require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 if (! empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 if (! empty($conf->ficheinter->enabled)) require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
@@ -44,6 +46,7 @@ if (! empty($conf->ficheinter->enabled)) require_once DOL_DOCUMENT_ROOT.'/fichin
 $langs->load("companies");
 if (! empty($conf->contrat->enabled))  $langs->load("contracts");
 if (! empty($conf->commande->enabled)) $langs->load("orders");
+if (! empty($conf->expedition->enabled)) $langs->load("sendings");
 if (! empty($conf->facture->enabled)) $langs->load("bills");
 if (! empty($conf->projet->enabled))  $langs->load("projects");
 if (! empty($conf->ficheinter->enabled)) $langs->load("interventions");
@@ -661,6 +664,73 @@ if ($id > 0)
 		}
 	}
 
+    /*
+     *   Last sendings
+     */
+    if (! empty($conf->expedition->enabled) && $user->rights->expedition->lire) {
+        $sendingstatic = new Expedition($db);
+
+        $sql = 'SELECT e.rowid as id';
+        $sql.= ', e.ref';
+        $sql.= ', e.date_creation';
+        $sql.= ', e.fk_statut as statut';
+        $sql.= ', s.nom';
+        $sql.= ', s.rowid as socid';
+        $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."expedition as e";
+        $sql.= " WHERE e.fk_soc = s.rowid AND s.rowid = ".$object->id;
+        $sql.= " AND e.entity = ".$conf->entity;
+        $sql.= ' GROUP BY e.rowid';
+        $sql.= ', e.ref';
+        $sql.= ', e.date_creation';
+        $sql.= ', e.fk_statut';
+        $sql.= ', s.nom';
+        $sql.= ', s.rowid';
+        $sql.= " ORDER BY e.date_creation DESC";
+
+        $resql = $db->query($sql);
+        if ($resql) {
+            $var = true;
+            $num = $db->num_rows($resql);
+            $i = 0;
+            if ($num > 0) {
+                print '<table class="noborder" width="100%">';
+
+                $tableaushown=1;
+                print '<tr class="liste_titre">';
+                print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastSendings",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/expedition/list.php?socid='.$object->id.'">'.$langs->trans("AllSendings").' <span class="badge">'.$num.'</span></a></td>';
+                print '<td width="20px" align="right"><a href="'.DOL_URL_ROOT.'/expedition/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"),'stats').'</a></td>';
+                print '</tr></table></td>';
+                print '</tr>';
+            }
+
+            while ($i < $num && $i < $MAXLIST) {
+                $objp = $db->fetch_object($resql);
+                $var = ! $var;
+                print "<tr " . $bc[$var] . ">";
+                print '<td class="nowrap">';
+                $sendingstatic->id = $objp->id;
+                $sendingstatic->ref = $objp->ref;
+                print $sendingstatic->getNomUrl(1);
+                print '</td>';
+                if ($objp->date_creation > 0) {
+                    print '<td align="right" width="80">'.dol_print_date($db->jdate($objp->date_creation),'day').'</td>';
+                } else {
+                    print '<td align="right"><b>!!!</b></td>';
+                }
+
+                print '<td align="right" class="nowrap" width="100" >' . $sendingstatic->LibStatut($objp->statut, 5) . '</td>';
+                print "</tr>\n";
+                $i++;
+            }
+            $db->free($resql);
+
+            if ($num > 0)
+                print "</table>";
+        } else {
+            dol_print_error($db);
+        }
+    }
+
 	/*
 	 * Last linked contracts
 	 */

htdocs/compta/bank/account.php

@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/loan/class/loan.class.php';
+require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
@@ -613,7 +613,7 @@ if ($id > 0 || ! empty($ref))
 					}
 					elseif ($links[$key]['type']=='payment_loan')
 					{
-						print '<a href="'.DOL_URL_ROOT.'/compta/loan/payment/card.php?id='.$links[$key]['url_id'].'">';
+						print '<a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$links[$key]['url_id'].'">';
 						print ' '.img_object($langs->trans('ShowPayment'),'payment').' ';
 						print '</a>';
 					}

htdocs/conf/conf.php.example

@@ -315,8 +315,10 @@ $dolibarr_main_db_prefix='';
 
 // multicompany_transverse_mode
 // Prerequisite: Need external module "multicompany"
-// Pyramidal (0): The rights and groups are managed in each entity. Each user belongs to the entity he was created into.
+// Pyramidal   (0): The rights and groups are managed in each entity. Each user belongs to the entity he was created into.
-// Transversal (1): The user is created and managed only into master entity but can login to all entities.
+// Transversal (1): The user is created and managed only into master entity but can login to all entities if he is admmin
+//                  of entity or belongs to at least one user group created into entity.
+
 // Default value: 0 (pyramidal)
 // Examples:
 // $multicompany_transverse_mode='1';

htdocs/fourn/card.php

@@ -351,7 +351,7 @@ if ($object->id > 0)
 				print '<td class="nowrap">';
 				print $productstatic->getNomUrl(1);
 				print '</td>';
-				print '<td align="center" width="80">';
+				print '<td align="center">';
 				print dol_trunc(dol_htmlentities($objp->label), 30);
 				print '</td>';
 				print '<td align="right" class="nowrap">'.dol_print_date($objp->tms).'</td>';

htdocs/langs/en_US/sendings.lang

@@ -2,6 +2,7 @@
 RefSending=Ref. shipment
 Sending=Shipment
 Sendings=Shipments
+AllSendings=All Shipments
 Shipment=Shipment
 Shipments=Shipments
 ShowSending=Show Sending