diff --git a/ChangeLog b/ChangeLog index 322372ab8a2..aff7be3c35e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -250,6 +250,7 @@ Following changes may create regressions for some external modules, but were nec * Function showStripePaymentUrl, getStripePaymentUrl, showPaypalPaymentUrl and getPaypalPaymentUrl has been removed. The generic one showOnlinePaymentUrl and getOnlinePaymentUrl are always used. * Context for hook showSocinfoOnPrint has been moved from "showsocinfoonprint" to "main" * Library htdocs/includes/phpoffice/phpexcel as been removed (replaced with htdocs/includes/phpoffice/PhpSpreadsheet) +* Databse transaction in your triggers must be correctly balanced (one close for one open). If not, an error will be returned by the trigger, even if trigger did return error code. ***** ChangeLog for 12.0.4 compared to 12.0.3 ***** diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php index 2f92cd5842e..b93d82a59c0 100644 --- a/htdocs/accountancy/admin/productaccount.php +++ b/htdocs/accountancy/admin/productaccount.php @@ -372,26 +372,26 @@ if ($result) print ''; print ''.$langs->trans('Options').''.$langs->trans('Description').''; print "\n"; - print ' '.$langs->trans('OptionModeProductSell').''; + print ' '.$langs->trans('OptionModeProductSell').''; print ''.$langs->trans('OptionModeProductSellDesc'); print "\n"; if ($mysoc->isInEEC()) { - print ' '.$langs->trans('OptionModeProductSellIntra').''; + print ' '.$langs->trans('OptionModeProductSellIntra').''; print ''.$langs->trans('OptionModeProductSellIntraDesc'); print "\n"; } - print ' '.$langs->trans('OptionModeProductSellExport').''; + print ' '.$langs->trans('OptionModeProductSellExport').''; print ''.$langs->trans('OptionModeProductSellExportDesc'); print "\n"; - print ' '.$langs->trans('OptionModeProductBuy').''; + print ' '.$langs->trans('OptionModeProductBuy').''; print ''.$langs->trans('OptionModeProductBuyDesc')."\n"; if ($mysoc->isInEEC()) { - print ' '.$langs->trans('OptionModeProductBuyIntra').''; + print ' '.$langs->trans('OptionModeProductBuyIntra').''; print ''.$langs->trans('OptionModeProductBuyDesc')."\n"; } - print ' '.$langs->trans('OptionModeProductBuyExport').''; + print ' '.$langs->trans('OptionModeProductBuyExport').''; print ''.$langs->trans('OptionModeProductBuyDesc')."\n"; print "\n"; diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php index c45419daabf..9c4142daf58 100644 --- a/htdocs/accountancy/bookkeeping/list.php +++ b/htdocs/accountancy/bookkeeping/list.php @@ -674,7 +674,7 @@ if (!empty($arrayfields['t.piece_num']['checked'])) // Code journal if (!empty($arrayfields['t.code_journal']['checked'])) { - print ''; + print ''; } // Date document if (!empty($arrayfields['t.doc_date']['checked'])) diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php index 1871f517f02..40af8784817 100644 --- a/htdocs/accountancy/class/bookkeeping.class.php +++ b/htdocs/accountancy/class/bookkeeping.class.php @@ -315,6 +315,7 @@ class BookKeeping extends CommonObject $objnum = $this->db->fetch_object($resqlnum); $this->piece_num = $objnum->piece_num; } + dol_syslog(get_class($this).":: create this->piece_num=".$this->piece_num, LOG_DEBUG); if (empty($this->piece_num)) { $sqlnum = "SELECT MAX(piece_num)+1 as maxpiecenum"; @@ -327,8 +328,8 @@ class BookKeeping extends CommonObject $objnum = $this->db->fetch_object($resqlnum); $this->piece_num = $objnum->maxpiecenum; } + dol_syslog(get_class($this).":: create this->piece_num=".$this->piece_num, LOG_DEBUG); } - dol_syslog(get_class($this).":: create this->piece_num=".$this->piece_num, LOG_DEBUG); if (empty($this->piece_num)) { $this->piece_num = 1; } @@ -383,7 +384,6 @@ class BookKeeping extends CommonObject $sql .= ", ".(!isset($this->entity) ? $conf->entity : $this->entity); $sql .= ")"; - dol_syslog(get_class($this).":: create sql=".$sql, LOG_DEBUG); $resql = $this->db->query($sql); if ($resql) { $id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element); diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php index 9a78ea3bfc9..af636c5609d 100644 --- a/htdocs/accountancy/customer/lines.php +++ b/htdocs/accountancy/customer/lines.php @@ -176,7 +176,8 @@ print '