Commit Graph

52025 Commits

Author SHA1 Message Date
Raphaël Doursenaud
9d6efde935 Prevent sentry logging error with 3.9 update
Since we don't ship the required libraries anymore,
if the module had been enabled before upgrade,
the code was failing making Dolibarr totally unusable.

Mitigated the issue by disabling sentry logging
if the required libraries are unavailable.
2016-04-07 17:16:42 +02:00
Juanjo Menent
8bdda85801 Merge pull request #4955 from fmarcet/3.9
FIX: Not removing code into vatrate.
2016-04-05 17:43:48 +02:00
Laurent Destailleur
f9d7c27bd2 FIX Export must use a left join to not loose lines 2016-04-05 17:17:40 +02:00
Laurent Destailleur
dd87195a07 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-04-05 17:11:54 +02:00
Laurent Destailleur
ed0ab05b93 FIX Damn, where was the project ref ? 2016-04-05 17:11:44 +02:00
fmarcet
d3794bb145 FIX: Not removing code into vatrate. 2016-04-05 16:49:50 +02:00
Juanjo Menent
10df0e33d4 Merge pull request #4896 from grandoc/3.9
fix a lot of beug
2016-04-05 16:49:22 +02:00
Laurent Destailleur
43165bab02 FIX Filter/search on extrafields on lists
Conflicts:
	dev/skeletons/skeleton_list.php
	htdocs/projet/list.php
	htdocs/societe/list.php
2016-04-04 16:22:26 +02:00
Laurent Destailleur
21475b587d Merge pull request #4939 from marcosgdf/patch-2
Corrected PHP documentation of calcul_price_total function
2016-04-04 00:43:14 +02:00
Laurent Destailleur
f3c032ba21 Merge pull request #4925 from frederic34/patch-9
Update llx_propal_merge_pdf_product.sql
2016-04-04 00:34:40 +02:00
Laurent Destailleur
bd4bdcea37 Merge pull request #4924 from frederic34/patch-8
FIX Remove sql error when creating table llx_usergroup_extrafields.sql
2016-04-04 00:33:23 +02:00
Laurent Destailleur
29fc94e416 Merge pull request #4923 from frederic34/patch-7
FIX Remove sql error when creating table llx_establishment.sql
2016-04-04 00:31:20 +02:00
Laurent Destailleur
f8fa2202ed Merge pull request #4921 from FHenry/3.9
Add hook parameters on New search Box
2016-04-04 00:25:56 +02:00
Marcos García
fded7d3e9a Corrected PHP documentation of calcul_price_total function 2016-04-03 22:17:25 +02:00
Laurent Destailleur
cea48a8dd6 FIX bad translation language loaded
FIX When changing thirdparty on event card, the showempty option of
contact was lost.
FIX Bad placeholder shown on combo to select a thirdparty.
2016-04-03 20:02:02 +02:00
Laurent Destailleur
3aeb579486 Fix bad link 2016-04-03 12:46:34 +02:00
Laurent Destailleur
066c793de2 FIX image extension must be in lower case
Conflicts:
	htdocs/core/lib/files.lib.php
2016-04-02 15:46:01 +02:00
Laurent Destailleur
c0b2d7405a FIX Generated thumbs must always use the png format so using thumbs can
work.
2016-04-02 14:46:04 +02:00
Laurent Destailleur
be8384389f FIX Creation of thumb image for size "small" was not done.
Conflicts:
	htdocs/core/lib/files.lib.php
