Commit Graph

7858 Commits

Author SHA1 Message Date
Tobias Sekan
199fb3be0f Fix non-numeric value encountered on ical export 2019-10-15 14:29:27 +02:00
Laurent Destailleur
fb3d20107c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/exports/export.php
	htdocs/filefunc.inc.php
2019-10-15 03:51:57 +02:00
Laurent Destailleur
65b6bc26ba Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/facture/list.php
2019-10-14 23:54:24 +02:00
Laurent Destailleur
0fe3159a8a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/fourn/facture/list.php
2019-10-14 23:52:46 +02:00
Laurent Destailleur
0d4866c38c Merge pull request #12118 from iouston/patch-3
NEW: Add 2 hidden options to set the default sorting (sort and order) on document page
2019-10-14 21:23:59 +02:00
Laurent Destailleur
176436ec34 Update document.php 2019-10-14 21:23:52 +02:00
Laurent Destailleur
5d02763288 Merge pull request #12129 from cyrilus/develop
ADD option MAIN_DONT_KEEP_NOTE_ON_CLONING to remove note on cloning
2019-10-14 20:39:08 +02:00
stickler-ci
4b7987374b Fixing style errors. 2019-10-14 14:46:04 +00:00
iouston
0a9cc96564 Update document.php
Add 2 hidden options for set by default a sort (sort and order) on document page
2019-10-14 15:01:57 +02:00
Laurent Destailleur
9efc5a1b9d Fix extension 2019-10-13 15:00:07 +02:00
Laurent Destailleur
33f6206031 NEW Add link to export target of emailings into a CSV file. 2019-10-12 20:12:24 +02:00
Laurent Destailleur
9c94ffeea9 Fix css 2019-10-12 18:40:41 +02:00
Laurent Destailleur
9ba992b8b6 Work on inventory module 2019-10-12 12:31:35 +02:00
Frédéric FRANCE
849eda2023 Update index.php 2019-10-12 00:05:26 +02:00
Frédéric FRANCE
c3e8aec07c fix translation for showemailing
in lang files, it's ShowEMailing not ShowEmailing
2019-10-11 23:54:05 +02:00
Laurent Destailleur
f345b5fdb0 Fix look and feel v10 2019-10-11 19:32:45 +02:00
Laurent Destailleur
a8676e63c8 CSS 2019-10-10 16:46:50 +02:00
ro@t.com
2149b155d1 ADD option MAIN_DONT_KEEP_NOTE_ON_CLONING to remove note on cloning 2019-10-10 15:57:26 +02:00
Laurent Destailleur
b6c600c171 css 2019-10-10 11:44:03 +02:00
Laurent Destailleur
51ef2cd20a FIX #12058 2019-10-07 20:20:06 +02:00
Laurent Destailleur
07d1a3fe8b css 2019-10-07 18:17:22 +02:00
Laurent Destailleur
c83f40fc7e Debug contact by default 2019-10-07 15:42:37 +02:00
Laurent Destailleur
f56da782ab Merge pull request #12038 from Ahuahuachi/develop
NEW Add hidden options to send by email even for draft status
2019-10-07 14:18:53 +02:00
Laurent Destailleur
d4f4f33122 Merge pull request #12048 from frederic34/patch-17
Update card.php
2019-10-07 10:23:51 +02:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Frédéric FRANCE
bfd8bc839e Update card.php 2019-10-06 10:28:09 +02:00
Alfredo Altamirano
140784d741 Merge remote-tracking branch 'Dolibarr/develop' into develop 2019-10-03 20:32:26 -05:00
Alfredo Altamirano
b6882af1b6 Add hidden options to send by email for all status 2019-10-03 20:21:13 -05:00
Laurent Destailleur
b60ee4c18c css 2019-10-03 09:58:49 +02:00
Laurent Destailleur
24570f7165 Look and feel v11. Picto are fontawesome. 2019-10-02 18:14:41 +02:00
Laurent Destailleur
320e9bbeec Text on tooltip can also be clickable 2019-10-02 15:54:42 +02:00
Laurent Destailleur
c6d38227b6 NEW Use a dedicated css for the pencil to edit a field 2019-10-02 14:44:38 +02:00
Laurent Destailleur
8ad81a092a Clean code 2019-10-01 16:19:54 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +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
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
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
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
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
Laurent Destailleur
2b57d486dc NEW Upgrade ACE editor to v1.4.6 2019-09-28 13:50:32 +02:00
Laurent Destailleur
86e5465197 Standardize extrafields code 2019-09-28 10:55:09 +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