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

45768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian HENRY
ec89f00103 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-07-06 13:19:35 +02:00
Florian HENRY
8a36353385 FIX : when fetch_optionnal_by_label in Extrafields with $this->db cannot 
work because this->db is never instanciated
 2015-07-06 13:18:51 +02:00
Laurent Destailleur
7c23dd13e5 Merge pull request #3144 from hregis/3.7_bug3 
Fix: for avoid error with main context hooks, if hook use $langs object for example.
 2015-07-04 10:32:11 +02:00
Regis Houssin
a9059247ca Merge branch '3.7' of https://github.com/Dolibarr/dolibarr.git into 3.7_bug3 2015-07-04 05:46:41 +02:00
Laurent Destailleur
4628c15684 Merge pull request #3141 from hregis/3.7_bug 
Fix: reset the current entity
 2015-07-04 03:46:40 +02:00
Laurent Destailleur
62d3314e38 Merge pull request #3140 from hregis/3.7_photos 
Fix: broken feature: Check the entity because He may be the same
 2015-07-04 03:39:46 +02:00
Regis Houssin
e82f4c474b Fix: for avoid error with main context hooks, with $langs object for 
example.
 2015-07-03 22:14:34 +02:00
Regis Houssin
4273c4aad9 Fix: data can be just a value, not an array 2015-07-03 11:35:11 +02:00
Regis Houssin
4fb5af7442 Fix: reset the current entity 2015-07-03 10:58:55 +02:00
Regis Houssin
e58957e603 Fix: broken feature: Check the entity because He may be the same 
reference in several entities
 2015-07-03 08:18:32 +02:00
Laurent Destailleur
9c99cae911 FIX XSS security using the onerror and missing escapement on type of 
member page.
 2015-06-28 23:32:38 +02:00
Laurent Destailleur
9d7806f1f4 Tag class as deprecated 2015-06-27 21:26:05 +02:00
Laurent Destailleur
a220a8696d Merge pull request #3111 from hregis/3.7_photos 
Fix: change encrypt/decrypt method for avoid division by zero
 2015-06-27 21:13:17 +02:00
Regis Houssin
5efea745a1 Fix: Public method name must not be prefixed with an underscore 2015-06-27 20:38:11 +02:00
Regis Houssin
5ac292f9ae Fix: Private member variable must be prefixed with an underscore 2015-06-27 20:32:19 +02:00
Regis Houssin
bf9c7c8ef9 Fix: add private/public function 2015-06-27 20:26:40 +02:00
Regis Houssin
dfae24ded9 Fix: remove unused var 2015-06-27 20:20:27 +02:00
Regis Houssin
bfe7112308 Fix: change encrypt/decrypt method for avoid division by zero 2015-06-27 19:57:35 +02:00
Laurent Destailleur
22a2038a65 Merge pull request #3108 from simnandez/3.7 
FIX #3091 TotalHT amount in supplier order is bold unlike the rest of
 2015-06-27 02:38:21 +02:00
Juanjo Menent
0f046776d5 FIX #3091 TotalHT amount in supplier order is bold unlike the rest of 
Dolibarr
 2015-06-26 17:54:34 +02:00
Juanjo Menent
a5b3c3476d Merge pull request #3106 from hregis/3.7_bug 
Fix: missing table
 2015-06-26 17:35:24 +02:00
Juanjo Menent
b0b7c4990e Merge pull request #3105 from hregis/3.7_photos 
Fix: for avoid error with function "complete_head_from_modules"
 2015-06-26 17:30:13 +02:00
Regis Houssin
7ec13c9435 Merge remote-tracking branch 'origin/3.7' into 3.7_bug 2015-06-26 16:56:41 +02:00
Regis Houssin
46272cf4cd Fix: for avoid error with function "complete_head_from_modules" 2015-06-26 15:26:08 +02:00
Juanjo Menent
a3b3ce9c77 Merge pull request #3101 from FHenry/3.7 
FIX: multicompny bug with getEntites without shared test
 2015-06-25 20:50:03 +02:00
