Laurent Destailleur
|
7b9facc76a
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-09-25 11:43:12 +02:00 |
|
Laurent Destailleur
|
a9fabf117e
|
Code comment
|
2017-09-25 11:42:59 +02:00 |
|
Laurent Destailleur
|
53d931dd11
|
Merge pull request #7481 from dolibarr95/patch-17
Fix 7470
|
2017-09-25 11:34:00 +02:00 |
|
Laurent Destailleur
|
c3e6577609
|
Merge pull request #7416 from hregis/develop_ldap
NEW add members types ldap group management
|
2017-09-25 11:30:35 +02:00 |
|
dolibarr95
|
6ee15f1c45
|
Fix 7470
php warning when MAIN_MODULE_xxxxx_DIR exists but the module does not have a directory.
|
2017-09-25 09:01:47 +02:00 |
|
Regis Houssin
|
92ff974c5b
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
|
2017-09-25 06:47:34 +02:00 |
|
Laurent Destailleur
|
e3da4188e2
|
GETPOST must not clean data for text input.
|
2017-09-25 00:16:52 +02:00 |
|
Laurent Destailleur
|
3f9cae745c
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-09-24 23:40:57 +02:00 |
|
Laurent Destailleur
|
af384f14ae
|
FIX #7477
|
2017-09-24 23:40:42 +02:00 |
|
Laurent Destailleur
|
cee57129d6
|
Merge pull request #7467 from Oeris/6.0-api
NEW get and post lines of an invoice using the REST API
|
2017-09-24 22:01:33 +02:00 |
|
Laurent Destailleur
|
934edd9f5a
|
Merge branch 'develop' into 6.0-api
|
2017-09-24 22:01:07 +02:00 |
|
Laurent Destailleur
|
ddefdd12fb
|
Merge pull request #7460 from dvasseur/develop
FIX: REST API, date field not used for invoices creation
|
2017-09-24 21:56:41 +02:00 |
|
Laurent Destailleur
|
707c8fde5e
|
Merge pull request #7474 from hregis/develop_trad
Fix: phpcs error
|
2017-09-24 21:47:31 +02:00 |
|
Laurent Destailleur
|
2285e9bc0b
|
Merge branch 'develop' into develop_trad
|
2017-09-24 21:47:17 +02:00 |
|
Laurent Destailleur
|
971e59395c
|
Fix phpcs
|
2017-09-24 21:46:14 +02:00 |
|
Laurent Destailleur
|
7a6180858e
|
Fix phpunit
|
2017-09-24 21:12:50 +02:00 |
|
Laurent Destailleur
|
2e511badf9
|
Code comment
|
2017-09-24 21:02:20 +02:00 |
|
Laurent Destailleur
|
3482b12933
|
Comment deprecated js code
|
2017-09-24 20:55:48 +02:00 |
|
Laurent Destailleur
|
4246cf24f3
|
Perf enhancement: Remove one include of js.
|
2017-09-24 20:36:27 +02:00 |
|
Laurent Destailleur
|
49e9326a6d
|
Code comment
|
2017-09-24 19:50:32 +02:00 |
|
Regis Houssin
|
b48fe684d3
|
Fix: wrong return when cancel
|
2017-09-24 17:43:01 +02:00 |
|
Regis Houssin
|
06ee9f4775
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
|
2017-09-24 16:10:55 +02:00 |
|
Regis Houssin
|
0cdca6f3eb
|
Fix: phpcs error
|
2017-09-24 11:10:33 +02:00 |
|
Laurent Destailleur
|
c65f794f87
|
Code comment
|
2017-09-24 10:29:48 +02:00 |
|
Laurent Destailleur
|
fac4ebec22
|
Code comment
|
2017-09-24 10:26:43 +02:00 |
|
Laurent Destailleur
|
f4b35a304b
|
Update doc
|
2017-09-24 02:32:21 +02:00 |
|
Laurent Destailleur
|
97ece5fda9
|
CSS
|
2017-09-24 01:49:59 +02:00 |
|
Laurent Destailleur
|
87a75a0ad7
|
CSS not bold on jnotify messages
|
2017-09-24 01:46:00 +02:00 |
|
Laurent Destailleur
|
91d303465d
|
NEW Can add html content on right of tabs
|
2017-09-24 01:39:06 +02:00 |
|
Laurent Destailleur
|
b9f2a53b36
|
Debug modulebuilder
|
2017-09-23 23:51:49 +02:00 |
|
Laurent Destailleur
|
b4e461e7ea
|
Debug modulebuilder
|
2017-09-23 18:17:34 +02:00 |
|
Laurent Destailleur
|
bee94b32d9
|
Debug modulebuilder
|
2017-09-23 15:12:25 +02:00 |
|
Laurent Destailleur
|
7d580105c8
|
Fix css
|
2017-09-23 13:02:25 +02:00 |
|
Laurent Destailleur
|
414f633e75
|
Fix css
|
2017-09-23 12:59:49 +02:00 |
|
Laurent Destailleur
|
91beb3a4d6
|
Debug modulebuilder
|
2017-09-23 11:39:09 +02:00 |
|
Laurent Destailleur
|
35d00fd2ec
|
Fix wrap on lites_total
|
2017-09-23 09:28:31 +02:00 |
|
Laurent Destailleur
|
839f3ca41d
|
NEW Can use an url like $conf->global>-MYPARAM for menu urls
|
2017-09-23 03:22:48 +02:00 |
|
Laurent Destailleur
|
a94f2b07e1
|
Fix css
|
2017-09-23 02:46:33 +02:00 |
|
Laurent Destailleur
|
57adc28256
|
Work on modulebuilder
|
2017-09-23 01:45:03 +02:00 |
|
Laurent Destailleur
|
96aed9c29d
|
Work on modulebuilder
|
2017-09-22 23:38:25 +02:00 |
|
Regis Houssin
|
791c385e5b
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_ldap
Conflicts:
htdocs/adherents/card.php
|
2017-09-22 20:26:22 +02:00 |
|
Laurent Destailleur
|
63ec14e47d
|
Convert sode to send member info email into new generic email template
system.
|
2017-09-22 20:18:11 +02:00 |
|
Laurent Destailleur
|
f990667b1a
|
NEW Can send email from the member card using email templates.
|
2017-09-22 17:48:38 +02:00 |
|
Laurent Destailleur
|
8578a1b825
|
NEW Option "one email per recipient" when using bulk actions emails.
|
2017-09-22 17:04:26 +02:00 |
|
Laurent Destailleur
|
6d7db96359
|
NEW Option "one email per recipient" when using bulk actions emails.
|
2017-09-22 16:31:05 +02:00 |
|
Laurent Destailleur
|
d4bde2a4ea
|
Fix date substitution for contracts
|
2017-09-22 15:12:36 +02:00 |
|
Laurent Destailleur
|
252f038468
|
Mutualize code of substitutions for emails
|
2017-09-22 14:34:31 +02:00 |
|
Neil Orley
|
9498fca5e1
|
Add of implementation notes with an exemple
|
2017-09-22 12:24:42 +02:00 |
|
Neil Orley
|
1aedc4a793
|
Change the term 'order' by 'invoice'
|
2017-09-22 12:18:11 +02:00 |
|
Neil Orley
|
ad6778a1cf
|
NEW post lines of an invoice using the REST API
Adds the ability to post a new lins in an invoice using the REST API
|
2017-09-22 12:08:11 +02:00 |
|