Laurent Destailleur
|
e72f4cb063
|
Merge pull request #4102 from fmarcet/3.6
Fix: Bug when idprof is mandatory on thrid creation and we use multicompany
|
2015-11-28 16:27:16 +01:00 |
|
Laurent Destailleur
|
2ce00b2956
|
Merge pull request #4099 from GPCsolutions/3.6-4097
FIX #4097 Public holiday calculation
|
2015-11-28 16:11:28 +01:00 |
|
fmarcet
|
208bf2545f
|
Fix: Bug when idprof is mandatory on thrid creation and we use
multicompany
|
2015-11-26 17:14:03 +01:00 |
|
Laurent Destailleur
|
041fa8d3f3
|
Merge pull request #4083 from GPCsolutions/3.6-4081
FIX #4081 Added missing translation
|
2015-11-26 00:16:46 +01:00 |
|
Raphaël Doursenaud
|
973e42d10f
|
FIX #4097 Public holiday calculation
The last day was ommitted and never parsed. If this day was a
saturday, sunday or public holiday day, it was not computed.
|
2015-11-25 19:34:11 +01:00 |
|
Raphaël Doursenaud
|
91ce70a6e9
|
FIX #4081 Added missing translation
|
2015-11-23 17:25:10 +01:00 |
|
Laurent Destailleur
|
d64664f5a7
|
Merge pull request #4057 from marcosgdf/bug-3734
FIX #3734 Do not show empty links of deleted source objects in stock movement list
|
2015-11-21 17:49:41 +01:00 |
|
Marcos García de La Fuente
|
9f27e2323f
|
FIX #3734 Do not show empty links of deleted source objects in stock movement list
|
2015-11-21 11:51:23 +01:00 |
|
Laurent Destailleur
|
c77eaeaa77
|
Merge pull request #4040 from atm-arnaud/3.6_fix_export_category_contact
FIX export with category contact extrafields
|
2015-11-21 02:09:32 +01:00 |
|
arnaud
|
4233d24f4b
|
FIX export with category contact extrafields
|
2015-11-19 18:01:58 +01:00 |
|
Laurent Destailleur
|
350345ecca
|
Prepare 3.6.5
|
2015-11-08 15:18:26 +01:00 |
|
Laurent Destailleur
|
722a133b31
|
FIX Add a protection to not make release if ChangeLog was not generated.
Prepare package 3.6.5
Conflicts:
ChangeLog
Conflicts:
ChangeLog
|
2015-11-08 15:09:57 +01:00 |
|
Laurent Destailleur
|
d4aeb8b3bc
|
Abandon package APS. Was never used.
|
2015-11-08 14:57:26 +01:00 |
|
Juanjo Menent
|
a6f0baefc1
|
Merge pull request #3933 from marcosgdf/bug-3980
FIX #3890 Expected transactions bank account page, shows negative numbers
|
2015-11-08 11:15:31 +01:00 |
|
Juanjo Menent
|
d69e76168f
|
Merge pull request #3929 from marcosgdf/bug-3928
FIX #3928 Creating a Customer order and a Customer invoice from a project, does not inherit payment conditions and method of payment of customer card
|
2015-11-08 11:14:02 +01:00 |
|
Marcos García de La Fuente
|
728f469c1e
|
FIX #3890 Expected transactions bank account page, shows negative numbers
|
2015-11-07 13:43:59 +01:00 |
|
Marcos García de La Fuente
|
b4c3804c91
|
FIX #3928 Creating a Customer order and a Customer invoice from a project, does not inherit payment conditions and method of payment of customer card
|
2015-11-07 13:21:03 +01:00 |
|
Juanjo Menent
|
f33157033c
|
Merge pull request #3909 from altatof/fixcloseshipping
FIX: change object statut on close shipping and remove erratic db commit
|
2015-11-06 10:16:00 +01:00 |
|
Christophe Battarel
|
4d11205a01
|
FIX: change object statut on close shipping and remove erratic db commit
|
2015-11-06 09:51:33 +01:00 |
|
Laurent Destailleur
|
375e61de2e
|
Merge 3.5
|
2015-11-05 22:01:05 +01:00 |
|
Laurent Destailleur
|
5777c16b72
|
Merge pull request #3902 from altatof/clonedorderdate
FIX: change order date on clone (as everywhere else)
|
2015-11-05 21:49:50 +01:00 |
|
Laurent Destailleur
|
fdf9617e42
|
Merge pull request #3900 from GPCsolutions/dolibarr-3864
Fix #3864 Really fixed invalid jQuery code
|
2015-11-05 21:47:40 +01:00 |
|
Laurent Destailleur
|
d499fafdb9
|
Merge pull request #3901 from altatof/3.6
FIX bad calculation for stock value
|
2015-11-05 21:44:21 +01:00 |
|
Laurent Destailleur
|
60debe31c4
|
Merge pull request #3894 from altatof/stockvalue
FIX bad calculation for stock value
|
2015-11-05 21:44:15 +01:00 |
|
Christophe Battarel
|
316b7453e4
|
FIX bad stock valo
|
2015-11-05 17:04:08 +01:00 |
|
Christophe Battarel
|
80d2445540
|
FIX: bad stock valorisation
|
2015-11-05 17:00:22 +01:00 |
|
Christophe Battarel
|
ad82135879
|
FIX: change order date on clone (as everywhere else)
|
2015-11-05 15:36:13 +01:00 |
|
Christophe Battarel
|
75bcb7e53f
|
fix pmp
|
2015-11-05 15:32:56 +01:00 |
|
Christophe Battarel
|
f566b38296
|
FIX pmp
|
2015-11-05 15:29:51 +01:00 |
|
Christophe Battarel
|
fa088eb6cc
|
FIX bad calculation for stock value
|
2015-11-05 14:57:58 +01:00 |
|
Raphaël Doursenaud
|
b0cf9bd0be
|
Fix #3864 Really fixed invalid jQuery code
|
2015-11-05 14:38:11 +01:00 |
|
Christophe Battarel
|
9b797c1831
|
FIX bad calculation for stock value
|
2015-11-05 12:49:43 +01:00 |
|
Laurent Destailleur
|
fb34f25701
|
Merge pull request #3887 from GPCsolutions/dolibarr-3864
Fix #3864 Fixed invalid jQuery code
|
2015-11-05 02:34:24 +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
|
384c89dcef
|
Merge pull request #3701 from altatof/fix_orderdateonclone
FIX: change order date on clone (as everywhere else)
|
2015-10-09 20:44:03 +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 |
|