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

htdocs/bookmarks/class/bookmark.class.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2005 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2015 Marcos García       <marcosgdf@gmail.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
@@ -64,6 +64,11 @@ class Bookmark extends CommonObject
 	 */
 	public $fk_user;
 
+    /**
+     * Date creation record (datec)
+     *
+     * @var integer
+     */
     public $datec;	
 
     public $url;

htdocs/compta/bank/class/account.class.php

@@ -1693,13 +1693,27 @@ class AccountLine extends CommonObject
      */
     public $ref;
 
-	public $datec;
+	/**
+     * Date creation record (datec)
+     *
+     * @var integer
+     */
+    public $datec;	
+    
+    /**
+     * Date (dateo)
+     *
+     * @var integer
+     */
 	public $dateo;
 
 	/**
-	 * Value date
+     * Date value (datev)
-	 */
+     *
+     * @var integer
+     */
 	public $datev;
+	
 	public $amount;
 
     /**

htdocs/compta/deplacement/class/deplacement.class.php

@@ -57,7 +57,18 @@ class Deplacement extends CommonObject
 	 */
 	public $ismultientitymanaged = 0;
 
-	public $datec;         // Creation date
+	/**
+     * Date creation record (datec)
+     *
+     * @var integer
+     */
+    public $datec;	
+    
+    /**
+     * Date (dated)
+     *
+     * @var integer
+     */
 	public $dated;
 
 	/**

htdocs/core/class/comment.class.php

@@ -43,9 +43,19 @@ class Comment extends CommonObject
 	 */
 	public $description;
     
+	/**
+     * Date modification record (tms)
+     *
+     * @var integer
+     */
 	public $tms;
 
-	public $datec;
+	/**
+     * Date creation record (datec)
+     *
+     * @var integer
+     */
+    public $datec;	
 
 	/**
      * @var int ID

htdocs/core/class/discount.class.php

@@ -73,7 +73,12 @@ class DiscountAbsolute
 	 */
 	public $description;
 
-    public $datec;					// Date creation
+    /**
+     * Date creation record (datec)
+     *
+     * @var integer
+     */
+    public $datec;
 
     /**
      * @var int ID invoice line when a discount is used into an invoice line (for absolute discounts)

htdocs/core/class/fiscalyear.class.php

@@ -64,9 +64,27 @@ class Fiscalyear extends CommonObject
 	 */
 	public $label;
     
+	/**
+     * Date start (date_start)
+     *
+     * @var integer
+     */
 	public $date_start;
+	
+	/**
+     * Date end (date_end)
+     *
+     * @var integer
+     */
 	public $date_end;
-	public $datec;
+	
+	/**
+     * Date creation record (datec)
+     *
+     * @var integer
+     */
+    public $datec;
+    
 	public $statut;		// 0=open, 1=closed
 
 	/**

htdocs/fichinter/class/fichinter.class.php

@@ -5,8 +5,8 @@
  * Copyright (C) 2011-2013 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2015      Charlie Benke        <charlie@patas-monkey.com>
- * Copyright (C) 2018      Nicolas ZABOURI	<info@inovea-conseil.com>
+ * Copyright (C) 2018      Nicolas ZABOURI	    <info@inovea-conseil.com>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018      Frédéric France      <frederic.france@netlogic.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
@@ -69,12 +69,26 @@ class Fichinter extends CommonObject
 	public $socid;		// Id client
 
 	public $author;
-	public $datec;
+	
+	/**
+     * Date creation record (datec)
+     *
+     * @var integer
+     */
+    public $datec;
+    
 	public $datev;
 	public $dateo;
 	public $datee;
 	public $datet;
-	public $datem;
+	
+	/**
+     * Date modification record (tms)
+     *
+     * @var integer
+     */
+    public $datem;	
+    
 	public $duration;
 	public $statut = 0;		// 0=draft, 1=validated, 2=invoiced, 3=Terminate
 

htdocs/fourn/class/fournisseur.facture.class.php

@@ -5,7 +5,7 @@
  * Copyright (C) 2005		Marc Barilley			<marc@ocebo.com>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2010-2017	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2013-2018	Philippe Grand			<philippe.grand@atoo-net.com>
+ * Copyright (C) 2013-2019	Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2014-2016	Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2015		Bahfir Abbes			<bafbes@gmail.com>
@@ -113,10 +113,35 @@ class FactureFournisseur extends CommonInvoice
 
     public $author;
     public $libelle;
-    public $datec;            // Creation date
+    
-    public $tms;              // Last update date
+    /**
-    public $date;             // Invoice date
+     * Date creation record (datec)
-    public $date_echeance;    // Max payment date
+     *
+     * @var integer
+     */
+    public $datec;
+    
+    /**
+     * Date modification record (tms)
+     *
+     * @var integer
+     */
+    public $tms;
+    
+    /**
+     * Invoice date (date)
+     *
+     * @var integer
+     */
+    public $date;             
+    
+    /**
+     * Max payment date (date_echeance)
+     *
+     * @var integer
+     */
+    public $date_echeance;    
+    
     public $amount=0;
     public $remise=0;
     public $tva=0;

htdocs/install/mysql/migration/9.0.0-10.0.0.sql

