Laurent Destailleur
acbeb2b360
Fix en_GB
2015-04-02 14:03:52 +02:00
Laurent Destailleur
8d892e19c1
Sync from transifex
2015-04-02 13:56:32 +02:00
Laurent Destailleur
0f51314c7e
Sync from transifex
2015-04-02 13:28:20 +02:00
Laurent Destailleur
5b190371ab
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-04-02 11:45:01 +02:00
Laurent Destailleur
f89d74d6bc
Deletion of dir was not complete.
2015-04-02 11:44:43 +02:00
Laurent Destailleur
0187a9a4ee
Merge pull request #2511 from fappels/3.7
...
FIX: dispatch batch products
2015-04-02 11:24:01 +02:00
Laurent Destailleur
10f967e07a
FIX #2519
2015-04-02 11:11:03 +02:00
Laurent Destailleur
16a620f926
Fix: Deadlock situation (when order were canceled, no way to make
...
nothing on it)
Fix: Don't know how I forgot this events into trigger system.
2015-04-01 16:07:22 +02:00
Laurent Destailleur
ad1e4134a9
Fix: bcc was lost if notif to bcc was also forced
2015-04-01 12:22:50 +02:00
Laurent Destailleur
1bc0f6c99f
Fix: do not show end date when it is same than start date
2015-04-01 12:02:32 +02:00
Laurent Destailleur
293495467f
Fix: Bad ref used into notification message
2015-04-01 11:30:48 +02:00
Laurent Destailleur
5fe5ec939d
Fix: delivery date must not be autofill with current date
2015-04-01 10:54:24 +02:00
Francis Appels
bba8b206a1
FIX: dispatch batch products
...
Fix dispatching batch products and add error message.
Make DispatchProduct method backwards comp and add missing $trigger.
Add missing ORDER_SUPPLIER_DISPATCH trigger to demo class.
2015-03-31 15:48:08 +02:00
Laurent Destailleur
3cc4358e72
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/commande/liste.php
htdocs/product/stock/product.php
2015-03-29 15:24:17 +02:00
Laurent Destailleur
018a0d779f
Fix translation
2015-03-29 15:18:10 +02:00
Laurent Destailleur
b8bd27009e
Simplify code
2015-03-28 18:32:53 +01:00
Ion Agorria
043d11d785
check if $mc is a valid global
2015-03-28 18:22:01 +01:00
Laurent Destailleur
3f5fe432e7
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-03-28 17:18:10 +01:00
Laurent Destailleur
b60a56dc94
Fix search on command
2015-03-28 17:17:55 +01:00
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
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
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
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
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
