Laurent Destailleur
4e4ad4548a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-02-24 15:51:28 +01:00
Laurent Destailleur
5733826a68
Fix do not lose the user of expense report when we edit it.
2017-02-24 15:51:10 +01:00
Laurent Destailleur
7559437d8b
Merge pull request #6464 from defrance/patch-85
...
add selectform choice for private mailing
2017-02-24 15:29:37 +01:00
Laurent Destailleur
77d5de6470
Merge pull request #6466 from laudeco/fix/edition_expense_report_without_tva
...
fix edition of expense report without vat
2017-02-24 15:29:13 +01:00
Laurent Destailleur
bc41b6dfe2
Merge pull request #6459 from defrance/patch-84
...
Add selectform for frst recur option (better usage)
2017-02-24 15:28:16 +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
69eb64a975
Merge pull request #6463 from laudeco/fix/expense_report_validation
...
use access right to validate expense report created for someone else
2017-02-24 15:25:02 +01:00
Laurent Destailleur
1ef899dacc
Prepare database to follow supplier discounts
2017-02-24 15:22:32 +01:00
Laurent Destailleur
4804cc47bd
Clean and uniformize code
2017-02-24 15:16:53 +01:00
Laurent Destailleur
47ea9b57e8
Fix Remove debug var_dump
2017-02-24 14:41:12 +01:00
Laurent Destailleur
559478048c
Move resources for theme at a batter place
2017-02-24 14:38:20 +01:00
Laurent Destailleur
f75af2af37
Close #6146 - Let's experiment fontawesome.
2017-02-24 14:37:18 +01:00
Laurent Destailleur
baa1f3ed2b
Clean doc about changes in external libraries
2017-02-24 14:35:20 +01:00
De Coninck Laurent
7e80505104
prepend the author firstname and lastname for ER ref
...
Instead of using the validator of the ER use the author firstname and last name.
This is not always the case as soon ass someone can create ER for someone else
2017-02-24 13:49:34 +01:00
De Coninck Laurent
8be9679f84
add space
2017-02-24 12:31:14 +01:00
De Coninck Laurent
4fc0468356
fix edition of expense report without vat
2017-02-24 12:07:32 +01:00
BENKE Charlie
a2611e31fe
add selectform choice for private mailing
...
better usability than enter 0 ou 1 value
2017-02-24 11:12:14 +01:00
De Coninck Laurent
6961db0007
use access right to validate expense report created for someone else
2017-02-24 11:01:52 +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
0ada82baa0
Remove useless line that show "root" in EDM module.
2017-02-23 01:00:44 +01:00
Laurent Destailleur
49d0deea39
NEW Upgrade jquery to 3.3.1 and jquery-ui to 1.12
2017-02-23 00:46:19 +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
bab4f5c185
Removed useless library FPDFI.
2017-02-22 18:00:34 +01:00
Laurent Destailleur
92d9eb3c5d
Several fix for a better management of #6424
2017-02-22 17:46:54 +01:00
BENKE Charlie
55070ab907
Add selectform for frst recur option (better usage)
2017-02-22 16:51:30 +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
Laurent Destailleur
aefdc09cdc
Fix missing MAIN_DISABLE_PDF_AUTOUPDATE
2017-02-22 14:33:44 +01:00
Laurent Destailleur
ba03b17354
Fix css
2017-02-22 14:30:39 +01:00
Laurent Destailleur
5a3873cfb7
Merge pull request #6455 from laudeco/fix/generation_billing_on_validation
...
generate new pdf when validate billing
2017-02-22 14:25:21 +01:00
Laurent Destailleur
b32c552fbc
Merge pull request #6447 from aternatik/fix_6446
...
Fix #6446 : Event status lost after assign or remouve user
2017-02-22 14:21:50 +01:00
Laurent Destailleur
485bbe3336
Merge pull request #6441 from atm-arnaud/NEW_pdf_supplier_payment
...
NEW pdf supplier payment
2017-02-22 14:21:00 +01:00
Laurent Destailleur
a0fb53d5b1
Merge branch 'develop' into NEW_pdf_supplier_payment
2017-02-22 14:20:47 +01:00
Laurent Destailleur
cbe855370b
Merge pull request #6451 from laudeco/feature/list_user_by_firstname
...
FIX - use MAIN_FIRSTNAME_NAME_POSITION for select users
2017-02-22 14:17:00 +01:00
Laurent Destailleur
3f3b82ed64
Merge pull request #6454 from atm-florian/dev_fix_unittrad
...
fix unit trad
2017-02-22 14:16:28 +01:00
Laurent Destailleur
daf1dbb3a1
FIX #6453
2017-02-22 14:09:19 +01:00
Laurent Destailleur
89b52e24f6
Fix menu navigation
2017-02-22 02:41:21 +01:00
Laurent Destailleur
86c399db70
Clean admin menu entries
2017-02-22 02:32:35 +01:00
Laurent Destailleur
d5bb208957
Clean admin menu entries
2017-02-22 02:19:50 +01:00
Laurent Destailleur
fc6fb61476
Minor fix in typo
2017-02-22 02:19:05 +01:00
Laurent Destailleur
bb72121179
Fix menu loading
2017-02-22 01:47:22 +01:00
Laurent Destailleur
cbb80e6727
Fixfield at wrong place
2017-02-22 00:08:52 +01:00
Laurent Destailleur
1681445427
Remove useless line
2017-02-22 00:08:25 +01:00