@@ -271,3 +271,7 @@ ALTER TABLE llx_expensereport_det ADD COLUMN subprice double(24,8) DEFAULT 0 NOT
 ALTER TABLE llx_product_attribute_combination ADD INDEX idx_product_att_com_product_parent (fk_product_parent);
 ALTER TABLE llx_product_attribute_combination ADD INDEX idx_product_att_com_product_child (fk_product_child);
 
+ALTER TABLE llx_product ADD COLUMN fk_project integer DEFAULT NULL;
+ALTER TABLE llx_product ADD INDEX idx_product_fk_project (fk_project);
+
+ALTER TABLE llx_actioncomm ADD COLUMN calling_duration integer;

htdocs/install/mysql/tables/llx_product.key.sql

@@ -30,6 +30,7 @@ ALTER TABLE llx_product ADD INDEX idx_product_seuil_stock_alerte (seuil_stock_al
 ALTER TABLE llx_product ADD INDEX idx_product_fk_country (fk_country);
 ALTER TABLE llx_product ADD INDEX idx_product_fk_user_author (fk_user_author);
 ALTER TABLE llx_product ADD INDEX idx_product_fk_barcode_type (fk_barcode_type);
+ALTER TABLE llx_product ADD INDEX idx_product_fk_project (fk_project);
 ALTER TABLE llx_product ADD UNIQUE INDEX uk_product_barcode (barcode, fk_barcode_type, entity);
 ALTER TABLE llx_product ADD CONSTRAINT fk_product_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid);
 

htdocs/install/mysql/tables/llx_product.sql

@@ -94,5 +94,6 @@ create table llx_product
   fk_price_expression           integer,                            -- Link to the rule for dynamic price calculation
   desiredstock                  integer      DEFAULT 0,
   fk_unit                       integer      DEFAULT NULL,
-  price_autogen                 tinyint DEFAULT 0
+  price_autogen                 tinyint      DEFAULT 0,
+  fk_project                    integer      DEFAULT NULL           -- Used when product was generated by a project or is specifif to a project
 )ENGINE=innodb;

htdocs/societe/class/companybankaccount.class.php

@@ -40,8 +40,19 @@ class CompanyBankAccount extends Account
 	public $rum;
 	public $date_rum;
 
-	public $datec;
+	/**
-	public $datem;
+     * Date creation record (datec)
+     *
+     * @var integer
+     */
+    public $datec;
+    
+	/**
+     * Date modification record (tms)
+     *
+     * @var integer
+     */
+    public $datem;
 
 
 	/**

htdocs/societe/class/companypaymentmode.class.php

@@ -169,8 +169,21 @@ class CompanyPaymentMode extends CommonObject
 
 	public $starting_date;
 	public $ending_date;
-	public $datec;
+	
-	public $tms;
+	/**
+     * Date creation record (datec)
+     *
+     * @var integer
+     */
+    public $datec;
+	
+	/**
+     * Date modification record (tms)
+     *
+     * @var integer
+     */
+    public $tms;
+    
 	public $import_key;
 	// END MODULEBUILDER PROPERTIES
 

htdocs/takepos/invoice.php

@@ -87,11 +87,12 @@ if (($action=="addline" || $action=="freezone") && $placeid == 0)
 {
 	$invoice->socid = $conf->global->CASHDESK_ID_THIRDPARTY;
 	$invoice->date = dol_now();
-	$invoice->ref = "(PROV-POS-".$place.")";
 	$invoice->module_source = 'takepos';
 	$invoice->pos_source = (string) $place;
 
 	$placeid = $invoice->create($user);
+	$sql="UPDATE ".MAIN_DB_PREFIX."facture set ref='(PROV-POS-".$place.")' where rowid=".$placeid;
+	$db->query($sql);
 }
 
 if ($action == "addline") {

htdocs/user/class/user.class.php

@@ -7,7 +7,7 @@
  * Copyright (C) 2005-2017  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2005       Lionel Cousteix         <etm_ltd@tiscali.co.uk>
  * Copyright (C) 2011       Herve Prot              <herve.prot@symeos.com>
- * Copyright (C) 2013-2018  Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2013-2019  Philippe Grand          <philippe.grand@atoo-net.com>
  * Copyright (C) 2013-2015  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2018       charlene Benke          <charlie@patas-monkey.com>
@@ -108,8 +108,19 @@ class User extends CommonObject
 	//! Encrypted password in database (always defined)
 	public $pass_indatabase_crypted;
 
-	public $datec;
+	/**
-	public $datem;
+     * Date creation record (datec)
+     *
+     * @var integer
+     */
+    public $datec;
+    
+	/**
+     * Date modification record (tms)
+     *
+     * @var integer
+     */
+    public $datem;
 
 	//! If this is defined, it is an external user
 	/**

htdocs/user/class/userbankaccount.class.php

@@ -36,7 +36,18 @@ class UserBankAccount extends Account
 {
     public $socid;
 
+    /**
+     * Date creation record (datec)
+     *
+     * @var integer
+     */
     public $datec;	
+    
+    /**
+     * Date modification record (tms)
+     *
+     * @var integer
+     */
     public $datem;