diff --git a/ChangeLog b/ChangeLog index 59e16dbd0a1..8c53d58dc1e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ English Dolibarr ChangeLog ***** ChangeLog for 2.8 compared to 2.7 ***** For users: +- New: Initial sold can be conciliated. - New: task #9935: Can edit accountancy code. - New: Add a default errors-to email for emailing module. - New: Can filter on user on stock movement list. diff --git a/htdocs/compta/bank/account.class.php b/htdocs/compta/bank/account.class.php index 9deb9782e27..117ff08bb3d 100644 --- a/htdocs/compta/bank/account.class.php +++ b/htdocs/compta/bank/account.class.php @@ -98,7 +98,7 @@ class Account extends CommonObject /** - * \briref Add a link between bank line record and its source + * \brief Add a link between bank line record and its source * \param line_id Id ecriture bancaire * \param url_id Id parametre url * \param url Url @@ -368,7 +368,7 @@ class Account extends CommonObject $sql.= ", '".$this->db->idate($this->date_solde)."'"; $sql.= ", '".$this->db->idate($this->date_solde)."'"; $sql.= ", 'SOLD'"; - $sql.= ", 1"; + $sql.= ", 0"; // Not conciliated by default $sql.= ")"; $this->db->query($sql); @@ -706,7 +706,7 @@ class Account extends CommonObject } /** - * \brief + * \brief */ function datev_next($rowid) { @@ -731,7 +731,7 @@ class Account extends CommonObject } /** - * \brief + * \brief */ function datev_previous($rowid) { diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index 371632dec97..42fe36d3a4b 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -162,7 +162,7 @@ if ($user->rights->banque->consolidate && $_POST["action"] == 'num_releve') /* - * Affichage fiche ligne ecriture en mode edition + * View */ llxHeader();