Commit Graph

79768 Commits

Author SHA1 Message Date
Frédéric FRANCE
ccd9da99f4 Update list.php 2019-10-15 20:11:15 +02:00
Laurent Destailleur
d2eeb9e749 Wor kon BOM 2019-10-15 19:59:16 +02:00
Laurent Destailleur
e94d47daf7 Work on MRP module 2019-10-15 19:57:23 +02:00
Laurent Destailleur
9ce71c26aa Use alpha logo by default 2019-10-15 11:41:22 +02:00
Laurent Destailleur
63a60c7811 NEW Add option MAIN_PDF_FORCE_FONT_SIZE 2019-10-15 11:13:14 +02:00
Laurent Destailleur
33cc0c017c responsive 2019-10-15 04:20:51 +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
2ed96c9e5f Fix scrutinizer 2019-10-15 02:54:19 +02:00
Laurent Destailleur
a1c93cb2e6 MAIN_ACTIVATE_HTML5 is now always on now (so option removed).
Look and feel v11
2019-10-15 02:45:12 +02:00
Laurent Destailleur
f50a75194c Removed warning 2019-10-15 00:44:22 +02:00
Laurent Destailleur
415379c4f2 Link show tutorial in middle 2019-10-15 00:27:09 +02:00
Laurent Destailleur
c869cbe193 Merge pull request #11995 from atm-john/develop_unlock_title_button_feature
Unlock title button feature
2019-10-14 23:55:10 +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
ee5fdc3239 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-10-14 23:52:58 +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
540f20c18f css 2019-10-14 23:49:26 +02:00
Laurent Destailleur
94aa98beed Merge pull request #12131 from frederic34/patch-21
FIX Sort on total without tax on supplier invoices list
2019-10-14 21:25:13 +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
3038a49818 Merge pull request #12117 from iouston/patch-7
NEW: Add 2 hidden options to set the default sorting (sort and order) on document page
2019-10-14 21:23:13 +02:00
Laurent Destailleur
e5e94f5e7a Update document.php 2019-10-14 21:23:08 +02:00
Laurent Destailleur
9f61bd23ce Merge pull request #12127 from atm-josselin/FIX_product_batch_fields_definition
Fix : add fields definition in product batch class
2019-10-14 21:22:24 +02:00
Laurent Destailleur
ee393f0550 Merge pull request #12122 from iouston/patch-5
NEW: Add 2 hidden options to set the default sorting (sort and order) on document page
2019-10-14 21:21:11 +02:00
Laurent Destailleur
15d4a18599 Update document.php 2019-10-14 21:21:04 +02:00
Laurent Destailleur
6106d74568 Merge pull request #12121 from iouston/patch-4
NEW: Add 2 hidden options to set the default sorting (sort and order) on document page
2019-10-14 21:20:30 +02:00
Laurent Destailleur
c8d3aea18a Update document.php 2019-10-14 21:20:17 +02:00
Laurent Destailleur
516d943d1b Merge pull request #12120 from iouston/patch-6
Update document.php
2019-10-14 21:18:33 +02:00
Laurent Destailleur
3866ac6036 Update document.php 2019-10-14 21:18:22 +02:00
Laurent Destailleur
07bb83a96d Merge pull request #12113 from aspangaro/10.0_p25
Remove a duplicate line
2019-10-14 21:04:22 +02:00
Laurent Destailleur
d87a1e39a6 Merge pull request #12110 from aspangaro/10.0_holiday
lang file for holidays is holiday
2019-10-14 21:03:55 +02:00
Laurent Destailleur
f3c627cb7f Merge pull request #12109 from frederic34/patch-15
keep a copy of object for trigger
2019-10-14 21:03:35 +02:00
Laurent Destailleur
3432147385 Merge pull request #12099 from prietojc/patch-11
FIX: Update card.php
2019-10-14 21:02:04 +02:00
Laurent Destailleur
b8a27a47aa Merge pull request #12112 from frederic34/patch-17
Update box_last_modified_ticket.php
2019-10-14 20:57:18 +02:00
Laurent Destailleur
ebd8bc3645 Merge pull request #12107 from frederic34/patch-14
Update list.php
2019-10-14 20:57:01 +02:00
Laurent Destailleur
1fc5afa022 Merge pull request #12111 from frederic34/patch-16
Update box_last_ticket.php
2019-10-14 20:56:25 +02:00
Laurent Destailleur
1f672221ec Merge pull request #12106 from frederic34/patch-13
avoid ErrorBadValueForParamNotAString if not configured
2019-10-14 20:55:06 +02:00
Laurent Destailleur
7b1b51e752 Merge pull request #12115 from TobiasSekan/develop
Fix MS Outlook import error
2019-10-14 20:54:30 +02:00
Laurent Destailleur
0d21e61673 Merge pull request #12116 from frederic34/patch-18
fix travis
2019-10-14 20:53:42 +02:00
Laurent Destailleur
4941a99cc7 Merge pull request #12126 from grandoc/new_branch_14_10_2019
add missing translation
2019-10-14 20:53:28 +02:00
Laurent Destailleur
5a55997540 Update pdf_eratosthene.modules.php 2019-10-14 20:53:18 +02:00
Laurent Destailleur
2e7cc67f9c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-10-14 20:42:28 +02:00
Laurent Destailleur
056f7f826b Clean code 2019-10-14 20:41:28 +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
Laurent Destailleur
2f0bf491ac Merge pull request #12130 from frederic34/patch-19
Update check_notifications.php
2019-10-14 20:38:40 +02:00
Laurent Destailleur
5c4edad0d4 Merge pull request #12105 from grandoc/new_branch_12_10_2019
more internationalization
2019-10-14 20:37:50 +02:00
Laurent Destailleur
ed0e090d91 Merge pull request #12123 from atm-greg/FIX_blocked_log_missing_lib
add security.lib.php for dol_hash
2019-10-14 20:37:19 +02:00
Frédéric FRANCE
45b3d623bb Update list.php 2019-10-14 20:30:31 +02:00
Frédéric FRANCE
502d154cea Update check_notifications.php 2019-10-14 20:01:35 +02:00
Laurent Destailleur
3b84e2bac3 Use img-thumb css 2019-10-14 19:21:13 +02:00
Laurent Destailleur
dbdc62b028 Fix td 2019-10-14 18:41:46 +02:00