Niklas Spanring
2f08ddef54
Fix: travis-ci error actions_sendmails.inc.php
...
error line="124""The use of function sizeof() is forbidden; use count() instead"
error line="229" "The use of function sizeof() is forbidden; use count() instead"
2015-08-26 15:04:50 +02:00
gschratzer
99e679ec39
Merge https://github.com/gschratzer/dolibarr into develop
2015-08-25 17:07:15 +02:00
gschratzer
16268e9f0a
New: function calculate_byte
2015-08-25 17:05:08 +02:00
Guido Schratzer
6b85a49068
Merge pull request #1 from Dolibarr/develop
...
get new version
2015-08-25 16:42:52 +02:00
Laurent Destailleur
a54589c13c
Fix filter lost
2015-08-24 17:47:26 +02:00
Laurent Destailleur
09355b0c7b
Fix filtering
2015-08-24 16:40:43 +02:00
Guido Schratzer
0aabf5eb08
Update actions_sendmails.inc.php
2015-08-24 16:35:08 +02:00
Laurent Destailleur
2cf10ac05d
Fix filtering
2015-08-24 16:32:43 +02:00
gschratzer
bf00b5d795
New: IMAP dolimail Support
2015-08-24 16:22:21 +02:00
gschratzer
7c550fdba5
New: IMAP dolimail Support
2015-08-24 16:05:15 +02:00
Laurent Destailleur
8061ec9084
Fix translation
2015-08-24 15:59:17 +02:00
Laurent Destailleur
aaba18bd51
Fix filter on date
2015-08-24 15:40:33 +02:00
Laurent Destailleur
32ec57403b
Bad translation
2015-08-24 15:28:15 +02:00
Laurent Destailleur
1a55159e35
Fix filter on prospect status
2015-08-24 14:59:46 +02:00
Laurent Destailleur
80fc4743c9
Fix the property "list" was not used.
2015-08-24 14:42:07 +02:00
Laurent Destailleur
e17abbb59a
Fix syntax error
2015-08-24 12:26:49 +02:00
Laurent Destailleur
15ab9c0ecd
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/lib/security.lib.php
htdocs/product/stock/mouvement.php
2015-08-20 16:08:42 +02:00
Laurent Destailleur
da8e71b2c5
Fix #3309
2015-08-20 16:05:29 +02:00
Laurent Destailleur
1b409538a8
Fix #3400
...
Conflicts:
htdocs/core/lib/date.lib.php
2015-08-20 15:51:28 +02:00
Laurent Destailleur
4541d189ac
Fix #3400
2015-08-20 15:50:00 +02:00
Laurent Destailleur
18f064cc69
Fix login is a mandatory field.
2015-08-20 15:18:36 +02:00
Laurent Destailleur
d409568442
Format code
2015-08-20 15:07:16 +02:00
Laurent Destailleur
e24fd6fa37
Merge remote-tracking branch 'origin/develop' into 3.8
...
Conflicts:
htdocs/expedition/class/expedition.class.php
2015-08-20 14:36:32 +02:00
Laurent Destailleur
c3fb14855b
Try a better fix to replace PR #3297
2015-08-20 14:34:48 +02:00
Laurent Destailleur
d90b342cc9
Fix use dedicated escapment function
2015-08-20 14:34:08 +02:00
Laurent Destailleur
2266c2806f
Merge pull request #3396 from fappels/3.8
...
Fix shipment validation: 2 times qty in SQL select
2015-08-20 14:32:34 +02:00
Laurent Destailleur
936f912216
Fix filter on category
2015-08-20 04:07:07 +02:00
Laurent Destailleur
26e3fcc636
Try a better fix to replace PR #3297
2015-08-20 03:38:21 +02:00
Laurent Destailleur
ac6d2b47d4
Merge pull request #3398 from grandoc/3.8
...
FIX : pdf_writeLinkedObjects use foreach instead of for($i..) because now linked objects return by fetchLinkedObject are associative array with ID as key.
2015-08-20 02:52:50 +02:00
Laurent Destailleur
9a6e13d253
Fix test if empty was inverted
2015-08-19 19:45:24 +02:00
Laurent Destailleur
259a4e0694
Update doc
2015-08-19 18:52:18 +02:00
Laurent Destailleur
b11642a7f4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-08-19 18:27:22 +02:00
Laurent Destailleur
5f30ad3b63
Fix no link to show if id empty
2015-08-19 18:27:12 +02:00
Laurent Destailleur
8f32e8ace8
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-08-19 17:14:21 +02:00
philippe grand
3743c7460d
FIX : pdf_writeLinkedObjects use foreach instead of for($i..) because
...
now linked objects return by fetchLinkedObject are associative array
with ID as key.
2015-08-19 16:36:44 +02:00
Laurent Destailleur
6e9bf70add
Fix bad text into file
2015-08-19 15:12:11 +02:00
fappels
38584f2cfa
Fix shipment validation 2 times qty in SQL select
2015-08-19 10:42:54 +02:00
Juanjo Menent
7befa78223
Merge pull request #3386 from grandoc/grandoc_fixes_20150815
...
the form should be outside table to avoid errors
2015-08-18 20:07:38 +02:00
Juanjo Menent
8ba1d1d414
Merge remote-tracking branch 'origin/3.8' into develop
2015-08-18 19:59:03 +02:00
Juanjo Menent
d7ad38be13
Merge pull request #3393 from FHenry/3.8
...
FIX : #3392
2015-08-18 19:57:02 +02:00
Florian HENRY
8b62e562e5
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2015-08-18 11:14:22 +02:00
Laurent Destailleur
241bf85da2
Fix parameter sendmassremind
2015-08-18 09:53:04 +02:00
Laurent Destailleur
fabd751be4
Fix Server hang with long loop when reading specimen pdf and high number
...
of tasks.
2015-08-17 20:07:14 +02:00
Laurent Destailleur
76ce98630f
Fix translation
2015-08-17 19:42:19 +02:00
Laurent Destailleur
7ff149e876
Fix missing param mode
2015-08-17 15:13:40 +02:00
Florian HENRY
b4e810a7a8
FIX : #3392
2015-08-17 13:05:54 +02:00
Laurent Destailleur
911f37b6eb
Merge remote-tracking branch 'origin/develop' into 3.8
2015-08-17 12:55:41 +02:00
philippe grand
53a21019fd
the form should be outside table to avoid errors
2015-08-15 16:15:54 +02:00
philippe grand
924ff21268
the form should be outside table to avoid errors
2015-08-15 16:12:33 +02:00
philippe grand
20a4304188
the form should be outside table to avoid errors
2015-08-15 16:10:24 +02:00