Juanjo Menent
a8e3a8809b Merge pull request #3095 from netfab/3.7 
Missing space after title tag.
 2015-06-25 20:43:57 +02:00
Florian HENRY
9505d3a528 fix multicompny bug with getEntites without shared test 2015-06-25 17:22:37 +02:00
Fab
3adf6b1a73 Missing space after title tag. 
When using textwithpicto() from core/class/html.form.class.php, if you
are reading source code with firefox, you will see that a part of the
generated html is highlighted in red.

<td class="classfortooltip" title="title text"valign="top" width="14">

should be :

<td class="classfortooltip" title="title text" valign="top" width="14">
 2015-06-25 08:50:48 +02:00
Laurent Destailleur
02ce0bc6af Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-06-24 18:32:56 +02:00
Laurent Destailleur
c218843cdb FIX Save of filters into export profiles failed. 2015-06-24 18:29:29 +02:00
Juanjo Menent
1d562be1f4 Merge pull request #3090 from fmarcet/3.7 
FIX: Payed invoices are showed as canceled
 2015-06-24 18:17:45 +02:00
Juanjo Menent
d1ea3577fc Merge pull request #3087 from fappels/3.7 
Fix: issue #3085
 2015-06-24 18:17:06 +02:00
fmarcet
c9c1247a28 FIX: Payed invoices are showed as canceled 
FIX: Bad date filter on customer order
 2015-06-24 09:01:39 +02:00
Francis Appels
63df278eca Fix: issue #3085 2015-06-23 19:28:18 +02:00
Laurent Destailleur
29a2185462 Merge pull request #3063 from hregis/3.7_photos 
Fix: wrong user right
 2015-06-19 11:14:49 +02:00
Regis Houssin
9c6c3ad65d Fix: wrong user right 2015-06-17 16:33:18 +02:00
Laurent Destailleur
2617d28f58 Merge pull request #3057 from hregis/3.7_photos 
Fix: no error message if extrafield is require
 2015-06-17 00:18:12 +02:00
Laurent Destailleur
c023c078ae Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-06-17 00:07:44 +02:00
Laurent Destailleur
844ca58096 Fix: custom dir is missing 2015-06-17 00:05:41 +02:00
Regis Houssin
3807fafc1a Fix: no error message if extrafield is require 2015-06-16 16:42:33 +02:00
Laurent Destailleur
ceb0d71f54 Merge pull request #3054 from hregis/3.7_photos 
Fix: thumb "mini" not deleted
 2015-06-16 11:38:39 +02:00
Laurent Destailleur
85fee7ec49 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/product/class/product.class.php
 2015-06-16 11:18:10 +02:00
Laurent Destailleur
34468644ef Merge remote-tracking branch 'origin/3.5' into 3.6 2015-06-16 11:15:16 +02:00
Laurent Destailleur
fa8defa1bf Merge pull request #3034 from marcosgdf/bug-2814-2 
Fix #2814 JPEG photos are not displayed in Product photos page
 2015-06-16 11:10:24 +02:00
Regis Houssin
5e25c69891 Fix: thumb "mini" not deleted 2015-06-16 09:28:31 +02:00
Laurent Destailleur
db4d92ccb6 Merge pull request #3047 from marcosgdf/patch-2 
Fixed undefined variable typo
 2015-06-15 21:24:57 +02:00
Regis Houssin
d92448a772 Fix: phpcs ? 2015-06-15 12:09:32 +02:00
Marcos García de La Fuente
2d3ab3b658 Merge remote-tracking branch 'upstream/3.5' into bug-2814-2 
Conflicts:
	ChangeLog
 2015-06-15 09:39:17 +02:00
Marcos García
adc1998b73 Fixed undefined variable typo 2015-06-15 09:18:58 +02:00
Laurent Destailleur
a7cec18081 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/categories/fiche.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/install/upgrade2.php
	htdocs/product/liste.php
 2015-06-14 17:11:36 +02:00