Commit Graph

6034 Commits

Author SHA1 Message Date
Laurent Destailleur
66a288a343
Merge pull request #12235 from frederic34/scopeindent
clean indent
2019-10-30 02:57:59 +01:00
Laurent Destailleur
6073692654
Merge pull request #12243 from TobiasSekan/FixEventSortNonNumeric
Fix non-numeric error in sort event function
2019-10-30 02:57:00 +01:00
Laurent Destailleur
c952c7e3c2
Merge pull request #12237 from grandoc/new_branch_26_10_2019
Internationalization
2019-10-30 02:53:34 +01:00
iouston
2072768ec2
NEW : add name_alias in fields to search all 2019-10-29 11:20:10 +01:00
Tobias Sekan
bfe7ad211f
Fix non-numeric error in sort event function
Fix non-numeric error in sort event function and fix mixed space and tab indent, use spaces
2019-10-28 09:53:27 +01:00
Philippe GRAND
c07dc1cd5f Internationalization 2019-10-26 22:40:10 +02:00
Frédéric FRANCE
c44425d0a0
start clean indent in compta directory 2019-10-26 14:51:57 +02:00
Frédéric FRANCE
1a10b30a76
clean indent in comm directory 2019-10-26 14:28:40 +02:00
Laurent Destailleur
2201b11fd3 NEW Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_SALE_PROPOSAL
NEW Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_PROPOSAL
2019-10-24 13:41:04 +02:00
Laurent Destailleur
da00591bba Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/product.lib.php
	htdocs/expedition/card.php
	htdocs/product/list.php
2019-10-23 04:04:32 +02:00
Laurent Destailleur
161f2a018f Fix responsive and bad closing td 2019-10-23 03:50:48 +02:00
Laurent Destailleur
b88968520b Move code of extrafields to the new architecture 2019-10-22 17:08:37 +02:00
Frédéric FRANCE
86f22c4563
do not ignore lines with mix od tabs and spaces 2019-10-20 17:17:22 +02:00
Laurent Destailleur
b813dfe3c9
Merge pull request #12172 from TobiasSekan/FixMissingIcalAuthor
Fix missing organizer and contact on ical export
2019-10-20 13:49:47 +02:00
Laurent Destailleur
89b0730483
Update actioncomm.class.php 2019-10-20 13:49:36 +02:00
Tobias Sekan
28dea51c4a
Fix missing organizer in ical export 2019-10-18 13:18:09 +02:00
Laurent Destailleur
f85899742b
Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-17 17:48:42 +02:00
Laurent Destailleur
1a021e85f6
Merge pull request #12141 from TobiasSekan/FixNoneNumericValue
Fix non-numeric value encountered on ical export
2019-10-17 17:39:25 +02:00
Tobias Sekan
daa7f54295
fix - not removed old code line 2019-10-17 08:10:21 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
8152c60878 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/actions_sendmails.inc.php
2019-10-16 17:13:14 +02:00
Laurent Destailleur
f88733f46a Html code simplest 2019-10-16 14:14:32 +02:00
Tobias Sekan
741627897e
fix interchanged allocation 2019-10-16 13:56:11 +02:00
Laurent Destailleur
a57b456aa6
Merge pull request #12143 from frederic34/patch-19
NEW Add location into event tooltip. Use full day for fullday events
2019-10-16 13:21:55 +02:00
Laurent Destailleur
e07e01580d Replace deprecated code with new one 2019-10-16 03:34:32 +02:00
Frédéric FRANCE
ccd9da99f4
Update list.php 2019-10-15 20:11:15 +02:00
Frédéric FRANCE
6a8e8907ef
Update list.php 2019-10-15 17:55:07 +02:00
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