Raphaël Doursenaud
|
b0cf9bd0be
|
Fix #3864 Really fixed invalid jQuery code
|
2015-11-05 14:38:11 +01:00 |
|
Raphaël Doursenaud
|
69ac75bef8
|
Fix #3864 Fixed invalid jQuery code
|
2015-11-04 22:55:14 +01:00 |
|
Laurent Destailleur
|
c06c2d0464
|
FIX #3841 creation of a task completed has not status set to finished by
default
|
2015-11-02 14:21:45 +01:00 |
|
Laurent Destailleur
|
f08d52b0e8
|
Merge pull request #3723 from atm-alexis/FIX_double_escape_entrepot
FIX double db escape add too quote
|
2015-10-14 21:27:39 +02:00 |
|
Alexis Algoud
|
0251728e28
|
FIX double db escape add too quote
|
2015-10-12 17:36:24 +02:00 |
|
Laurent Destailleur
|
84f5b72d2b
|
Merge pull request #3719 from Dolibarr/revert-3573-FIX_remove_file_from_mail_remove_file
Revert "FIX no need to remove file into mail form"
|
2015-10-11 20:43:16 +02:00 |
|
Laurent Destailleur
|
87fad70f4a
|
Revert "FIX no need to remove file into mail form"
|
2015-10-11 20:42:49 +02:00 |
|
Laurent Destailleur
|
62dd936b08
|
Merge pull request #3573 from atm-alexis/FIX_remove_file_from_mail_remove_file
FIX no need to remove file into mail form
|
2015-10-11 20:42:42 +02:00 |
|
Laurent Destailleur
|
9fa2afb44b
|
Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6
Conflicts:
ChangeLog
|
2015-10-11 19:55:50 +02:00 |
|
Laurent Destailleur
|
4e4efc97f0
|
Merge branch 'marcosgdf-bug-1776' into 3.6
|
2015-10-11 19:54:51 +02:00 |
|
Laurent Destailleur
|
c76af687ed
|
Merge pull request #3715 from marcosgdf/clone-proposals
FIX 1794 Error when cloning Proposal gives error in a malformed page
|
2015-10-11 19:52:30 +02:00 |
|
Marcos García de La Fuente
|
fd9f51df88
|
Missing changelog
|
2015-10-11 12:39:42 +02:00 |
|
Marcos García de La Fuente
|
4e9a378f0d
|
Merge branch '3.6' into bug-1776
|
2015-10-11 12:37:41 +02:00 |
|
Marcos García de La Fuente
|
9f1fa7e212
|
Missing changelog
|
2015-10-11 12:32:02 +02:00 |
|
Marcos García de La Fuente
|
252f00dfe7
|
Merge branch '3.6' into clone-proposals
|
2015-10-11 12:29:45 +02:00 |
|
Laurent Destailleur
|
3f8e9bd181
|
Remove warning
|
2015-10-10 19:24:31 +02:00 |
|
Laurent Destailleur
|
b27989d5d4
|
Merge pull request #3665 from altatof/fix_extrafields
reenable search criteria in sql clause
|
2015-10-09 20:32:42 +02:00 |
|
Christophe Battarel
|
bf262c2cae
|
reenable search criteria in sql clause
|
2015-10-05 15:41:28 +02:00 |
|
Laurent Destailleur
|
72c31c0fa9
|
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
|
2015-10-01 10:48:28 +02:00 |
|
Laurent Destailleur
|
4da8fb901b
|
Add comment
|
2015-10-01 10:48:09 +02:00 |
|
Laurent Destailleur
|
1907e5da54
|
Merge pull request #3619 from atm-arnaud/3.6_fix_facturestat
FIX facturestat bad sql when customer view is limited
|
2015-10-01 10:48:05 +02:00 |
|
Laurent Destailleur
|
34adc60d26
|
Merge pull request #3618 from atm-alexis/fix_event_for_user_restricted_if_no_company
FIX error in SQL due to a previous fix
|
2015-10-01 10:35:07 +02:00 |
|
arnaud
|
0b7305d21a
|
FIX facturestat bad sql when customer view is limited
|
2015-09-28 16:55:34 +02:00 |
|
Alexis ALGOUD
|
453ed8a05e
|
FIX error in SQL due to a previous fix
|
2015-09-28 15:36:27 +02:00 |
|
Alexis Algoud
|
2d35124c71
|
FIX no need to remove file into mail form, the temp dir will be deleted after any sending
|
2015-09-23 11:11:19 +02:00 |
|
Marcos García de La Fuente
|
3818bff86a
|
Fix: [ bug 1776 ] Undefined $deliverycompany variable in pdf_build_address
|
2015-09-16 12:49:05 +02:00 |
|
Marcos García de La Fuente
|
e80f29c271
|
Fix: [ bug 1794 ] - Error when cloning Proposal gives error in a malformed page
|
2015-09-16 12:47:13 +02:00 |
|
Laurent Destailleur
|
86b1a9cbce
|
Merge remote-tracking branch 'origin/3.5' into 3.6
|
2015-09-12 11:38:25 +02:00 |
|
Laurent Destailleur
|
a3032d5674
|
Merge pull request #3504 from fappels/3.5-patch-Dispatch-rounding
Fix #3471 3.5 Rounding issue when dispatching non-integer
|
2015-09-12 11:07:55 +02:00 |
|
Laurent Destailleur
|
e1a92c8288
|
Merge pull request #3506 from atm-maxime/3.6
Fix multientity stock management (F.Henry followup)
|
2015-09-12 10:58:26 +02:00 |
|
Maxime Kohlhaas
|
c6081f0fa2
|
Fix multientity stock management (F.Henry followup)
|
2015-09-11 20:38:32 +02:00 |
|
fappels
|
8bdfdc0127
|
Fix #3471 3.5 Rounding issue when dispatching non-integer
|
2015-09-10 23:12:27 +02:00 |
|
fappels
|
249883dda2
|
Merge remote-tracking branch 'Dolibarr/3.5' into 3.5
|
2015-09-10 22:19:41 +02:00 |
|
Juanjo Menent
|
70df553814
|
Merge pull request #3494 from FHenry/3.6
3.6
|
2015-09-09 17:43:07 +02:00 |
|
Juanjo Menent
|
355fcc78cf
|
Fix #3475 RemiseCheque: Undefined variable $date
|
2015-09-08 20:48:31 +02:00 |
|
Florian HENRY
|
63a817c3a4
|
Fix wahrehouse multientty management
|
2015-09-08 16:13:15 +02:00 |
|
Florian HENRY
|
52cb9581ff
|
Fix multientity stock management
|
2015-09-08 16:00:13 +02:00 |
|
Florian HENRY
|
7505537a3e
|
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
|
2015-09-07 11:39:00 +02:00 |
|
Laurent Destailleur
|
6c78b930d1
|
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
|
2015-09-06 11:26:20 +02:00 |
|
Laurent Destailleur
|
8076ea85ea
|
3.6.4 was packaged
|
2015-09-05 20:07:17 +02:00 |
|
Laurent Destailleur
|
51a01921ba
|
Merge pull request #3456 from marcosgdf/bug-2893
Fix [ bug #2893 ] Dolibarr error when viewing an invoice after changing invoice mask
|
2015-09-03 16:55:13 +02:00 |
|
Marcos García de La Fuente
|
7a115c9366
|
Typo
|
2015-09-03 11:59:46 +02:00 |
|
Marcos García de La Fuente
|
bd21cf5d68
|
Updated changelog
|
2015-09-03 11:58:20 +02:00 |
|
Marcos García de La Fuente
|
08565d46fe
|
Merge branch '3.6' into bug-2893
|
2015-09-03 11:56:43 +02:00 |
|
Marcos García de La Fuente
|
50184babb9
|
FIX [ bug #2893 ] Dolibarr error when viewing an invoice after changing invoice mask
Close #2893
|
2015-09-03 11:55:40 +02:00 |
|
Laurent Destailleur
|
001f1b4c31
|
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/filefunc.inc.php
|
2015-09-03 10:41:44 +02:00 |
|
Laurent Destailleur
|
897686a752
|
Merge pull request #3447 from fmarcet/3.5
FIX: The hours of date filter aren't correct
|
2015-09-03 10:33:00 +02:00 |
|
Laurent Destailleur
|
9efecbf52b
|
Merge pull request #3443 from GPCsolutions/3.5-3442
Fix #3442 Remove useless syslog
|
2015-09-03 10:30:42 +02:00 |
|
Laurent Destailleur
|
e3d4b104e2
|
Merge pull request #3449 from GPCsolutions/3.5-3448
Fix #3448 Pass expected date format
|
2015-09-03 10:26:00 +02:00 |
|
Raphaël Doursenaud
|
870882257d
|
Fix #3448 Pass expected date format
|
2015-09-01 11:06:44 +02:00 |
|