Commit Graph

69332 Commits

Author SHA1 Message Date
Laurent Destailleur
0846a081cb
Merge branch 'develop' into new_branch_29_06_2019 2019-09-30 21:06:51 +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
andreubisquerra
34be514326 Custom receipt tab in TakePOS 2019-09-29 20:56:24 +02:00
Laurent Destailleur
64e710fc1b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-29 19:22:22 +02:00
Laurent Destailleur
8acf7298b2 FIX CSS 2019-09-29 19:22:01 +02:00
Laurent Destailleur
266aace5d1 Trans 2019-09-29 18:55:48 +02:00
Laurent Destailleur
0f2b36bb82 Work on MRP module 2019-09-29 18:39:52 +02:00
Laurent Destailleur
a9f88b84d8
Merge pull request #11981 from frederic34/patch-12
Update box_supplier_orders_awaiting_reception.php
2019-09-29 16:26:44 +02:00
stickler-ci
103efbbe5b Fixing style errors. 2019-09-28 20:55:58 +00:00
Laurent Destailleur
2b57d486dc NEW Upgrade ACE editor to v1.4.6 2019-09-28 13:50:32 +02:00
Laurent Destailleur
a19fd8507e Trans 2019-09-28 13:47:51 +02:00
Laurent Destailleur
6966651d51 Standardize code to use dolSqlDateFilter 2019-09-28 13:22:05 +02:00
Laurent Destailleur
db32ca99c6 Fix translation and sql request 2019-09-28 12:36:09 +02:00
Laurent Destailleur
86e5465197 Standardize extrafields code 2019-09-28 10:55:09 +02:00
Frédéric FRANCE
2eaf3c0dda
Add sendcontext to notification emails 2019-09-28 10:25:00 +02:00
Frédéric FRANCE
710154fb9d
Update box_supplier_orders_awaiting_reception.php 2019-09-28 09:00:52 +02:00
Alexandre SPANGARO
288aea190b Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon 2019-09-28 06:09:40 +02:00
Alexandre SPANGARO
7f93f046e9 NEW Add fa_icon on load_fiche_titre 2019-09-28 06:02:25 +02:00