Commit Graph

79724 Commits

Author SHA1 Message Date
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
d3977166c1
Merge pull request #11978 from atm-john/develop_fix_land_loading
Fix : lang loaded
2019-09-30 15:15:21 +02:00
Laurent Destailleur
0a75c0645d
Merge branch 'develop' into develop_fix_land_loading 2019-09-30 15:15:12 +02:00
John Botella
c27f077f03 fix css 2019-09-30 13:52:06 +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
ATM john
e77e5ee2e3 Merge branch 'develop_dropdown_bookmark' of github.com:atm-john/dolibarr into develop_dropdown_bookmark 2019-09-29 20:25:50 +02:00
ATM john
2684daabc7 Fix menu size according to conf and module enabled 2019-09-29 20:25:39 +02:00
stickler-ci
c8ab03432b Fixing style errors. 2019-09-29 17:59:12 +00:00
ATM john
455dd279e3 Add hidden conf 2019-09-29 19:54:25 +02:00
ATM john
5e4694cc35 Drop down position and behavior 2019-09-29 19:46:41 +02:00
Laurent Destailleur
d2881eb85b FIX CSS
Conflicts:
	htdocs/core/tpl/extrafields_list_search_input.tpl.php
2019-09-29 19:26:37 +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
ATM john
cd821261e8 Add global search dropdown 2019-09-29 18:56:28 +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
ptibogxiv
4177c72ae0
Update facture.class.php 2019-09-29 15:46:28 +02:00
ptibogxiv
2e8b99606e
Update facture.class.php 2019-09-29 15:45:41 +02:00
ptibogxiv
5a096972c0
Update list.php 2019-09-29 15:42:39 +02:00
ptibogxiv
f132f2f947
Update 10.0.0-11.0.0.sql 2019-09-29 15:40:26 +02:00
ptibogxiv
d0b06a1eab
Update llx_facture.sql 2019-09-29 15:39:59 +02:00
ATM john
e5f1379ef3 Fix css 2019-09-29 13:10:39 +02:00
ATM john
37f476bd8f Add shortcut , searchable items and list 2019-09-29 12:51:27 +02:00
ATM john
cc1d490135 Prepare dropdown bookmark menu 2019-09-29 11:47:34 +02:00
stickler-ci
103efbbe5b Fixing style errors. 2019-09-28 20:55:58 +00:00
Alexandre SPANGARO
8e42ac8cd0 Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal 2019-09-28 22:31:08 +02: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
Laurent Destailleur
e7beadb58a Remove duplicate 2019-09-28 10:42:58 +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
fuhraih
5757159c30 FIX #7533 Infinite loop in Agenda per user view if workinghours not set
correctly
Remove the spaces in the Working_hours and Working_days stored
2019-09-27 22:29:12 +02:00
obrunet
3e4e64ab1a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2019-09-27 21:36:35 +02:00
ATM john
d7d5b87cf2 Fix lang loaded 2019-09-27 21:29:55 +02:00
fuhraih
40a8fe3e79 FIX #11554 Extrafields: members autosubscription formular issue 2019-09-27 21:26:06 +02:00
florian HENRY
f1d098adcc fix remove error dispplaying 2019-09-27 20:15:11 +02:00
florian HENRY
885d958e63 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-27 20:12:09 +02:00