lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,901 Commits 43 Branches 150 Tags 886 MiB
6e9bf70add
Commit Graph

45901 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
a9bf38b8d3 Merge pull request #3022 from marcosgdf/bug-2976 
FIX Close bug #2976: "Report" tab is the current tab but it is not marked as selected by the UI
 2015-06-14 02:03:39 +02:00
Laurent Destailleur
4dbb3789a2 Merge pull request #3037 from marcosgdf/bug-1852 
Fix [ bug 1852 ] JS error when editing a customer order line
 2015-06-14 01:45:57 +02:00
Laurent Destailleur
f67af6dac5 Merge pull request #3026 from marcosgdf/bug-2891 
FIX Close bug #2891 Category hooks do not work
 2015-06-14 01:40:12 +02:00
Marcos García de La Fuente
6514f418e5 Fix [ bug 1852 ] JS error when editing a customer order line 2015-06-13 11:46:35 +02:00
Regis Houssin
f5168625d8 Fix: broken feature: barcode search #3019 2015-06-13 10:43:55 +02:00
Regis Houssin
296b76603a Merge remote-tracking branch 'origin/3.7' into 3.7_bug 2015-06-13 09:37:55 +02:00
Marcos García de La Fuente
ea625628ce Fix Close bug #2786 Objectline_add template shows "0" for non-vat suppliers 2015-06-13 03:39:06 +02:00
Marcos García de La Fuente
1215502927 Fix Close bug #2814 JPEG photos are not displayed in Product photos page 2015-06-13 03:11:17 +02:00
Marcos García de La Fuente
7bddca94ef Merge branch '3.7' into bug-2900 
Conflicts:
	ChangeLog
 2015-06-13 02:39:16 +02:00
Juanjo Menent
babd48023f Merge pull request #3032 from simnandez/3.7 
Update changelog
 2015-06-12 21:33:44 +02:00
Juanjo Menent
f068203a79 Update changelog 2015-06-12 21:31:14 +02:00
Juanjo Menent
da535b08e5 Merge pull request #3027 from marcosgdf/bug-2855 
FIX Close bug #2855 Wrong translation key in localtax report page
 2015-06-12 21:30:02 +02:00
Juanjo Menent
567dece678 Merge pull request #3011 from GPCsolutions/3.7-3009 
FIX #3009: Better filtering to prevent SQL injection
 2015-06-12 21:26:14 +02:00
Juanjo Menent
ab3190df25 Merge pull request #3010 from GPCsolutions/3.6-3009 
FIX #3009: Better filtering to prevent SQL injection
 2015-06-12 21:25:53 +02:00
Juanjo Menent
10d27ea594 Merge pull request #3012 from fmarcet/3.7 
Fix: Not reading external barcode numeration module
 2015-06-12 21:24:49 +02:00
Marcos García de La Fuente
f9574fa458 FIX Close #2835 Customer prices of a product shows incorrect history order 2015-06-12 19:05:08 +02:00
Marcos García de La Fuente
2051a66cd7 FIX Close #2837 Product list table column header does not match column body 2015-06-12 18:46:05 +02:00
Marcos García de La Fuente
e3aa63f3c3 Added log 2015-06-12 18:33:37 +02:00
Marcos García de La Fuente
0335892521 FIX Close bug #2861 Undefined variable $res when migrating from 3.6.2 to 3.7.0 2015-06-12 18:31:49 +02:00
Marcos García de La Fuente
200eb7b1bb FIX Close bug #2855 Wrong translation key in localtax report page 2015-06-12 16:27:17 +02:00
Marcos García de La Fuente
300cfd2293 FIX Close bug #2891 Category hooks do not work 2015-06-12 16:10:23 +02:00
Marcos García de La Fuente
60711d35b8 FIX Close bug #2900 Courtesy title is not stored in create thirdparty form 2015-06-12 15:53:58 +02:00
Marcos García de La Fuente
87a00d6924 FIX Close bug #2976: "Report" tab is the current tab but it is not marked as selected by the UI 2015-06-12 15:02:05 +02:00
Laurent Destailleur
1a2bde14fb FIX Better management error into the color conversion functions 2015-06-12 14:37:27 +02:00
Laurent Destailleur
4a726f6315 Fix css 2015-06-12 13:44:03 +02:00
fmarcet
5783c185bd Fix: Not reading external barcode numeration module 2015-06-11 10:43:12 +02:00
Raphaël Doursenaud
4ee6c1810e FIX #3009: Better filtering to prevent SQL injection 2015-06-11 10:38:29 +02:00
Raphaël Doursenaud
d89955047b FIX #3009: Better filtering to prevent SQL injection 2015-06-11 10:37:30 +02:00
Regis Houssin
14780747fc Merge remote-tracking branch 'dolibarr/3.7' into 3.7 2015-06-10 16:00:42 +02:00
Laurent Destailleur
05a653ee5f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/class/html.form.class.php
 2015-06-08 18:21:16 +02:00
