Laurent Destailleur
e777516f38
Merge pull request #2483 from FHenry/3.7
...
FIX : fetch actioncomm return 0 if no record found instead of nothing
2015-03-27 01:10:28 +01:00
Laurent Destailleur
d0e4d8046b
Merge pull request #2480 from marcosgdf/minor-2
...
Corrected search box alignment in Customer orders list
2015-03-27 01:09:06 +01:00
Laurent Destailleur
78638a30cd
Merge pull request #2477 from atm-maxime/3.6
...
Fix : Quantity displayed for virtual stock explanations was wrong
2015-03-27 01:01:37 +01:00
Laurent Destailleur
813cb36424
Merge pull request #2476 from fmarcet/3.7
...
Fix: Not using where on sellist
2015-03-27 00:50:48 +01:00
Florian HENRY
2e13479e8f
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-03-26 16:56:06 +01:00
Florian HENRY
26c29216d9
syntax
2015-03-26 16:55:13 +01:00
Laurent Destailleur
42c2c81e28
Fix detection of html was wrong with img
2015-03-26 12:05:52 +01:00
Laurent Destailleur
1ca95acbd7
Fix pb during export of agenda events
...
Conflicts:
htdocs/exports/export.php
2015-03-26 11:23:21 +01:00
Marcos García de La Fuente
e59fed9f38
Corrected search box alignment in Customer orders list
2015-03-26 11:08:34 +01:00
Laurent Destailleur
8be08c692f
Fix some secuity tests were not done.
2015-03-25 18:10:45 +01:00
Maxime Kohlhaas
b250c5588e
Fix : Quantity displayed for virtual stock explanations was wrong
2015-03-25 16:11:36 +01:00
fmarcet
456b11d148
Fix: Not using where on sellist
2015-03-25 11:23:05 +01:00
Laurent Destailleur
f75c115140
Fix translation
...
Fix permission not managed into get_menudiv.php
2015-03-24 11:19:51 +01:00
Laurent Destailleur
2a4687834d
Merge pull request #2474 from netfab/3.6
...
Fix displaying of the warning image.
2015-03-23 23:26:09 +01:00
Fab
ea7f00e777
Fix displaying of the warning image.
...
Since last commit, $objp->date_livraison returns nothing ; max() will
then returns wrong result, and the warning image will be displayed when it
should not.
2015-03-23 20:05:31 +01:00
Laurent Destailleur
dc0d3504dd
Fix: Bad notification key
2015-03-23 14:52:47 +01:00
Laurent Destailleur
b7a466c95f
Fix bad style for total
2015-03-23 13:50:14 +01:00
Laurent Destailleur
5d2e09ec51
Fix: navigation in page was wrong and typo errors.
2015-03-23 12:31:32 +01:00
Laurent Destailleur
7ad0a32559
Fix for multicompany users.
2015-03-23 04:51:24 +01:00
Laurent Destailleur
e269aa83b5
More comments
2015-03-23 04:16:58 +01:00
Laurent Destailleur
042556a9cf
Better comments
2015-03-23 03:50:55 +01:00
Laurent Destailleur
f4b1d95b3e
Some fix for multicompany module
2015-03-23 02:39:41 +01:00
Laurent Destailleur
15ac0894c9
Prepare 3.7 release
2015-03-22 12:22:11 +01:00
Laurent Destailleur
87da1d734e
mysql 5.5.41 is still bugged returning "lost connexion" during migration
...
but there is no more data loss so we can allow this version. A database
upgrade to 5.6 will be required if this occurs.
2015-03-22 12:13:26 +01:00
Laurent Destailleur
4f9aef6150
Fix calculation of PMP of product.
...
Also add phpunit test to avoid this in future.
2015-03-21 15:29:23 +01:00
Laurent Destailleur
b52ee1d069
Merge pull request #2465 from marcosgdf/bug-delivery_date
...
Fixed delivery date in order list not showing up
2015-03-21 01:24:17 +01:00
Laurent Destailleur
73266bb965
Fix error when using a log hangler that make output into the http
...
header. We must add a log before any generation of ouput content so we
are sure a buffering of output has been started.
2015-03-21 01:22:05 +01:00
Laurent Destailleur
b8ed553365
We must keep the @, some tools use it to know it is login page.
2015-03-21 01:08:29 +01:00
Laurent Destailleur
33d98b52b5
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-03-20 20:51:50 +01:00
Laurent Destailleur
eeb09b83a1
The test on db version must not lock the phpunit
2015-03-20 20:50:46 +01:00
Laurent Destailleur
9e0aa22a04
Merge pull request #2461 from tiaris/3.7_langs_error
...
Add global $langs to method, necessary for triggers to function
2015-03-20 20:43:16 +01:00
Laurent Destailleur
0784e9638a
The test on db version must not lock the phpunit
2015-03-20 17:57:40 +01:00
Laurent Destailleur
b0e928c213
Disable migration with bugged versions
2015-03-20 15:26:00 +01:00
Marcos García de La Fuente
56295ed438
Fixed delivery date in order list not showing up
2015-03-20 11:28:23 +01:00
Laurent Destailleur
d442ac328c
Fix: some replacement tags were missing
2015-03-19 12:34:03 +01:00
Laurent Destailleur
a2676e5768
Fix: the type of notification sent was not filled
2015-03-18 21:06:55 +01:00
Laurent Destailleur
7ef11b2f38
Fix selected attribute not set correctly
2015-03-18 13:16:59 +01:00
Laurent Destailleur
37c216cfe4
Fix limit for very slow os.
2015-03-17 15:43:11 +01:00
jean
9e9a8894ea
Add global $langs to method, necessary for triggers to function
...
correctly
2015-03-17 14:20:08 +01:00
Laurent Destailleur
04c88b0d94
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-03-16 18:26:07 +01:00
Laurent Destailleur
bc4ecf8619
Fix the debug option must works for admin user
2015-03-16 18:25:26 +01:00
Laurent Destailleur
60c72e13b3
Some fixes into export and translation
2015-03-15 23:39:53 +01:00
Laurent Destailleur
2b7c95a86d
Merge remote-tracking branch 'origin/3.6' into 3.7
2015-03-14 13:46:45 +01:00
Laurent Destailleur
c4ff66c5d7
Merge remote-tracking branch 'origin/3.5' into 3.6
2015-03-14 13:46:18 +01:00
Laurent Destailleur
a9eebb33fd
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2015-03-14 13:45:27 +01:00
Laurent Destailleur
89b22be063
FIXED: Allowed 0 to be used as an account mask. Required by CEGID.
2015-03-14 13:44:26 +01:00
Laurent Destailleur
da72cf387b
Merge pull request #2451 from Dolibarr/revert-2318-3.5-accountingmask
...
Revert "FIXED Allowed 0 to be used as an account mask"
2015-03-14 13:43:04 +01:00
Laurent Destailleur
4a9a3ab04b
Revert "FIXED Allowed 0 to be used as an account mask"
2015-03-14 13:42:58 +01:00
Laurent Destailleur
da042c1677
Merge pull request #2318 from GPCsolutions/3.5-accountingmask
...
FIXED Allowed 0 to be used as an account mask
2015-03-14 13:42:46 +01:00
Laurent Destailleur
ca34575df4
FIXED: Allowed 0 to be used as an account mask. Required by CEGID.
2015-03-14 13:42:00 +01:00
