lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
93,618 Commits 43 Branches 150 Tags 886 MiB
1f441deb5d
Commit Graph

93618 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
1f441deb5d
Merge pull request #16237 from AlexisLaurier/13.0 
13.0 - Fix db begin() not closed into commande.class.php
 2021-02-09 18:06:36 +01:00
Laurent Destailleur
2e6dde6209
Merge pull request #16239 from frederic34/patch-3 
remove debug in V13
 2021-02-09 18:05:54 +01:00
Frédéric FRANCE
07668167f6
Update card.php 2021-02-09 15:18:07 +01:00
Frédéric FRANCE
8d13e9231f
remove debug 2021-02-09 15:05:32 +01:00
LAURIER Alexis
abf2875eba
commande.class.php - move db->begin() into cloture 
A DB begin request was sent before executing the status guard. If the guard fails, we exited the method without closing it. And it will occur a bug to any further database operation.
 2021-02-09 14:25:45 +01:00
Laurent Destailleur
67fe91f6aa Prepare 13.0.1 2021-02-09 14:15:21 +01:00
Laurent Destailleur
48a4ed656b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/projet/element.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2021-02-09 14:08:49 +01:00
Laurent Destailleur
a84bc05f01
Merge pull request #16146 from FHenry/12_fix_pricemin_PRODUIT_CUSTOMER_PRICES 
FIX: manage price min for PRODUIT_CUSTOMER_PRICES
 2021-02-09 13:39:25 +01:00
Laurent Destailleur
1efee54541
Merge pull request #16230 from FHenry/12_fix_error_assignement 
12 fix error assignement
 2021-02-09 13:22:57 +01:00
Laurent Destailleur
8acc5e1486 Fix calculation of profit 2021-02-08 23:37:32 +01:00
Laurent Destailleur
9453caa5be Avoid message when not required 2021-02-08 22:12:12 +01:00
Florian HENRY
6bcb63c53d fix indent 2021-02-08 20:46:59 +01:00
Florian HENRY
ff6b5c768d fix indent 2021-02-08 20:46:21 +01:00
Florian HENRY
dbbebba497 this->errors is set on triggers action must be set by callers 2021-02-08 20:44:40 +01:00
Laurent Destailleur
6df6286688 Fix IMAP_FORCE_NORSH and option for imap without ssl 2021-02-08 19:21:32 +01:00
Laurent Destailleur
6e6b5973b8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-08 17:35:44 +01:00
Laurent Destailleur
8b3c872f2a Fix warning 2021-02-08 17:35:21 +01:00
Laurent Destailleur
3b1143df91
Merge pull request #16223 from ATM-Consulting/fix/12.0_order_addline_remove_warning 
FIX: warning when adding a line if $remise_percent is an empty string
 2021-02-08 17:34:29 +01:00
Laurent Destailleur
d073e809e7 FIX removed no more used proc update_modified_column_date_m on pgsql 2021-02-08 17:32:36 +01:00
Laurent Destailleur
9a9686ed6c
Merge pull request #16222 from WascarDev/13.0 
FIX #16143
 2021-02-08 17:31:27 +01:00
Laurent Destailleur
6892ad9630 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
 2021-02-08 17:25:05 +01:00
Florian Mortgat
ff3707b650 FIX: warning when adding a line if $remise_percent is an empty string 2021-02-08 17:24:40 +01:00
Laurent Destailleur
78052e3239 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-08 17:20:24 +01:00
Laurent Destailleur
a143635f53 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-08 17:20:17 +01:00
Laurent Destailleur
25823d7b90
Merge pull request #16158 from atm-lena/FIX_12.0_SUPPLIER_OBJECTLINE_CONF_DISPLAY 
Add hidden conf to display supplier in object lines
 2021-02-08 16:58:28 +01:00
Adrien Jussak
ee1a4ee54f FIX #16143 
Remove the function update_modified_column_date_m is required because old triggers can throw errors during PDF generation
 2021-02-08 16:47:46 +01:00
Laurent Destailleur
fe9d23e90b Update functions.lib.php 2021-02-08 15:10:14 +01:00
Frédéric FRANCE
e15e8bcd05 Update functions.lib.php 2021-02-08 15:10:07 +01:00
Laurent Destailleur
ff9070ff9c
Merge pull request #16206 from atm-maxime/fix_supp_inv_backtolistlink 
Fix links to go back on supplier invoice list
 2021-02-08 15:04:23 +01:00
lmarcouiller
a140625a8a Fix search by statut in list of holiday module 2021-02-08 15:03:58 +01:00
Laurent Destailleur
b04c342939 FIX #16215 2021-02-08 15:00:57 +01:00
Laurent Destailleur
9f9ace0565 FIX Localtax must be converted with price2num 2021-02-07 22:15:21 +01:00
Laurent Destailleur
8f4bd10a8d
Merge pull request #16190 from FHenry/13_fix_checkdeposit_pdf_folder 
FIX: #16189, fix download/see check deposit PDF
 2021-02-07 21:34:18 +01:00
Laurent Destailleur
21d3519d42 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-07 20:13:38 +01:00
Laurent Destailleur
cb94216098
Merge pull request #16205 from atm-maxime/fix_supp_inv_list_leftjoin 
Fix #15940 mixing different joins
 2021-02-07 19:58:33 +01:00
Laurent Destailleur
45789ec21c Fix TZ problems 
Conflicts:
	htdocs/core/lib/company.lib.php
 2021-02-07 19:47:33 +01:00
Maxime Kohlhaas
414a2366fb Fix links to go back on supplier invoice list 2021-02-07 19:28:00 +01:00
Maxime Kohlhaas
0e1353733d Fix #15940 mixing different joins 2021-02-07 19:21:52 +01:00
LAURIER Alexis
a48c03923f
Merge pull request #7 from Dolibarr/13.0 
13.0
 2021-02-07 19:06:35 +01:00
Laurent Destailleur
536ddd4832 Fix look and feel v13 2021-02-07 17:54:20 +01:00
Laurent Destailleur
f62b4c15e8 Fix bad html 2021-02-07 17:32:54 +01:00
LAURIER Alexis
1f56ff24ca
Merge pull request #6 from Dolibarr/13.0 
13.0
 2021-02-07 13:04:27 +01:00
Florian HENRY
fcb5b3900d FIX: #16189, fix download/see check deposit PDF 2021-02-06 12:39:40 +01:00
Laurent Destailleur
4411497112 FIX #16156 2021-02-06 12:27:27 +01:00
Laurent Destailleur
c6badeed57 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/compta/prelevement/card.php
 2021-02-06 01:14:48 +01:00
Laurent Destailleur
d8a33b46de Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-06 01:08:46 +01:00
Laurent Destailleur
4428e2b18e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/product/price.php
 2021-02-06 01:08:37 +01:00
Laurent Destailleur
87c8d917e9 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/prelevement/card.php
 2021-02-06 01:03:31 +01:00
Laurent Destailleur
c888ce08c1
Merge pull request #16174 from atm-florianm/fix/10.0_check_withdrawal_already_credited_before_crediting_it 
FIX 10.0 - before crediting a withdrawal receipt, check whether it has been credited already
 2021-02-06 01:00:56 +01:00
Laurent Destailleur
7d14cde45e
Merge pull request #16173 from fappels/11_backport_price_patch 
FIX: Add critical price patch from 12 to 11.
 2021-02-06 00:59:52 +01:00