Frédéric FRANCE
|
1ea6df14d0
|
Update card.php
|
2017-11-08 11:35:15 +01:00 |
|
Laurent Destailleur
|
6eb2204c2b
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
htdocs/product/list.php
|
2017-11-06 21:20:06 +01:00 |
|
Laurent Destailleur
|
1d9873e1a9
|
FIX #7756 Add better error message
|
2017-11-06 21:17:30 +01:00 |
|
Laurent Destailleur
|
bc9b816719
|
Fix deletion of files that contains __
|
2017-11-06 17:54:18 +01:00 |
|
Laurent Destailleur
|
825ceeaa8d
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-11-06 11:47:20 +01:00 |
|
Laurent Destailleur
|
864af9cc3b
|
Fix error not returned if output directory not writable
|
2017-11-06 11:47:03 +01:00 |
|
Laurent Destailleur
|
d453961afc
|
Merge pull request #7758 from atm-maxime/fix_search_service
Fix : type was forced to 0 so service are not in the list
|
2017-11-05 18:30:20 +01:00 |
|
Laurent Destailleur
|
7d4b43f368
|
Merge pull request #7757 from atm-maxime/fix_search_product
Fix display of product/service list
|
2017-11-05 18:29:24 +01:00 |
|
Laurent Destailleur
|
d3a0cff30a
|
Merge pull request #7755 from frederic34/currency
default currency on propal create
|
2017-11-05 18:28:40 +01:00 |
|
Laurent Destailleur
|
52421406ce
|
FIX #7751
|
2017-11-05 18:25:33 +01:00 |
|
Laurent Destailleur
|
eb4a5f6570
|
Fix link can't be a htm link in innosetup
|
2017-11-05 18:21:29 +01:00 |
|
Maxime Kohlhaas
|
e992e4bea5
|
Fix : type was forced to 0 so service are not in the list
|
2017-11-03 09:09:07 +01:00 |
|
Maxime Kohlhaas
|
13667e4850
|
Fix display of product/service list
|
2017-11-03 08:56:23 +01:00 |
|
Frédéric FRANCE
|
b58df17545
|
default currency on propal create
|
2017-11-02 18:14:55 +01:00 |
|
Laurent Destailleur
|
a291919cf7
|
Merge pull request #7754 from atm-gauthier/6.0_fix_filter_typeactioncomm_with_multiselect
FIX : Wrong alias sql
|
2017-11-02 16:40:40 +01:00 |
|
gauthier
|
03544f783a
|
FIX : Wrong alias sql
|
2017-11-02 16:16:29 +01:00 |
|
Laurent Destailleur
|
6ea69f421f
|
Merge pull request #7752 from atm-gauthier/6.0_fix_filter_typeactioncomm_with_multiselect
FIX : Filter type on actioncomm with multiselect doesn't work
|
2017-11-02 15:51:49 +01:00 |
|
Laurent Destailleur
|
310bf4bde4
|
Update peruser.php
|
2017-11-02 15:51:35 +01:00 |
|
Laurent Destailleur
|
ec3a07cd52
|
Try to restore compatibility when actioncode=CODE1,CODE2,...
|
2017-11-02 15:50:55 +01:00 |
|
Laurent Destailleur
|
63a363080e
|
Update index.php
|
2017-11-02 15:48:56 +01:00 |
|
Laurent Destailleur
|
323a0d7d0d
|
Update index.php
|
2017-11-02 15:48:24 +01:00 |
|
gauthier
|
b7cf434ebd
|
FIX : Filter type on actioncomm with multiselect doesn't work
|
2017-11-02 14:58:33 +01:00 |
|
Laurent Destailleur
|
555b37411f
|
Merge pull request #7750 from atm-florian/6.0_missinghook
fix : missing hook in accountancy
|
2017-11-02 13:53:45 +01:00 |
|
florian HENRY
|
bd68b94411
|
fix : missing hook in accountancy
|
2017-11-02 13:27:09 +01:00 |
|
Laurent Destailleur
|
fb3f1ef667
|
Code comment
|
2017-11-02 09:49:41 +01:00 |
|
Laurent Destailleur
|
4755197503
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-11-02 09:42:47 +01:00 |
|
Laurent Destailleur
|
59df957181
|
Fix return HTTP code 501 if calling a non existing api
|
2017-11-02 01:43:27 +01:00 |
|
Laurent Destailleur
|
192dc43b87
|
Fix regression
|
2017-11-02 01:16:42 +01:00 |
|
Laurent Destailleur
|
91fbb4da41
|
Fix changelog
|
2017-11-01 20:12:15 +01:00 |
|
Laurent Destailleur
|
a6879775bb
|
FIX Search into language is ok for file into external modules two.
|
2017-11-01 20:05:28 +01:00 |
|
Laurent Destailleur
|
3db101ffdd
|
Clean packager
|
2017-10-31 01:06:07 +01:00 |
|
Laurent Destailleur
|
2b966e630b
|
Doc
|
2017-10-30 19:49:48 +01:00 |
|
Laurent Destailleur
|
892798bf79
|
Code comment
|
2017-10-30 12:40:12 +01:00 |
|
Laurent Destailleur
|
007783cf76
|
FIX Searching translation should not be case sensitive
|
2017-10-30 01:45:39 +01:00 |
|
Laurent Destailleur
|
0de1b878bd
|
Prepare 6.0.4
|
2017-10-29 16:17:52 +01:00 |
|
Laurent Destailleur
|
777d2f7027
|
Prepare 5.0.8
|
2017-10-29 16:17:36 +01:00 |
|
Laurent Destailleur
|
78645c718f
|
Fix position of quick search
|
2017-10-29 16:15:54 +01:00 |
|
Laurent Destailleur
|
0b271cca46
|
Prepare 5.0.7
|
2017-10-29 10:38:57 +01:00 |
|
Laurent Destailleur
|
985a268477
|
Update doc
|
2017-10-28 22:10:56 +02:00 |
|
Laurent Destailleur
|
cd5e43483e
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/contrat/card.php
htdocs/core/lib/project.lib.php
htdocs/expedition/card.php
htdocs/projet/class/task.class.php
|
2017-10-28 22:08:16 +02:00 |
|
Laurent Destailleur
|
02f47b5a91
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-10-28 22:03:23 +02:00 |
|
Laurent Destailleur
|
4feecbeab8
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-10-28 22:03:06 +02:00 |
|
Laurent Destailleur
|
0630542e20
|
Merge pull request #7723 from atm-maxime/fix_contract_desc
Fix : contract lines from origin were containing all lines desc
|
2017-10-28 22:02:13 +02:00 |
|
Laurent Destailleur
|
783efd1a71
|
Merge pull request #7722 from fmarcet/4.0
FIX: paid supplier invoices are shown as abandoned
|
2017-10-28 22:01:30 +02:00 |
|
Laurent Destailleur
|
5313d61847
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-10-28 20:35:35 +02:00 |
|
Laurent Destailleur
|
92c33b76dc
|
Fix position of search element in quick search
|
2017-10-28 20:35:21 +02:00 |
|
Maxime Kohlhaas
|
7c1d6251f7
|
Fix : contract lines from origin were containing all lines desc
|
2017-10-27 13:27:38 +02:00 |
|
Ferran Marcet
|
9178d80349
|
Merge remote-tracking branch 'origin/4.0' into 4.0
|
2017-10-27 11:52:15 +02:00 |
|
Ferran Marcet
|
bc8127d685
|
Fix: paid supplier invoices are shown as abandoned on the consumption card.
|
2017-10-27 11:52:05 +02:00 |
|
Laurent Destailleur
|
8e18d5906d
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-10-27 02:32:28 +02:00 |
|