Commit Graph

69348 Commits

Author SHA1 Message Date
Laurent Destailleur
cc3e34d340
Merge pull request #11997 from frederic34/patch-13
Update api_orders.class.php for doxygen
2019-10-01 11:13:55 +02:00
Laurent Destailleur
c7fa4c91ce
Merge pull request #11996 from frederic34/phpcalendar
check php-calendar extension
2019-10-01 11:13:38 +02:00
Laurent Destailleur
2d8e3aad5b
Merge pull request #12001 from frederic34/patch-17
Update box_prospect.php to show email
2019-10-01 11:13:01 +02:00
Laurent Destailleur
c079c69579
Merge pull request #11999 from frederic34/patch-15
Update api_boms.class.php
2019-10-01 11:12:48 +02:00
Laurent Destailleur
34a8e582fd
Merge pull request #12003 from frederic34/patch-19
Update box_commandes.php to show email
2019-10-01 11:12:32 +02:00
Frédéric FRANCE
6a7170f725
Merge remote-tracking branch 'upstream/develop' into phpcalendar 2019-10-01 07:55:09 +02:00
Laurent Destailleur
bd76c1da11 Look and feel v10 2019-10-01 01:35:11 +02:00
Frédéric FRANCE
f3f2ab8aad
Update box_commandes.php 2019-09-30 22:45:28 +02:00
Frédéric FRANCE
d0e9e9568a
Update box_prospect.php 2019-09-30 22:40:07 +02:00
Laurent Destailleur
155ccc95db Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-30 22:00:52 +02:00
Laurent Destailleur
91b7e81085 Fix warnings 2019-09-30 21:51:42 +02:00
Frédéric FRANCE
f2ac207df5
Update api_boms.class.php 2019-09-30 21:51:04 +02:00
Laurent Destailleur
73beec6526
Merge pull request #11994 from atm-john/develop_fix_event_back_url
FIX : Action com redirection
2019-09-30 21:48:07 +02:00
Frédéric FRANCE
f3a38ef1af
Update api_orders.class.php 2019-09-30 21:41:07 +02:00
Frédéric FRANCE
31418c2e42
check php-calendar extension 2019-09-30 21:14:25 +02:00
Laurent Destailleur
0846a081cb
Merge branch 'develop' into new_branch_29_06_2019 2019-09-30 21:06:51 +02:00
ATM john
e08fc2213c FIX : action com redirect 2019-09-30 20:44:56 +02:00
Laurent Destailleur
3ca1a9ba28 Merge branch 'test_pgsql_installation' of https://github.com/atm-greg/dolibarr into atm-greg-test_pgsql_installation 2019-09-30 19:59:52 +02:00
Laurent Destailleur
33908afb66 Update zapier logo 2019-09-30 19:30:31 +02:00
Laurent Destailleur
7c9aabfd3b
Merge pull request #11223 from frederic34/zapier
NEW zapier for dolibarr
2019-09-30 19:20:14 +02:00
Laurent Destailleur
d9e9364ddf Close #11689 Close #11696 2019-09-30 19:00:19 +02:00
Laurent Destailleur
14f7e48fe5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-30 18:50:33 +02:00
Laurent Destailleur
a56b9e1ca9 The trigger BON_PRELEVEMENT has been renamed into
DIRECT_DEBIT_ORDER_CREATE.
2019-09-30 18:50:23 +02:00
Laurent Destailleur
cff8f582e7
Update bonprelevement.class.php 2019-09-30 18:47:18 +02:00
Frédéric FRANCE
fec67aade4
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-30 18:44:34 +02:00
Laurent Destailleur
9d5b84ec44
Merge branch 'develop' into fix_9.0_withdraw_trigger_create_missing 2019-09-30 18:39:46 +02:00
Frédéric FRANCE
a5fce6cca8
Update CMailFile.class.php 2019-09-30 18:25:54 +02:00
Frédéric FRANCE
ac4d72bb74
typo 2019-09-30 18:12:56 +02:00
Laurent Destailleur
d3eafa86d7
Merge pull request #11988 from frederic34/patch-12
Add hook beforeAgenda in comm/action/index.php
2019-09-30 18:03:25 +02:00
Laurent Destailleur
0e73beaccc
Merge pull request #11987 from andreubisquerra/master
Custome receipt tab in TakePOS
2019-09-30 18:03:03 +02:00
Laurent Destailleur
ecc2e8df67 Fix restore lost images 2019-09-30 17:58:31 +02:00
Laurent Destailleur
dc7ad61940 Add class reposition on button that switch the view mode 2019-09-30 17:46:53 +02:00
Laurent Destailleur
b390cff172 Fix css 2019-09-30 17:22:22 +02:00
Laurent Destailleur
48fc165026 Trans 2019-09-30 17:15:05 +02:00
Laurent Destailleur
ce7e8c83a3 Use a dedicated css imgforviewmode for button used to switch view 2019-09-30 17:08:57 +02:00
Frédéric FRANCE
4a305ec95c
Add hook beforeAgenda in comm/action/index.php 2019-09-30 15:59:05 +02:00
Laurent Destailleur
d65af06d20
Merge pull request #11869 from atm-john/new_ticket_messaging_page
New ticket messaging page design
2019-09-30 15:34:35 +02:00
Laurent Destailleur
d8de78dca9
Merge pull request #11984 from fuhraih/develop
Fix 11554 and 7533
2019-09-30 15:31:41 +02:00
Laurent Destailleur
b28cd1bb57
Merge pull request #11972 from aspangaro/11.0_fa_icon
NEW Add fa_icon on load_fiche_titre
2019-09-30 15:26:28 +02:00
Laurent Destailleur
bbc98c19bc
Update functions.lib.php 2019-09-30 15:25:55 +02:00
Laurent Destailleur
5b582d1117 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-30 15:18:28 +02:00
Laurent Destailleur
bc1e59ee23
Merge pull request #11982 from frederic34/patch-13
Add sendcontext to notification emails
2019-09-30 15:18:12 +02:00
Laurent Destailleur
7dd4a829a5 Comment 2019-09-30 15:18:05 +02:00
Laurent Destailleur
0a75c0645d
Merge branch 'develop' into develop_fix_land_loading 2019-09-30 15:15:12 +02:00
Laurent Destailleur
df1a23ed76 Code comment 2019-09-30 13:04:01 +02:00
Laurent Destailleur
f6b60290f0 FIX Css on disabled standard combo 2019-09-30 11:57:25 +02:00
Alexandre SPANGARO
aec50d3ac9 NEW Add fa_icon on load_fiche_titre 2019-09-30 10:14:55 +02:00
Frédéric FRANCE
258424416e
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-30 07:49:52 +02:00
Laurent Destailleur
a2140412e0 Fix title 2019-09-30 00:41:38 +02:00
andreubisquerra
741447d990 Fix Travis errors 2019-09-29 21:30:06 +02:00