Frédéric FRANCE
|
6a91b16995
|
info bank
|
2017-11-25 12:13:03 +01:00 |
|
Laurent Destailleur
|
0b9a3087ea
|
Fix bug reported by scrutinizer
|
2017-11-25 12:11:02 +01:00 |
|
Laurent Destailleur
|
412c4e335d
|
Fix method of herited object has same signature than parent
|
2017-11-25 11:10:52 +01:00 |
|
Laurent Destailleur
|
88841ccbae
|
FIX #7590
|
2017-11-25 01:58:11 +01:00 |
|
Laurent Destailleur
|
b8251bac97
|
Fix rename files with accents
|
2017-11-25 00:48:19 +01:00 |
|
Laurent Destailleur
|
4cff4c6935
|
Simplify and standardize code for agenda pages
|
2017-11-25 00:12:45 +01:00 |
|
Laurent Destailleur
|
c16a150a70
|
NEW Remove background on agenda view when event is a not busy event.
|
2017-11-24 20:02:46 +01:00 |
|
Laurent Destailleur
|
7ea96d53a2
|
Minor fixes
|
2017-11-24 18:12:01 +01:00 |
|
Laurent Destailleur
|
63d2d38c5f
|
Fix export stock with lot
|
2017-11-24 17:47:40 +01:00 |
|
Laurent Destailleur
|
8659d97e97
|
Fix export of lot must use properties of lot from product_lot
|
2017-11-24 17:44:19 +01:00 |
|
Laurent Destailleur
|
4f4f929efb
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/holiday/class/holiday.class.php
|
2017-11-24 17:02:14 +01:00 |
|
Laurent Destailleur
|
2493c2468d
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/core/class/conf.class.php
htdocs/core/lib/files.lib.php
|
2017-11-24 16:51:59 +01:00 |
|
Laurent Destailleur
|
0370368d04
|
Restore lost field during merge
|
2017-11-24 16:46:50 +01:00 |
|
Laurent Destailleur
|
d7f5f14f46
|
Merge branch 'develop' into new_export_stock_valo
|
2017-11-24 16:40:36 +01:00 |
|
Laurent Destailleur
|
aa2397ff1d
|
Merge pull request #7859 from vvnt/patch-9
modPropale.class.php permissions in English
|
2017-11-24 16:34:02 +01:00 |
|
Laurent Destailleur
|
8bd2707678
|
Merge pull request #7858 from vvnt/patch-8
modFacture.class.php permissions in English
|
2017-11-24 16:33:42 +01:00 |
|
Laurent Destailleur
|
a18824050c
|
Merge pull request #7857 from vvnt/patch-7
modSociete.class.php permissions in English
|
2017-11-24 16:33:22 +01:00 |
|
Laurent Destailleur
|
21764ed0cf
|
Merge pull request #7856 from frederic34/patch-1
Update html.form.class.php
|
2017-11-24 16:33:00 +01:00 |
|
Laurent Destailleur
|
438a68968f
|
Fix regression
|
2017-11-24 16:28:24 +01:00 |
|
Laurent Destailleur
|
831099fef8
|
Debug modulebuilder
|
2017-11-24 16:24:42 +01:00 |
|
Laurent Destailleur
|
3db52b5f9e
|
Debug responsive of v7
|
2017-11-24 14:23:25 +01:00 |
|
Laurent Destailleur
|
abe13d108b
|
Clean code used for autocompletion
|
2017-11-24 09:23:18 +01:00 |
|
Laurent Destailleur
|
9c22b5f335
|
Replace deprecated dol_print_graph with DolGraph
|
2017-11-23 20:24:05 +01:00 |
|
Maxime Kohlhaas
|
cad2fedf70
|
New add pmp and cost price in product stock export
|
2017-11-23 18:41:48 +01:00 |
|
Laurent Destailleur
|
5cf21fef05
|
Use autocompletion on list of taxes
|
2017-11-23 15:46:52 +01:00 |
|
Laurent Destailleur
|
b93e35cdd2
|
Fix a lot of request to use the IN getentity instead of =
Fix a lot of request to use left join on type of payment table
|
2017-11-23 15:06:16 +01:00 |
|
Laurent Destailleur
|
295b4483d4
|
Enhance the repair.php tool
|
2017-11-23 13:23:16 +01:00 |
|
Frédéric FRANCE
|
0ee30171db
|
Update html.form.class.php
|
2017-11-23 08:36:10 +01:00 |
|
Laurent Destailleur
|
5b77fe393e
|
Fix: contact not preselected
|
2017-11-23 00:59:43 +01:00 |
|
vvnt
|
09f4abd38e
|
modPropale.class.php permissions in English
|
2017-11-22 23:22:43 +01:00 |
|
vvnt
|
10ba9a2fee
|
modFacture.class.php permissions in English
|
2017-11-22 23:16:15 +01:00 |
|
vvnt
|
1b646f755d
|
modSociete.class.php permissions in English
|
2017-11-22 23:11:36 +01:00 |
|
Laurent Destailleur
|
5a2fe13958
|
Fix travis
|
2017-11-22 21:36:01 +01:00 |
|
Laurent Destailleur
|
b0cecab22b
|
Removed useless code
|
2017-11-22 21:26:24 +01:00 |
|
Laurent Destailleur
|
240f67d82b
|
Disable tab if not on develop mode
|
2017-11-22 21:23:42 +01:00 |
|
Laurent Destailleur
|
5fa8db1650
|
Work on timesheets
|
2017-11-22 21:19:40 +01:00 |
|
Laurent Destailleur
|
adce4b5b7b
|
Debug multi contact on event.
Prepare also code to manage properties of attendees of event
|
2017-11-22 14:42:47 +01:00 |
|
Laurent Destailleur
|
fd5cb736ce
|
Merge pull request #6961 from atm-ph/new_event_with_multi_contact
New multi contacts on actioncomm
|
2017-11-22 12:05:04 +01:00 |
|
Laurent Destailleur
|
aa91b9075a
|
Fix cancel button
|
2017-11-22 11:54:02 +01:00 |
|
Laurent Destailleur
|
d2b3fc5813
|
Merge pull request #7849 from IonAgorria/resources-card
NEW: Merge resource/add.php to resource/card.php
|
2017-11-22 11:33:56 +01:00 |
|
Laurent Destailleur
|
30d0c4f210
|
Merge pull request #7845 from vvnt/patch-6
modSociete.class.php (spelling correction)
|
2017-11-22 11:33:03 +01:00 |
|
Laurent Destailleur
|
918a51b9da
|
Merge pull request #7844 from vvnt/patch-5
modPropale.class.php (spelling correction)
|
2017-11-22 11:28:25 +01:00 |
|
Laurent Destailleur
|
f6cc441c2e
|
Merge pull request #7843 from vvnt/patch-4
Update modFacture.class.php (Spelling correction)
|
2017-11-22 11:28:05 +01:00 |
|
Laurent Destailleur
|
62da0160e1
|
Merge pull request #7780 from fappels/develop_update_tablednd
FIX #3551 and #6823 table drag and drop not working.
|
2017-11-22 11:22:14 +01:00 |
|
Laurent Destailleur
|
c3d8ef2104
|
Update functions.lib.php
|
2017-11-22 11:14:52 +01:00 |
|
Regis Houssin
|
a9bfe0f48f
|
Fix: some problems with medias in multicompany (backport 6.0 commit 762b4eb876)
|
2017-11-22 10:12:51 +01:00 |
|
Regis Houssin
|
848a27283b
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_member
|
2017-11-22 09:51:57 +01:00 |
|
Regis Houssin
|
1595bb1148
|
NEW add possibility to remove address field
|
2017-11-22 09:51:46 +01:00 |
|
Ion
|
7c6622f5b3
|
Merge resource/add.php to resource/card.php
|
2017-11-21 20:12:55 +01:00 |
|
vvnt
|
c74eef03dd
|
modSociete.class.php (spelling correction)
Minor spelling correction.
|
2017-11-21 15:17:02 +01:00 |
|