Laurent Destailleur
f9d85973aa Merge remote-tracking branch 'origin/3.5' into 3.6 2015-06-08 18:18:37 +02:00
Laurent Destailleur
35dd069ec9 Fix #2994 2015-06-08 18:17:13 +02:00
Laurent Destailleur
fd42b17027 Merge pull request #2984 from GPCsolutions/dolibarr-2983 
FIX #2983 Load gravatar avatar images securely over HTTPS
 2015-06-08 17:53:30 +02:00
Laurent Destailleur
3ed200766c Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-06-08 17:38:59 +02:00
Laurent Destailleur
9e1dd42b56 Fix #2986 2015-06-08 17:38:33 +02:00
Raphaël Doursenaud
08c9dd358d FIX #2983 Load gravatar avatar images securely over HTTPS 2015-06-08 15:51:41 +02:00
Laurent Destailleur
7f16eea13b Merge pull request #2978 from hregis/3.7-bug 
Fix: use dash instead underscore and add filter for "dol_most_recent_files" for avoid conflict
 2015-06-08 10:35:00 +02:00
Regis Houssin
8d824785f0 Merge remote-tracking branch 'dolibarr/3.7' into 3.7 2015-06-08 10:03:34 +02:00
Juanjo Menent
dc3ae22379 Merge pull request #2980 from hregis/3.7_crash 
Close #2951
 2015-06-08 09:46:39 +02:00
Regis Houssin
792911b14f Revert "Fix: Drop foreign key for avoid Mysql crash" 
This reverts commit 65b049fdf5.
 2015-06-08 09:28:53 +02:00
Regis Houssin
de0dd5da60 Fix: Drop foreign key for avoid Mysql crash 2015-06-08 09:14:46 +02:00
Regis Houssin
65b049fdf5 Fix: Drop foreign key for avoid Mysql crash 2015-06-08 09:13:21 +02:00
Laurent Destailleur
536f565d4e Fix Return value is always utf8 encoded and without entities. 2015-06-07 02:47:28 +02:00
Regis Houssin
9a812a6c28 Fix: add filter for "dol_most_recent_files" for avoid conflict with 
option "Save file on server with name "FA0700034-Original filename""
 2015-06-06 13:03:02 +02:00
Laurent Destailleur
b57f0a0e5f Fix option to use old path for product is for compatibility if user come 
from 3.6 or lower. Must not be enabled on 3.7.0 or +.
 2015-06-05 18:32:49 +02:00
Laurent Destailleur
1252a500ce Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/fourn/class/fournisseur.product.class.php
 2015-06-05 16:50:46 +02:00
Laurent Destailleur
51d275ee77 Merge pull request #2941 from atm-gauthier/3.7 
FIX : When we clone a propal, if it has a project which is not assign…
 2015-06-05 15:56:36 +02:00
Laurent Destailleur
3c8d54d55f Merge pull request #2938 from FHenry/3.6 
FIX : If supplier invoice block linked element is display after other  block total HT amount is not reset to 0 and sum other block (like customer orders values)
 2015-06-05 15:43:25 +02:00
Laurent Destailleur
a8433aadbe Merge pull request #2962 from hregis/3.7_bug2 
Fix: PRODUCT_USE_OLD_PATH_FOR_PHOTO use entity 0 for multicompany
 2015-06-05 15:42:41 +02:00
Laurent Destailleur
d138e441f8 Merge pull request #2964 from atm-maxime/3.6 
Fix : supplier order clone was buggy if notes contains apostrophe
 2015-06-05 15:42:16 +02:00