2016-04-02 14:20:21 +02:00
Laurent Destailleur
be483bd787 FIX Some records were lost into margin per product report 2016-04-01 12:28:15 +02:00
Laurent Destailleur
feb35adbe1 FIX Missing clean of criteria 2016-04-01 12:04:07 +02:00
Frédéric FRANCE
90e74b346e Update llx_propal_merge_pdf_product.sql
No need IF NOT EXISTS at install time
2016-03-31 17:13:38 +02:00
Frédéric FRANCE
125256c825 Update llx_usergroup_extrafields.sql
No need IF NOT EXISTS at install time
2016-03-31 17:11:17 +02:00
Frédéric FRANCE
1419b0e385 Update llx_establishment.sql 2016-03-31 17:06:10 +02:00
Florian HENRY
f567a2a0ce Search box hook 2016-03-31 12:50:40 +02:00
Florian HENRY
5d4c959d2e Add hook parameters on New search Box 2016-03-31 12:18:26 +02:00
Laurent Destailleur
a47accb1c3 FIX PMP is deprecated at warehouse level 2016-03-30 18:08:08 +02:00
Laurent Destailleur
7146a8319b FIX Each time we edit a line, we loose the unit price. 2016-03-30 16:26:34 +02:00
Laurent Destailleur
fa10f9e030 FIX #4880 2016-03-30 14:07:07 +02:00
Laurent Destailleur
07e622a7f8 Introduce () to have code cleaner 2016-03-30 14:04:22 +02:00
Laurent Destailleur
db7fcffbd8 Merge pull request #4911 from marcosgdf/fix-multiprices-type
FIX Multiprice generator didn't recalculate prices if only the price_base_type property changes
2016-03-30 14:02:17 +02:00
Marcos García de La Fuente
362bc106eb FIX Multiprice generator didn't recalculate prices if only the price_base_type property changes 2016-03-30 11:40:57 +02:00
Laurent Destailleur
fce54e9c48 Fix tooltip too large 2016-03-29 12:49:41 +02:00
philippe grand
85cd818da1 Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9 2016-03-27 10:50:37 +02:00
philippe grand
b3285996dc fix travis issue from commit 139dc9a7 2016-03-26 12:39:08 +01:00
Laurent Destailleur
0715353960 FIX A not enabled field for list must not into fields to add 2016-03-25 19:44:18 +01:00
philippe grand
08970e67d7 fix a lot of beug 2016-03-25 18:16:58 +01:00
Laurent Destailleur
884ba3a0ba Fix bad hook function name 2016-03-25 16:23:09 +01:00
Laurent Destailleur
9ddae7d7f3 Fix bad hook function name 2016-03-25 16:17:01 +01:00
Laurent Destailleur
f251ca579b Fix bad hook function name 2016-03-25 16:15:35 +01:00
Laurent Destailleur
7430d09739 Fix bad hook function name 2016-03-25 16:13:22 +01:00
Laurent Destailleur
5e55f0ecce Fix bad function name into hook 2016-03-25 16:07:42 +01:00
Laurent Destailleur
4e1b46feeb Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-03-25 14:42:30 +01:00
Laurent Destailleur
bdead30e75 FIX Missing function 2016-03-25 14:42:16 +01:00
Juanjo Menent
6efae723f5 Merge pull request #4882 from hregis/3.9_fix_merge
Fix: 3.8-3.9 fix merge
2016-03-23 22:59:41 +01:00
Regis Houssin
b38e75c404 Merge branch '3.8_fix_merge' into 3.9_fix_merge 2016-03-23 14:03:35 +01:00
fmarcet
b8bc881e5a FIX: Email templates not compatible with Multicompany
Conflicts:
	htdocs/admin/dict.php
2016-03-23 13:57:17 +01:00
fmarcet
84e5c8b437 FIX: Email templates not compatible with Multicompany
Conflicts:
	htdocs/admin/dict.php
2016-03-23 13:56:06 +01:00
fmarcet
e2b4d39292 FIX: Email templates not compatible with Multicompany
Conflicts:
	htdocs/admin/dict.php
2016-03-23 13:54:39 +01:00
fmarcet
52d88db5c3 FIX: Email templates not compatible with Multicompany
Conflicts:
	htdocs/admin/dict.php
2016-03-23 13:53:18 +01:00