Laurent Destailleur
|
28ad50e059
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/tpl/objectline_create.tpl.php
htdocs/langs/de_DE/bills.lang
htdocs/langs/fr_FR/bills.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/fr_FR/suppliers.lang
|
2017-03-03 14:31:35 +01:00 |
|
Laurent Destailleur
|
34e5e5f721
|
FIX #6460
|
2017-03-03 14:19:46 +01:00 |
|
Laurent Destailleur
|
85518c6a54
|
FIX #6479
|
2017-03-03 14:04:40 +01:00 |
|
Laurent Destailleur
|
0a0797e797
|
Rename menu entry
|
2017-03-03 13:36:38 +01:00 |
|
Laurent Destailleur
|
07c828d38f
|
Introduce method loadLangs to save code lines
|
2017-03-03 13:27:51 +01:00 |
|
Laurent Destailleur
|
4929ba16c4
|
Fix on contract card, we must show title in add entry form.
|
2017-03-03 13:14:59 +01:00 |
|
arnaud
|
cff9fa0e6b
|
FIX user odt
|
2017-03-03 12:01:58 +01:00 |
|
arnaud
|
abeba95de9
|
New USER odt
|
2017-03-02 15:13:42 +01:00 |
|
florian HENRY
|
227daee2de
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
dev_NEW_copyeventfiles
Conflicts:
htdocs/core/actions_sendmails.inc.php
|
2017-03-02 14:29:22 +01:00 |
|
Laurent Destailleur
|
8ccc57e70f
|
Fix compatibility with multicompany
|
2017-03-02 11:46:31 +01:00 |
|
dolibarr95
|
d3a80795ce
|
Add label tag
Add a label html tag for the input radio extrafield tag.
|
2017-03-02 11:40:43 +01:00 |
|
Laurent Destailleur
|
1562df8f93
|
Fix responsive design
|
2017-03-02 01:26:15 +01:00 |
|
BENKE Charlie
|
83622c62be
|
Update pdf_crabe.modules.php
|
2017-03-01 21:54:30 +01:00 |
|
Laurent Destailleur
|
d202003e29
|
Fix translation
|
2017-03-01 18:12:06 +01:00 |
|
BENKE Charlie
|
a371b27564
|
better management of situation progress in pdf
|
2017-03-01 16:48:09 +01:00 |
|
Laurent Destailleur
|
8487f0fc96
|
Fix missing setup of new option
|
2017-03-01 11:18:11 +01:00 |
|
Laurent Destailleur
|
3de288ef45
|
Fix badge not compatible with multicompany
|
2017-02-28 21:33:18 +01:00 |
|
Laurent Destailleur
|
3c54cb5ba9
|
Fix avoid trigger during migration
|
2017-02-28 20:55:14 +01:00 |
|
Laurent Destailleur
|
9648f20a2e
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-02-28 12:08:41 +01:00 |
|
Laurent Destailleur
|
59d2943d8d
|
Fix context must be provided to triggers using ->context no a dedicated
property.
|
2017-02-28 12:07:05 +01:00 |
|
Laurent Destailleur
|
40b412728f
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-02-28 11:49:10 +01:00 |
|
Laurent Destailleur
|
43a6366f1b
|
Fix security audit was not triggered.
|
2017-02-28 11:48:46 +01:00 |
|
Laurent Destailleur
|
79c9745442
|
Fix size of fields
|
2017-02-28 11:00:11 +01:00 |
|
Laurent Destailleur
|
0f22beb774
|
Upgrade to ckeditor 4.6.2.
|
2017-02-28 10:49:58 +01:00 |
|
Alexandre SPANGARO
|
05e50e1027
|
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
|
2017-02-28 05:52:43 +01:00 |
|
Laurent Destailleur
|
d12caab69a
|
The hook getNodeList has been replaced by a normalized 'addreplace' hook
getDirList.
|
2017-02-27 02:04:47 +01:00 |
|
Laurent Destailleur
|
74e8fb9c19
|
NEW Can set number of dump to keep with job "local database backup"
|
2017-02-27 02:04:25 +01:00 |
|
Laurent Destailleur
|
43f3e46aac
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-02-27 01:23:48 +01:00 |
|
Laurent Destailleur
|
4f24613de0
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/expensereport/class/expensereport.class.php
|
2017-02-27 01:19:03 +01:00 |
|
Laurent Destailleur
|
92acbbd8a8
|
Fix parameters
|
2017-02-27 00:22:11 +01:00 |
|
Ion
|
320da17c78
|
Add object extrafields to mail form
|
2017-02-26 03:42:42 +01:00 |
|
Laurent Destailleur
|
08915d88d0
|
FIX the dolCopyDir fails if target dir does not exists.
|
2017-02-25 11:53:50 +01:00 |
|
Laurent Destailleur
|
bf591f5f91
|
Work on module website
|
2017-02-24 21:13:40 +01:00 |
|
Laurent Destailleur
|
63bee0c2d0
|
Doxygen
|
2017-02-24 16:23:43 +01:00 |
|
Laurent Destailleur
|
d0ee8c0e2d
|
Merge pull request #6458 from defrance/patch-83
inverted value between FRST & RECUR
|
2017-02-24 15:27:32 +01:00 |
|
Laurent Destailleur
|
1ef899dacc
|
Prepare database to follow supplier discounts
|
2017-02-24 15:22:32 +01:00 |
|
Laurent Destailleur
|
47ea9b57e8
|
Fix Remove debug var_dump
|
2017-02-24 14:41:12 +01:00 |
|
Laurent Destailleur
|
baa1f3ed2b
|
Clean doc about changes in external libraries
|
2017-02-24 14:35:20 +01:00 |
|
Laurent Destailleur
|
fb88eaf2a4
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
|
2017-02-23 02:55:50 +01:00 |
|
Laurent Destailleur
|
e981e719a1
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/comm/action/card.php
|
2017-02-23 02:54:40 +01:00 |
|
Laurent Destailleur
|
7673aff3ba
|
Fix js errors
|
2017-02-23 02:51:26 +01:00 |
|
Laurent Destailleur
|
a79903a2fc
|
Fix responsive design
|
2017-02-23 01:29:35 +01:00 |
|
Laurent Destailleur
|
fbecb1b2d8
|
Work on removal of jmobile
|
2017-02-23 00:45:27 +01:00 |
|
Laurent Destailleur
|
d7e1a6e4f0
|
Fix no timer for browser notification if on login page
|
2017-02-22 21:18:34 +01:00 |
|
Laurent Destailleur
|
1e45e64a9a
|
Files sent from ECM module are also indexed in database.
|
2017-02-22 20:35:42 +01:00 |
|
Laurent Destailleur
|
b66ba6c57c
|
Fix warning
|
2017-02-22 19:48:15 +01:00 |
|
Laurent Destailleur
|
64721d73b6
|
Remove not so usefull plugin jquery layout (prepare js upgrades)
|
2017-02-22 19:36:57 +01:00 |
|
Laurent Destailleur
|
92d9eb3c5d
|
Several fix for a better management of #6424
|
2017-02-22 17:46:54 +01:00 |
|
BENKE Charlie
|
299551f851
|
inverted value between FRST & RECUR
|
2017-02-22 15:59:10 +01:00 |
|
Laurent Destailleur
|
24c2675705
|
Merge pull request #6424 from atm-florian/dev_can_send_to_multiple_email
NEW : Can send email to multiple destinaries from mail form
|
2017-02-22 14:39:35 +01:00 |
|