Commit Graph

89109 Commits

Author SHA1 Message Date
Frédéric FRANCE
ac4d72bb74
typo 2019-09-30 18:12:56 +02:00
Laurent Destailleur
4f356fa412
Merge pull request #11859 from altatof/avoir
FIX : allow standalone credit note even if no invoice
2019-09-30 18:12:55 +02:00
Laurent Destailleur
945dd0ae89
Update card.php 2019-09-30 18:12:43 +02:00
Laurent Destailleur
22f07fe54d
Merge branch 'develop' into patch-234 2019-09-30 18:09:05 +02:00
Laurent Destailleur
29d941cb6e
Merge pull request #11918 from atm-gauthier/8.0_fix_discount_visibility_follows_invoice_sharing
FIX : If we share invoice, we need to see discount created from a deposit on each entity
2019-09-30 18:04:07 +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
John Botella
61c8e8ec0c Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_dropdown_bookmark 2019-09-30 17:13:54 +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
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
Frédéric FRANCE
c7120e9e31
test 2019-09-29 20:36:18 +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
21db14b22a Fixing style errors. 2019-09-29 18:21:26 +00:00
Frédéric FRANCE
0735bb5860
test 2019-09-29 20:21:05 +02:00
Frédéric FRANCE
1a12c93dc7
test 2019-09-29 20:06:30 +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
Frédéric FRANCE
1ef3a67644
test 2019-09-29 19:26:25 +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
Frédéric FRANCE
4bac865205
test 2019-09-29 18:40:36 +02:00
Laurent Destailleur
0f2b36bb82 Work on MRP module 2019-09-29 18:39:52 +02:00
Frédéric FRANCE
cedad3dc26
fix?
fix?

fix
2019-09-29 18:23:31 +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