dolibarr

Author	SHA1	Message	Date
Laurent Destailleur	bb97119233	Fix duplicate function name	2018-06-06 18:07:32 +02:00
Laurent Destailleur	30b04c0d3d	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/core/lib/files.lib.php	2018-06-05 18:16:32 +02:00
Laurent Destailleur	4c21ad4e4e	FIX: dol_delete_file must work in a context without db handler loaded Conflicts: htdocs/core/lib/files.lib.php	2018-06-05 18:12:14 +02:00
Laurent Destailleur	1671c8b6cc	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-06-05 18:06:30 +02:00
Laurent Destailleur	9c32e49bd3	FIX: dol_delete_file must work in a context without db handler loaded	2018-06-05 18:05:33 +02:00
Laurent Destailleur	87d073b5cd	Fix conflict with external ticketsup module	2018-06-04 21:49:29 +02:00
Laurent Destailleur	29ee5dffc4	Clean code	2018-06-04 12:55:55 +02:00
Laurent Destailleur	d8d4d15b4b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-30 12:13:40 +02:00
Laurent Destailleur	de59892438	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/functions.lib.php htdocs/fourn/class/fournisseur.commande.class.php	2018-05-30 12:13:18 +02:00
Laurent Destailleur	02da9b6992	FIX #8893 to get formatted price as substitution vars	2018-05-30 11:04:44 +02:00
BENKE Charlene	4a7ac774f7	introduce fichinter rec models	2018-05-28 16:38:11 +02:00
Frédéric FRANCE	e2a557aadd	limit length of lines to 500 chars	2018-05-27 15:04:12 +02:00
patrick Delcroix	ef37fccef4	Merge origin/patch-modulebuilder-supportsellist into patch-modulebuilder-supportsellist	2018-05-26 23:43:17 +02:00
patrick Delcroix	adda3144bc	Fix Show double(x,y) fields	2018-05-26 23:39:36 +02:00
Laurent Destailleur	75b6dc6f61	Update modulebuilder.lib.php	2018-05-25 12:23:39 +02:00
Laurent Destailleur	8303dc1e6f	Merge pull request #8815 from atm-florian/develop_fixproject NEW: add filter on project task list	2018-05-25 10:56:10 +02:00
Laurent Destailleur	c56ef86bc3	Update project.lib.php	2018-05-25 10:50:16 +02:00
Laurent Destailleur	e51aa68284	Fix link to warehouses for events	2018-05-24 12:16:04 +02:00
delcroix Patrick	c85d216f8e	Merge branch 'develop' into patch-modulebuilder-supportsellist	2018-05-22 22:24:20 +02:00
patrick Delcroix	2ccaf1ad95	New: support sellist in modulebuilder	2018-05-22 22:00:20 +02:00
Laurent Destailleur	1b20ec05d1	Save translation	2018-05-21 19:37:47 +02:00
florian HENRY	dd946dd197	add ressource	2018-05-21 11:03:48 +02:00
florian HENRY	f5c245cd19	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_fixproject	2018-05-21 10:59:10 +02:00
florian HENRY	986b4f78ba	fix eldy comment	2018-05-18 13:54:07 +02:00
florian HENRY	a27c263747	NEW: add filter on project task list	2018-05-18 10:33:32 +02:00
Laurent Destailleur	e503aeb2e5	Merge pull request #8787 from aspangaro/8.0-a24 Update module assets	2018-05-18 09:05:46 +02:00
Laurent Destailleur	ef395fc36b	Fix scrutinizer bugs	2018-05-16 15:23:52 +02:00
Alexandre SPANGARO	9c6f92986e	Upgrade works	2018-05-11 21:48:22 +02:00
Laurent Destailleur	63b9384ef6	No transmormation of data objectid before calling trigger	2018-05-10 12:34:23 +02:00
Laurent Destailleur	2fb5de6136	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-10 12:30:14 +02:00
Laurent Destailleur	c094a6c43e	Reorder permissions	2018-05-10 12:29:58 +02:00
Laurent Destailleur	fddd628f08	Merge pull request #8764 from hregis/develop_email NEW add pdf function to check if pdf file is protected/encrypted	2018-05-10 12:08:58 +02:00
Laurent Destailleur	9077f18dd6	Update security.lib.php	2018-05-10 11:37:22 +02:00
Laurent Destailleur	8837193545	Merge branch 'develop' into permissions_hook	2018-05-10 11:36:08 +02:00
Laurent Destailleur	bc9eaaab84	Update security.lib.php	2018-05-10 11:34:20 +02:00
Laurent Destailleur	7be804dcf5	Update security.lib.php	2018-05-10 11:32:08 +02:00
Laurent Destailleur	0891766a3e	Update security.lib.php	2018-05-10 11:31:27 +02:00
Laurent Destailleur	ea4c48047a	All new hooks must be addreplace hooks	2018-05-10 11:30:27 +02:00
Regis Houssin	415b7425fd	NEW add pdf function to check if pdf file is protected/encrypted	2018-05-08 09:45:10 +02:00
Laurent Destailleur	546da0ceda	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/admin/account.php htdocs/core/modules/modStock.class.php htdocs/product/inventory/list.php	2018-05-05 14:40:39 +02:00
altatof	a8ecce9e6d	add hook for more permissions control	2018-05-05 14:31:17 +02:00
Laurent Destailleur	5cff4c152b	Add tab "time spent" in project view. Can swith gantt/list.	2018-05-04 11:25:21 +02:00
Laurent Destailleur	08cf034e2f	FIX to allow IRPF not null even if main VAT is null. From https://www.javierrguez.com/problema-facturas-irpf-sin-iva-dolibarr/	2018-05-03 13:39:44 +02:00
Laurent Destailleur	124abd39b6	Code comment	2018-05-01 20:31:57 +02:00
Laurent Destailleur	dc9892f803	Fix bad log	2018-05-01 20:17:03 +02:00
Laurent Destailleur	3cad7c6998	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-01 12:51:46 +02:00
Laurent Destailleur	4eb4cf6506	Merge pull request #8693 from Librethic/fix-api-product-check-perm FIX : missing english name for object	2018-05-01 10:19:27 +02:00
Laurent Destailleur	55f982e504	Removed deprecated FPDI option and reorganise PDF setup page	2018-04-30 09:28:24 +02:00
Laurent Destailleur	2fc2c44de4	Fix phpcs	2018-04-29 20:18:50 +02:00
Laurent Destailleur	0cdfd6800a	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-29 20:11:47 +02:00
Laurent Destailleur	82a8513aed	Standardize code	2018-04-29 19:52:14 +02:00
Laurent Destailleur	aafab12f4b	Debug API for ticket module	2018-04-29 18:06:31 +02:00
Laurent Destailleur	e72c2e6a11	Enhance sorting of field for lists on field with several sort criterias	2018-04-28 19:54:41 +02:00
Laurent Destailleur	94d6e178f7	Work on vat report code rewrite	2018-04-28 16:06:46 +02:00
jfefe	7cedf55c27	FIX : missing english name for object 'product' is used by API to check perms and return a 401 error even if user has correct permissions	2018-04-27 20:54:48 +02:00
Laurent Destailleur	257dc1cf77	Work on rewriting VAT reports	2018-04-27 19:17:34 +02:00
Laurent Destailleur	19d15c79dd	Merge pull request #8673 from frederic34/variantonservice NEW Module variant supported on services	2018-04-27 10:01:28 +02:00
Laurent Destailleur	3faeb08b78	Merge pull request #8672 from ATM-Nicolas/fix_action_contact FIX : Related contact printed in societe agenda	2018-04-27 10:00:18 +02:00
Laurent Destailleur	1d40d34123	Merge pull request #8669 from tomours/develop Fix french bank holidays (Easter related)	2018-04-27 09:56:01 +02:00
Laurent Destailleur	42722da824	Update date.lib.php	2018-04-27 09:55:44 +02:00
Laurent Destailleur	dde86628e7	Update date.lib.php	2018-04-27 09:49:52 +02:00
Laurent Destailleur	e1cfe0e2dd	Update date.lib.php	2018-04-27 09:49:15 +02:00
Laurent Destailleur	59e5545aa7	Fix phpunit	2018-04-27 09:18:25 +02:00
Laurent Destailleur	69db960a92	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/projet/activity/perweek.php	2018-04-26 18:33:02 +02:00
Laurent Destailleur	d988585f86	Save spaces in timesheet report page	2018-04-26 11:07:20 +02:00
Laurent Destailleur	6b2bd93469	NEW Add dol_is_link function	2018-04-25 17:59:05 +02:00
Laurent Destailleur	39aef07c6b	FIX Only voters can send comments in public survey page	2018-04-25 17:14:18 +02:00
Laurent Destailleur	83b762b681	FIX CVE-2018-9019	2018-04-25 16:01:06 +02:00
Laurent Destailleur	75a4891113	Add az09comma to sanitize sortfield/sortorder	2018-04-25 15:47:42 +02:00
Frédéric FRANCE	5f4e2dc565	variant on services	2018-04-24 11:01:17 +02:00
ATM-Nicolas	736c56705b	FIX : Related contact printed in societe agenda	2018-04-24 10:02:26 +02:00
Thomas OURSEL	4fd0ab3f31	Merge remote-tracking branch 'upstream/develop' into develop	2018-04-23 15:57:09 +02:00
Thomas OURSEL	f402753fa3	Fix french holidays (Easter related)	2018-04-23 15:14:34 +02:00
Laurent Destailleur	e9a2894727	Fix PSR2	2018-04-22 20:59:29 +02:00
Laurent Destailleur	ac89951acd	Merge pull request #8647 from fmarcet/develop New: Add same parameters on 'printFieldListTitle' hooks	2018-04-22 19:35:09 +02:00
Laurent Destailleur	69adf73f4f	Clean code from $var = True	2018-04-22 19:27:37 +02:00
Laurent Destailleur	d0efc41983	New support of option BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD	2018-04-20 14:50:11 +02:00
Ferran Marcet	6ced1a3264	New: Add same parameters on 'printFieldListTitle' hooks	2018-04-20 10:38:16 +02:00
Laurent Destailleur	0358e0f29f	Debug ticketsup	2018-04-19 15:11:26 +02:00
Laurent Destailleur	fc167612c2	NEW class reposition can also work on POST (not only GET)	2018-04-19 13:59:20 +02:00
Laurent Destailleur	4472234637	Can set email in dol_print_error_email	2018-04-19 12:12:54 +02:00
Laurent Destailleur	d8e05c90f7	Can set email in dol_print_error_email	2018-04-19 12:12:19 +02:00
Laurent Destailleur	0f16ccbc4a	Enhance dol_encode/dol_decode function	2018-04-19 12:03:42 +02:00
Laurent Destailleur	bbfc4a3e17	NEW Look and feel v8 - Show Picto "+" on all links "Add record"	2018-04-18 03:26:15 +02:00
Laurent Destailleur	a0f8aa50d5	CSS	2018-04-18 00:00:37 +02:00
Laurent Destailleur	4dadfac74b	Debug usage of the new extrafield architecture	2018-04-17 14:34:17 +02:00
Laurent Destailleur	7b53ec5198	FIX timestamp must be an int not a float	2018-04-17 12:41:13 +02:00
Laurent Destailleur	c3970f1a52	Code comment	2018-04-17 09:44:57 +02:00
Laurent Destailleur	1e0a660d24	More font awesome picto instead of img	2018-04-16 19:57:46 +02:00
Laurent Destailleur	f19abe38d7	FIX pdf thumb for expense report	2018-04-16 18:17:35 +02:00
Laurent Destailleur	0d0da234b1	Lowercase NULL, TRUE, FALSE according to PSR2	2018-04-16 13:51:16 +02:00
Laurent Destailleur	72de21537c	Clean code	2018-04-15 20:09:09 +02:00
Laurent Destailleur	6450f95c90	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-15 19:13:38 +02:00
Laurent Destailleur	e2838aa074	NEW Show also size in bytes in tooltip if visible unit is not bytes	2018-04-15 17:58:13 +02:00
Laurent Destailleur	8fbde88872	Look and feel v8	2018-04-15 17:37:49 +02:00
Laurent Destailleur	57c03553dd	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/core/lib/functions.lib.php	2018-04-15 12:09:07 +02:00
Laurent Destailleur	13ba69e085	Merge pull request #8595 from hregis/develop_ldap Fix: broken $pdf object !	2018-04-15 11:38:51 +02:00
Laurent Destailleur	da66e5c5a7	Update pdf.lib.php	2018-04-15 11:38:29 +02:00
Laurent Destailleur	37e4da30d0	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2018-04-15 11:33:27 +02:00
Laurent Destailleur	ffffd848a9	Look and feel v8	2018-04-14 22:34:46 +02:00
Laurent Destailleur	77b686500c	css	2018-04-14 21:07:20 +02:00
Regis Houssin	fb4765c472	Fix clean code	2018-04-14 15:24:52 +02:00
Regis Houssin	732f019fb2	Fix: json format in llx_const	2018-04-14 15:17:51 +02:00
Regis Houssin	25a87507b9	NEW add new parameters for tcpf encryption	2018-04-14 15:12:51 +02:00
Juanjo Menent	bfed1b9db1	FIX: some localtaxes errors	2018-04-14 12:45:40 +02:00
Regis Houssin	d97c052d08	Fix: broken $pdf object !	2018-04-14 10:41:38 +02:00
Laurent Destailleur	c25e21de4b	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-13 23:19:22 +02:00
Laurent Destailleur	ecfabc6633	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/functions.lib.php	2018-04-13 23:18:39 +02:00
Laurent Destailleur	a0e243a29b	Clean code	2018-04-13 23:11:19 +02:00
Laurent Destailleur	93ea46c58c	Merge branch 'develop' into develop-ecmfiles	2018-04-13 23:08:26 +02:00
Laurent Destailleur	374a0723bf	Fix VAT report by rate	2018-04-13 22:20:14 +02:00
Regis Houssin	556a418132	Fix: best method	2018-04-13 19:30:11 +02:00
Regis Houssin	199bf4c044	Fix: avoid focus problem when select2 is in a modal dialog window	2018-04-13 17:10:07 +02:00
fappels	e054d1ae8d	Try to fix travis	2018-04-13 16:49:03 +02:00
Laurent Destailleur	4251748aca	Clean code	2018-04-13 16:18:33 +02:00
Laurent Destailleur	fbae4429b7	Clean code for better extrafields management	2018-04-13 12:52:23 +02:00
Laurent Destailleur	6e288fca75	Merge pull request #8575 from all3kcis/develop-patch-16 NEW Add files management on products lot	2018-04-13 00:57:13 +02:00
Laurent Destailleur	3cecfd02c7	NEW Mutualize code for action="update_extras" NEW Can use setValueFrom without user modification field FIX Exclude separators from mandatory extrafields test More code to use the new framework array for extrafields Can use text condition in extrafield visibility	2018-04-12 23:16:23 +02:00
All-3kcis	21df700325	Add option to save file with product batch ref + use batch number like ref instead of id + debug access to shared link	2018-04-12 15:55:08 +02:00
All-3kcis	f7e58f3c73	Add files management on products lot	2018-04-12 15:10:37 +02:00
Laurent Destailleur	dd022ee423	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-12 13:31:38 +02:00
Laurent Destailleur	ea2fd67e0d	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/bank/card.php htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php htdocs/core/tpl/admin_extrafields_view.tpl.php htdocs/langs/de_DE/admin.lang	2018-04-12 13:31:14 +02:00
Laurent Destailleur	3df873ee06	Merge pull request #8562 from ATM-Marc/FIX_modulebuilder FIX: various modulebuilder-related issues	2018-04-11 18:01:04 +02:00
Laurent Destailleur	e543a6bf85	Merge pull request #8549 from atm-greg/fix_multiselect_filter FIX #8480	2018-04-11 17:38:30 +02:00
Laurent Destailleur	1aace69b1a	Update functions.lib.php	2018-04-11 17:37:00 +02:00
Laurent Destailleur	c70e0c1cda	FIX #8475 #8540	2018-04-11 17:14:34 +02:00
Marc de Lima Lucio	fa8cf98249	FIX: modulebuilder: handle 'price' fieldtype	2018-04-11 12:18:54 +02:00
Marc de Lima Lucio	2f75bfcd83	FIX: modulebuilder: could not create html fields	2018-04-11 11:46:47 +02:00
atm-greg	8a0baaad17	fix #8480	2018-04-10 16:25:06 +02:00
atm-greg	4f13a4f45b	fix #8521	2018-04-10 14:16:01 +02:00
Laurent Destailleur	65996c47ff	Fix clean email syntax to remove , to avoid error RFC-5321 address	2018-04-10 11:15:21 +02:00
Laurent Destailleur	24f4d5040a	Move isInEEC from common to thirdparty class.	2018-04-09 14:25:02 +02:00
Laurent Destailleur	4d2d9193b9	Work on VAT reports to use option MAIN_INFO_VAT_RETURN	2018-04-07 15:47:13 +02:00
Laurent Destailleur	d46a8eb8f0	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/company.php	2018-04-07 12:30:30 +02:00
Laurent Destailleur	0abcf5694c	Fix message of discount	2018-04-06 20:18:36 +02:00
Laurent Destailleur	1a321e19c8	FIX XSS in company setup page	2018-04-06 19:12:13 +02:00
Laurent Destailleur	a886fadc2d	Merge pull request #8493 from aspangaro/8.0-a13 NEW Module Assets	2018-04-06 12:41:56 +02:00
Laurent Destailleur	956fc2376d	FIX #8483	2018-04-06 12:27:55 +02:00
Regis Houssin	b43aca0f8d	Fix: use dol_string_nohtmltag instead (with strip_tags)	2018-04-06 08:52:02 +02:00
Alexandre SPANGARO	06dc70df09	Merge remote-tracking branch 'uptream/develop' into 8.0-a13	2018-04-05 20:42:28 +02:00
Laurent Destailleur	48ff89c63b	Fix regression	2018-04-05 19:52:54 +02:00
Laurent Destailleur	d55657951d	Merge pull request #8503 from ruistrecht-alt/FIX_pictos_in_agenda FIX: img_pictos for remove assigned user in agenda card	2018-04-05 16:42:40 +02:00
Laurent Destailleur	d19514fd99	Merge pull request #8496 from hregis/develop_bug5 Fix: multiple avoid Warning and errors	2018-04-05 16:16:48 +02:00
Laurent Destailleur	eeb2d5a4da	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/commonobject.class.php htdocs/core/class/extrafields.class.php htdocs/cron/list.php	2018-04-05 13:24:36 +02:00
Laurent Destailleur	88b3e08b22	FIX filter/sorting on extrafield on contact list from contact tab	2018-04-05 11:34:26 +02:00
Rui Strecht	e8a700caab	Fixed issue with img_picto no showing icon in agenda assigned users	2018-04-03 12:13:40 +01:00
Regis Houssin	9f7fcdc8bf	Fix: multiple avoid Warning and errors	2018-04-02 10:18:51 +02:00
Alexandre SPANGARO	3779b6ff1c	Update work on assets type	2018-04-02 08:22:26 +02:00
Alexandre SPANGARO	a5428cc8c7	NEW Module Assets	2018-04-01 21:26:52 +02:00
Laurent Destailleur	99ada20f6d	Add picto bank	2018-03-29 19:08:51 +02:00
Laurent Destailleur	39f25c9fc2	Fix phpcs	2018-03-29 08:28:36 +02:00
Laurent Destailleur	1c86eb1c44	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/localtax/index.php htdocs/compta/tva/quarter_report.php htdocs/core/lib/tax.lib.php	2018-03-29 03:08:01 +02:00
Laurent Destailleur	0edba4b4a7	Manage field showoncombobox	2018-03-27 23:44:49 +02:00
Laurent Destailleur	7a45527983	Generate the foreign key into key.sql file	2018-03-27 23:26:20 +02:00
Laurent Destailleur	e28307ede4	Merge pull request #8449 from hregis/develop_dict NEW add "moreHtmlRef" hook	2018-03-27 18:07:57 +02:00
Regis Houssin	2b8fe93fc8	Fix: remove unused global	2018-03-27 17:40:17 +02:00
Regis Houssin	35b6cb750f	Fix: move "moreHtmlRef" hook in "showrefnav" function	2018-03-27 17:36:25 +02:00
Laurent Destailleur	51cd793d80	Fix log and duplicate vat_by_date function	2018-03-27 14:37:29 +02:00
Laurent Destailleur	b44e791c0a	Work on vat reports	2018-03-26 21:39:18 +02:00
Laurent Destailleur	c50b772b11	Clean duplicate code for payment page. Redirect on common page.	2018-03-25 19:15:55 +02:00
Laurent Destailleur	852191010a	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2018-03-25 15:29:11 +02:00
Laurent Destailleur	53dde8dc0c	Fix confirmation email for membership payment	2018-03-25 15:00:43 +02:00
Regis Houssin	180f2a0336	Fix: multi_dir compatibility	2018-03-25 12:56:43 +02:00
Regis Houssin	d5ed29c567	NEW add "moreHtmlRef" hook	2018-03-25 12:13:29 +02:00
Laurent Destailleur	d63c8356f4	Merge pull request #8437 from hregis/7.0_bug6 Fix: uniformize getEntity('intervention')	2018-03-24 16:36:27 +01:00
Laurent Destailleur	224fa1c03e	Fix external links ko when substitution key are inside domain	2018-03-24 12:48:33 +01:00
Laurent Destailleur	ab9edef3c7	Fix external links ko when substitution key are inside domain	2018-03-24 12:46:52 +01:00
Laurent Destailleur	c7e93a5a3b	Serious enhancement in auto subscription for member module	2018-03-23 22:49:08 +01:00
Laurent Destailleur	53edb86ffb	Make sending of email for member module ok with new email template archi	2018-03-23 19:35:25 +01:00
Laurent Destailleur	6e32e9961f	Syn transifex	2018-03-23 17:56:35 +01:00
Laurent Destailleur	7363ae17ee	Move setup of email for module module into email templates	2018-03-23 16:09:46 +01:00
Regis Houssin	9cf66e53f6	Fix: wrong module name	2018-03-22 16:39:47 +01:00
Laurent Destailleur	700c69e127	NEW Can set position of images in module tickets Mutualize code of method show_photo	2018-03-22 11:46:35 +01:00
Laurent Destailleur	6e52c896f2	Dolibarrize module ticket	2018-03-22 10:46:42 +01:00
Laurent Destailleur	35938b1942	NEW Variable __ONLINE_PAYMENT_URL__ available in email templates	2018-03-21 20:06:22 +01:00
Laurent Destailleur	7e5c3cc807	Code comment	2018-03-21 13:30:30 +01:00
Laurent Destailleur	42b0a22df2	Use font-awsome for play icon	2018-03-21 13:16:05 +01:00
Laurent Destailleur	fc50fcd59e	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-20 20:07:24 +01:00
Laurent Destailleur	a3a416aa7a	Can remove comment added due to lack of test	2018-03-20 16:46:09 +01:00
Laurent Destailleur	ae17ce6f9a	NEW Add a tab to specify accountant/auditor of the company	2018-03-19 12:52:09 +01:00
Laurent Destailleur	91b3ffc3da	Merge pull request #8409 from aspangaro/8.0-a10 NEW Add a tab to specify accountant/auditor of the company	2018-03-19 12:40:44 +01:00
Laurent Destailleur	51b6723b08	Dolibarrize module ticket	2018-03-18 20:01:11 +01:00
Laurent Destailleur	d4ae0395ed	NEW Look and feel v8: Use a different picto for delete and unlink	2018-03-18 19:13:42 +01:00
Alexandre SPANGARO	17b98b84ad	Merge remote-tracking branch 'uptream/develop' into 8.0-a10	2018-03-18 06:11:05 +01:00
Alexandre SPANGARO	93b087dbe0	NEW Add a tab to specify accountant/auditor of the company	2018-03-18 06:09:50 +01:00
Laurent Destailleur	cb1069cf0b	Use font-awesome for the picto to move/transfer a line	2018-03-17 13:21:27 +01:00
Laurent Destailleur	46e8692620	Escape db	2018-03-16 12:17:20 +01:00
arnaud	32ce42610a	FIX show status on societe banner	2018-03-16 11:18:00 +01:00
Laurent Destailleur	ba47b6d051	NEW Add tab contact on supplier proposals	2018-03-16 10:21:53 +01:00
Laurent Destailleur	8bfac66f04	Escape db	2018-03-16 09:52:45 +01:00
Laurent Destailleur	6f95a7c2b1	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-15 23:48:14 +01:00
Laurent Destailleur	ce7da41bef	Fix save setup	2018-03-15 23:47:16 +01:00
Laurent Destailleur	71c51eb789	NEW Add hook printEmail	2018-03-15 22:22:42 +01:00
Laurent Destailleur	7f8f0c5dc1	Fix parameter silent was inverted	2018-03-15 21:48:51 +01:00
Laurent Destailleur	7c62f22408	Remove doubtful code	2018-03-15 14:02:32 +01:00
Laurent Destailleur	6a70d268e0	Fix SQLi reported by op7ica	2018-03-15 01:22:32 +01:00
Laurent Destailleur	c62d68f4be	Fix SQLi reported by op7ica	2018-03-15 01:21:44 +01:00
Laurent Destailleur	302fed8646	More fa image to replace png picto	2018-03-14 20:08:44 +01:00
Laurent Destailleur	cc9a6ee6e0	Merge pull request #7428 from ruistrecht-alt/NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE NEW Show region in company info & Global option to show state code MAIN_SHOW_STATE_CODE	2018-03-14 10:49:54 +01:00
Laurent Destailleur	35fbcb2c84	Update company.lib.php	2018-03-14 10:48:56 +01:00
Laurent Destailleur	da617f7d32	Can work both with remote and local payment modes	2018-03-13 22:43:50 +01:00
Laurent Destailleur	2566170c68	Use code of societeaccount	2018-03-13 17:47:43 +01:00
Laurent Destailleur	944ba69cd8	Add unique key. Dolibarrize view of stripe card.	2018-03-13 17:32:49 +01:00
Laurent Destailleur	e6d8219396	Dolibarrize module ticket	2018-03-13 13:26:03 +01:00
Laurent Destailleur	8048259733	Work on ticket module integration	2018-03-13 12:13:47 +01:00
Laurent Destailleur	0d1e26b02c	Fix error management	2018-03-12 13:19:09 +01:00
Laurent Destailleur	ae82d045f8	Dolibarrize module ticket	2018-03-11 23:56:17 +01:00
Regis Houssin	a09bad6d69	Fix: wrong year	2018-03-11 18:59:45 +01:00
Regis Houssin	7c3984c9db	Fix: dolibarrizzzz	2018-03-11 18:54:38 +01:00
Laurent Destailleur	d9b55f2275	Merge branch 'develop' into dev_ticketsup	2018-03-11 18:12:47 +01:00
Laurent Destailleur	0005b1bc48	Merge pull request #8342 from atm-florian/dev_fixscrunitiz fix scrunitizer	2018-03-11 18:11:13 +01:00
florian HENRY	cfdaa7c88d	ticket sup make it work	2018-03-11 16:07:13 +01:00
florian HENRY	6d8566a238	fix scrunitizer	2018-03-11 12:41:48 +01:00
jfefe	0f96575b41	Fix PHPCS errors with ticketsup module	2018-03-11 12:06:57 +01:00
Laurent Destailleur	e14d2f08b8	Dolibarize	2018-03-11 11:12:38 +01:00
jfefe	79acb79ae0	Begin integration of module « Ticketsup » Related to #4948	2018-03-11 09:44:58 +01:00
florian HENRY	888afe0e33	fix scrunitizer	2018-03-11 00:25:14 +01:00
Laurent Destailleur	65aa5953f4	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-08 20:36:07 +01:00
Laurent Destailleur	bf1bada435	Contact tab after main tab	2018-03-08 20:35:50 +01:00
Laurent Destailleur	1c9e7145e7	Merge pull request #8276 from ATM-Consulting/develop_atm NEW: supplier credit notes & discounts (absolute and relative)	2018-03-08 20:06:37 +01:00
Laurent Destailleur	235db1f405	Enhance OAuth module to store the stripe account in llx_oauth_token	2018-03-08 19:51:18 +01:00
Laurent Destailleur	5b8006a6bb	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/public/payment/paymentok.php htdocs/public/paypal/paymentok.php	2018-03-08 16:37:17 +01:00
Laurent Destailleur	af9fff4f83	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-03-08 16:35:12 +01:00
Laurent Destailleur	3762ed12c7	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/core/class/html.formfile.class.php	2018-03-08 16:33:51 +01:00
Laurent Destailleur	343ca1bc77	Merge pull request #8294 from hregis/7.0_bug5 Fix: avoid conflict between invoice and invoicenumber sharings	2018-03-08 16:24:05 +01:00
Regis Houssin	861a831e24	Fix: debug	2018-03-08 11:53:46 +01:00
Laurent Destailleur	c02e8e9831	Css	2018-03-07 19:13:15 +01:00
Regis Houssin	a0774d523d	Fix: avoid conflict between invoice and invoicenumber sharings	2018-03-07 15:24:23 +01:00
Laurent Destailleur	1419eaf15f	Debug last stripe PR	2018-03-07 15:05:49 +01:00
Laurent Destailleur	d060cf840d	Merge branch 'develop' into develop	2018-03-07 13:19:25 +01:00
Laurent Destailleur	7e6ba51780	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/projet/tasks/comment.php	2018-03-07 13:06:29 +01:00
Laurent Destailleur	004839b368	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-03-07 13:03:40 +01:00
Laurent Destailleur	1ca5c7083a	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.formother.class.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2018-03-07 11:54:48 +01:00
alexis Algoud	cb27eb98e1	FIX natural search double quote	2018-03-07 11:42:47 +01:00
Laurent Destailleur	23a4a60970	Fix status of task	2018-03-06 21:51:43 +01:00
ptibogxiv	10b16187d4	NEW convert rib.php to gateway.php	2018-03-06 13:26:40 +01:00
Marc de Lima Lucio	c4950d4f0c	FIX: supplier discounts: wrong source invoice ref in DOCs	2018-03-05 11:49:04 +01:00
Marc de Lima Lucio	1765b09fda	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm	2018-03-05 11:05:38 +01:00
Laurent Destailleur	6338328c90	Fix scrutinizer errors	2018-03-04 11:09:53 +01:00
Laurent Destailleur	eac1b2efe9	FIX Infinite loop on deletion of temp file when there is symbolic links	2018-03-03 11:23:23 +01:00
Laurent Destailleur	f0c9cd3acc	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-03 11:22:31 +01:00
Laurent Destailleur	d6b782e5ef	FIX Infinite loop on deletion of temp file when there is symbolic links	2018-03-03 11:22:15 +01:00
Laurent Destailleur	0270e21289	Merge pull request #8242 from hregis/develop_multicompany Fix: use "multidir_output" instead "dir_output" (propal)	2018-03-02 17:49:25 +01:00
Marc de Lima Lucio	059801fe03	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm	2018-03-01 10:22:21 +01:00
Laurent Destailleur	6f29a574cf	CSS	2018-03-01 02:37:18 +01:00
Laurent Destailleur	e2c7585ae7	NEW Support alternative aliases of page name in website	2018-02-28 14:36:22 +01:00
Laurent Destailleur	04934cc4aa	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/contrat/class/contrat.class.php htdocs/core/lib/functions.lib.php htdocs/projet/tasks/time.php	2018-02-27 19:18:43 +01:00
Marc de Lima Lucio	7cd1b2caa9	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm	2018-02-27 16:45:01 +01:00
Laurent Destailleur	7e48db2869	Clean code	2018-02-26 15:03:09 +01:00
Regis Houssin	093ea49cc6	Fix: use "multidir_output" instead "dir_output"	2018-02-26 11:35:30 +01:00
Laurent Destailleur	1666f371bf	css	2018-02-26 00:13:16 +01:00
Laurent Destailleur	029ef534d0	Clean deprecated code (property "special" removed from mod descriptor)	2018-02-25 10:55:02 +01:00
Laurent Destailleur	a5b1f114c2	FIX Generic substitution of constant disabled for sensitive constant	2018-02-24 14:03:32 +01:00
Laurent Destailleur	1ec5a5d0bf	FIX Generic substitution of constant disabled for sensitive constant	2018-02-24 14:02:27 +01:00
Laurent Destailleur	d8bf553ea9	Add option THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD for logo indexing	2018-02-23 19:55:15 +01:00
Laurent Destailleur	863cab362f	NEW Cat set the encryption algorithm for extrafields of type password	2018-02-23 14:38:41 +01:00
Laurent Destailleur	b6737d3607	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/functions.lib.php	2018-02-23 11:24:45 +01:00
Laurent Destailleur	194f5a2cef	Fix substitution key	2018-02-23 11:03:48 +01:00
Laurent Destailleur	3f9a9f20ce	Fix missing substitution key	2018-02-22 17:06:18 +01:00
Laurent Destailleur	76543023a1	Fix missing substitution key	2018-02-22 17:05:24 +01:00
Laurent Destailleur	b4446764f8	Clean code of deprecated usage	2018-02-21 14:48:25 +01:00
Laurent Destailleur	cb644665bd	Fix output dir of grab	2018-02-20 06:02:53 +01:00
Laurent Destailleur	6ef3b330e4	Fix output dir of grab	2018-02-20 00:04:43 +01:00
Laurent Destailleur	5ada5c18f9	url in generator	2018-02-19 23:19:54 +01:00
Laurent Destailleur	1cb58a308c	Fix redirect	2018-02-19 22:25:12 +01:00
Laurent Destailleur	1f412bd1d4	Fix infinite redirects	2018-02-19 22:10:15 +01:00
Marc de Lima Lucio	44b0d1ca0f	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm	2018-02-19 17:33:20 +01:00
Laurent Destailleur	f3114765a3	Work on website module	2018-02-19 16:46:29 +01:00
Marc de Lima Lucio	f5ad93b272	NEW: supplier credit notes: handle Excess Paid + translation	2018-02-19 15:52:07 +01:00
Laurent Destailleur	60a77a6d85	Add option to grab images into same dir or subdir	2018-02-19 14:56:37 +01:00
Laurent Destailleur	60fe1fa503	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/mails.php	2018-02-17 01:19:17 +01:00
Laurent Destailleur	ab6d0d2530	Fix errors	2018-02-17 01:16:52 +01:00
Laurent Destailleur	9bed2ce8e2	Fix ignore file integrity check on filefunc.inc.php for deb/rpm package	2018-02-16 22:03:13 +01:00
Marc de Lima Lucio	e2b65b3755	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_supplier_credit_note	2018-02-16 09:14:53 +01:00
Laurent Destailleur	03e58f86f3	Merge pull request #8199 from dolibarr95/patch-37 Fix : Bad copy/paste in var name	2018-02-15 17:28:46 +01:00
Laurent Destailleur	4f0ba4982b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-15 15:34:35 +01:00
Laurent Destailleur	6b74c79798	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/en_US/website.lang	2018-02-15 15:34:17 +01:00
Laurent Destailleur	5eee292663	FIX #8189	2018-02-15 13:40:17 +01:00
dolibarr95	634f3bc025	Bad copy/paste	2018-02-15 13:38:21 +01:00
Laurent Destailleur	f0855da0fb	Fix responsive	2018-02-15 12:57:04 +01:00
dolibarr95	3ffc671052	Add phone format for several countries	2018-02-15 10:47:32 +01:00
Laurent Destailleur	dde5c186e7	Fix duplicate html tag	2018-02-15 00:53:03 +01:00
Laurent Destailleur	b789a50ce6	Fix duplicate html tag	2018-02-15 00:38:11 +01:00
Laurent Destailleur	bab5c41b98	Fix duplicate html tag	2018-02-15 00:24:15 +01:00
Marc de Lima Lucio	4f9bb33600	NEW: supplier credit notes: convert to usable absolute discount + link/unlink to supplier invoice + create supplier credit note from excess paid	2018-02-14 10:47:10 +01:00
Laurent Destailleur	434980bb22	Fix svg image preview ko	2018-02-13 18:15:39 +01:00
Laurent Destailleur	92e67ebb8f	Fix svg image preview ko	2018-02-13 16:33:45 +01:00
Laurent Destailleur	8a32ae6935	Move ajax_autoselect into functions.lib.php	2018-02-13 15:46:39 +01:00
Laurent Destailleur	1a4aa89489	NEW Can share any file from the "Document" tab.	2018-02-13 13:55:36 +01:00
Laurent Destailleur	36ac380cac	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-12 22:26:48 +01:00
Laurent Destailleur	a4f48fcfb6	Fix feature must be hidden (not stable)	2018-02-12 16:09:22 +01:00
Laurent Destailleur	b2835fc803	Fix check of vat only for european countries	2018-02-12 15:54:24 +01:00
Laurent Destailleur	109c447171	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-12 03:21:37 +01:00
Laurent Destailleur	c03ceb2205	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-02-12 02:56:51 +01:00
Laurent Destailleur	f88874c1f7	Code comment	2018-02-12 02:53:08 +01:00
Laurent Destailleur	ec66bde3c9	Add option WEBSITE_USE_WEBSITE_ACCOUNTS	2018-02-10 12:15:24 +01:00
Laurent Destailleur	2315997aad	CSS enhancement	2018-02-10 00:00:12 +01:00
Laurent Destailleur	e984d7df9f	NEW Add total of time spent in timespent page at top of page too.	2018-02-09 23:52:43 +01:00
Laurent Destailleur	633dc507fe	NEW Use a css style for weekend in time spent	2018-02-09 20:11:32 +01:00
Laurent Destailleur	eccdc9a075	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php htdocs/langs/pt_PT/companies.lang	2018-02-08 15:20:24 +01:00
Rui Strecht	3a7cb43ad5	Forgot withregion condition if we want no state code	2018-02-07 16:06:58 +00:00
jh z	131eed97a1	New: Add a tab of Docments to expedition module	2018-02-07 22:56:14 +08:00
Rui Strecht	31372f8948	Merge branch 'develop' into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE # Conflicts: # htdocs/core/class/commonobject.class.php	2018-02-06 10:26:38 +00:00
Laurent Destailleur	ea92f6beae	Fix for multicompany	2018-02-06 10:57:53 +01:00
Laurent Destailleur	51847dfa8a	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/menus/init_menu_auguria.sql htdocs/core/menus/standard/eldy.lib.php	2018-02-05 15:34:50 +01:00
arnaud	3c816acb05	FIX order contactlist on Thirdparty by name	2018-02-05 15:06:28 +01:00
Laurent Destailleur	8fe773204e	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-04 23:18:33 +01:00
Laurent Destailleur	5455ab3280	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/projet/card.php	2018-02-04 23:17:09 +01:00
Laurent Destailleur	0cc6654b06	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/extrafields.class.php	2018-02-04 13:25:00 +01:00
Laurent Destailleur	fd8f89c708	FIX a discount is a percent, not an amount, so we use vatrate not price	2018-02-04 11:13:47 +01:00
Laurent Destailleur	c6fba7273d	Api interventions	2018-02-03 20:58:26 +01:00
Laurent Destailleur	2e705b5a88	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-02 10:41:20 +01:00
Laurent Destailleur	d3a6342034	Fix regeneration of PDF after creation of payment.	2018-02-02 10:37:10 +01:00
Laurent Destailleur	f51d6a2e50	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-02 10:07:16 +01:00
Laurent Destailleur	b2536d8ebb	FIX #8110	2018-02-01 15:44:35 +01:00
Laurent Destailleur	7f9d6a5458	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/public/paybox/newpayment.php htdocs/public/payment/newpayment.php htdocs/public/paypal/newpayment.php htdocs/public/stripe/newpayment.php	2018-01-31 20:25:24 +01:00
Laurent Destailleur	de0a8ba71f	Fix extrafields	2018-01-31 14:01:58 +01:00
Rui Strecht	75b9caf744	Merge branch 'develop' into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE	2018-01-31 11:19:39 +00:00
Laurent Destailleur	bbcc1e54d5	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-01-30 18:03:26 +01:00
Laurent Destailleur	f761c9efab	Add param morecss on error message	2018-01-30 18:02:24 +01:00
Laurent Destailleur	d6317a26d2	Fix for multicompany	2018-01-30 15:48:09 +01:00
Laurent Destailleur	0d90ab0c6c	Fix when counter is corrupted in database	2018-01-30 14:42:13 +01:00
Laurent Destailleur	06f2382e39	Fix compatibility with old actioncomm record	2018-01-30 11:05:11 +01:00
Laurent Destailleur	6fb90682cf	Merge pull request #7931 from grandoc/new_branch_09_12_17 enhance image using awesome icon	2018-01-30 00:08:42 +01:00
Laurent Destailleur	fec551631e	Merge pull request #8066 from grandoc/new_push_16_01_2018 NEW Add linked file tab to vat	2018-01-29 21:28:14 +01:00
Laurent Destailleur	bee64962fe	Fix css	2018-01-27 19:40:11 +01:00
Laurent Destailleur	a61b420759	Fix css	2018-01-26 23:29:49 +01:00
Laurent Destailleur	e379b02b81	Merge pull request #8009 from dolibarr95/patch-33 NEW add a hook in dol_print_phone	2018-01-26 18:02:27 +01:00
Laurent Destailleur	ae1641f4b9	Merge pull request #8063 from Alabate/develop NEW : Add password_hash as hash algorithm	2018-01-26 18:01:13 +01:00
Laurent Destailleur	6cae36cc33	NEW Add key __USER_REMOTE_IP__ into available substitution variables	2018-01-26 17:23:30 +01:00
Laurent Destailleur	82c2079d40	Fix var not initialized	2018-01-26 10:23:24 +01:00
Laurent Destailleur	c922498e79	Code comment	2018-01-25 20:35:25 +01:00
Laurent Destailleur	8d7f6843a4	Must be able to export lockedlog for a dedicated year. Fix date are nto humanly readable.	2018-01-25 12:57:36 +01:00
Laurent Destailleur	005bccc63d	Fix missing badge of nb of permissions	2018-01-25 12:06:22 +01:00
Laurent Destailleur	9cdb7f0f27	Code comment	2018-01-24 14:37:26 +01:00
Laurent Destailleur	7a1a2cf90d	Fix send into ledger for bank line record. Show accounted status.	2018-01-22 04:13:29 +01:00
Laurent Destailleur	273e88a599	Fix send into ledger for expense report. Show accounted status.	2018-01-22 03:07:11 +01:00
Laurent Destailleur	3987033aab	Fix substitution in public notes of pdf	2018-01-21 20:53:36 +01:00
Laurent Destailleur	dcd579242f	Fix <br /> (xml) into <br> (html)	2018-01-17 13:26:57 +01:00
Laurent Destailleur	26ba0a9ec2	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/cashdesk/index.php htdocs/compta/index.php htdocs/core/lib/security.lib.php htdocs/societe/list.php	2018-01-16 20:23:32 +01:00
Laurent Destailleur	94b1d59f2b	Fix missing check on object entity	2018-01-16 19:52:14 +01:00
Laurent Destailleur	59eefa46e6	Fix duplicate search field	2018-01-16 18:02:36 +01:00
Philippe GRAND	cd0dc2dbde	Add linked file tab to vat	2018-01-16 16:22:32 +01:00
Laurent Destailleur	926683763b	Modulebuilde fix sort of fields, fix generation of files	2018-01-15 17:38:15 +01:00
Laurent Destailleur	193dfec29e	Merge pull request #8061 from fappels/7.0_fix_module_builder 7.0 fix module builder	2018-01-15 11:32:40 +01:00
Aurélien Labate	b86a5d5623	FIX add password_hash compatibility test for PHP < 5.5	2018-01-15 11:02:08 +01:00
Aurélien Labate	8088d92bbb	NEW Add password_hash as hash algorithm	2018-01-15 00:33:25 +01:00
Laurent Destailleur	90fc086814	Fix minor	2018-01-14 20:11:38 +01:00
Laurent Destailleur	cc5dcde9e1	Fix protection to avoid errors	2018-01-14 18:55:55 +01:00
fappels	d6ed968c51	html modulebuilder type is a text type in database	2018-01-14 15:41:37 +01:00
Laurent Destailleur	f0d6099e5f	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/db/DoliDB.class.php htdocs/core/lib/functions.lib.php	2018-01-14 03:15:49 +01:00
Laurent Destailleur	9f6118ed52	Code comments	2018-01-14 03:12:22 +01:00
Laurent Destailleur	7a087327e1	Fix deprecated code	2018-01-13 19:33:40 +01:00
Laurent Destailleur	c947502efa	Fix typo	2018-01-13 17:22:59 +01:00
Laurent Destailleur	7c480f76e3	Fix thumbs of pdf at wrong place Fix param not provided Fix css	2018-01-13 16:09:05 +01:00
Laurent Destailleur	8d793c680e	Fix dol_delete_preview	2018-01-13 15:48:30 +01:00
Laurent Destailleur	7bfcfd4574	Fix recursive path when dir is '0'	2018-01-12 17:12:38 +01:00
Laurent Destailleur	95d2a9f88d	Responsive and css	2018-01-12 01:10:03 +01:00
Laurent Destailleur	46d28deee7	Fix substitution of thirdparty	2018-01-11 12:25:40 +01:00
Laurent Destailleur	3f4d7dbce6	Fix substitution of thirdparty	2018-01-11 12:24:47 +01:00
Laurent Destailleur	af6b84ba3a	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/list.php htdocs/contact/document.php htdocs/product/list.php	2018-01-11 01:03:13 +01:00
Laurent Destailleur	f83ea80d6a	Merge pull request #8041 from dolibarr95/patch-35 NEW Add class in societe/card.php	2018-01-11 00:47:53 +01:00
Laurent Destailleur	436b653fa0	Error report	2018-01-11 00:16:45 +01:00
Laurent Destailleur	167ab17927	Fix substitution of user_signature	2018-01-10 10:31:27 +01:00
dolibarr95	6fdbd4cc17	Update company.lib.php	2018-01-09 14:29:01 +01:00
dolibarr95	b9b42e3e9d	Add class Add oddeven class to show_contacts() list.	2018-01-09 14:04:18 +01:00
Laurent Destailleur	86227d77d6	Fix link of images	2018-01-08 01:37:10 +01:00
Laurent Destailleur	c13a7709f5	Fix link on image for website module	2018-01-08 00:20:38 +01:00
Laurent Destailleur	de94c77a98	Fix url to alias when dolibarr is server for website module	2018-01-07 20:32:59 +01:00
Paul Dermody	a1ac285a25	Fixed automated computation of surface and volume to use correct units. It was failing for inches and feet.	2018-01-07 12:42:14 -06:00
Laurent Destailleur	dbf7603118	Debug blockedlog for loi finance 2016	2018-01-05 04:31:48 +01:00
Laurent Destailleur	07d991cc8d	Code comment	2018-01-05 01:27:48 +01:00
Laurent Destailleur	6e9e4e13c1	Code comment	2018-01-05 01:26:57 +01:00
Laurent Destailleur	21506f25b9	Merge pull request #8022 from OPEN-DSI/core_access_rights_resource_multientities Fix: Access rights for resource in multi-entities	2018-01-04 21:03:55 +01:00
Laurent Destailleur	e10a9912dc	Fix missing worload	2018-01-04 19:54:30 +01:00
KHELIFA	7d824b3ef2	Fix: Access rights for resource in multi-entities	2018-01-04 15:05:11 +01:00
Laurent Destailleur	48261f793d	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/product/admin/product.php	2018-01-03 20:21:10 +01:00
Laurent Destailleur	ca14dd790b	Fix module website	2018-01-02 22:58:37 +01:00
Laurent Destailleur	c98b5c7ec7	Fix css background	2018-01-02 17:27:05 +01:00
dolibarr95	3438cfb1e7	Update functions.lib.php syntax error $withpicto	2018-01-02 11:48:41 +01:00
dolibarr95	e794a3b321	Update functions.lib.php add more parameters and add if empty	2018-01-02 11:44:54 +01:00
dolibarr95	ab896dc49d	Update functions.lib.php	2018-01-02 11:39:00 +01:00
dolibarr95	12e414509c	Add a hook in dol_print_phone To allow more controls in this print function as in dol_print_address (there is a hook so we can create links to maps...). Eg : create a other click to dial functions (different from dolibarr ones with more parameters, because each provider give differents api ) etc Hope this one will be accepted and usefull for the community. And happy new year :)	2018-01-02 11:24:28 +01:00
Laurent Destailleur	6f107e3fee	Fix API to download/build doc	2017-12-27 15:48:20 +01:00
Regis Houssin	59a89b250d	Fix: avoid warning (https://github.com/Dolibarr/dolibarr/issues/7993 )	2017-12-27 11:56:58 +01:00
Laurent Destailleur	57272dc5fe	API to get list of available document is ok for invoice order, proposal, shipment	2017-12-22 19:49:31 +01:00
Laurent Destailleur	493669e986	Fix look and feel v7	2017-12-22 14:19:12 +01:00
Laurent Destailleur	aad0da2513	Fix maxi debug of APIs (clean output fields)	2017-12-21 16:50:18 +01:00
Laurent Destailleur	d20062df73	Fix jquery css theme	2017-12-20 20:18:41 +01:00
Laurent Destailleur	12d91d7444	Fix missing messages in error report. Fix test on non empty array	2017-12-19 18:26:27 +01:00
Laurent Destailleur	feaff433b8	Debug module website	2017-12-19 12:54:10 +01:00
Laurent Destailleur	89a62103ca	Debug module website	2017-12-19 11:40:29 +01:00
Laurent Destailleur	d4afb8300d	Fix several pb of duplicate functions in some cases	2017-12-19 00:15:22 +01:00
Laurent Destailleur	2204790602	Fix filter on project id when id is list with comma	2017-12-18 19:04:57 +01:00
Laurent Destailleur	1351a43a30	FIX Maxi debug of permission for users external or restricted to sales representatives	2017-12-18 16:13:05 +01:00
Laurent Destailleur	54db0d31b4	Fix GETPOST for intcomma	2017-12-18 11:32:24 +01:00
Laurent Destailleur	8d671b2b26	Debug website module	2017-12-17 16:24:47 +01:00
Laurent Destailleur	2163db446b	NEW Can test signature of a version from API	2017-12-16 17:24:23 +01:00
Laurent Destailleur	9cdf322bfb	Fix scrutinizer bugs	2017-12-15 22:14:28 +01:00
Laurent Destailleur	e774beffc3	Fix the symbol of Yuan must be before amount	2017-12-15 17:17:35 +01:00
Laurent Destailleur	5af153550d	Debug blockedlog: - Add a track into log when we disable/enable module - Add a protection to avoid disable of module when recording was started - Better compatibility with multicompany - Can filter on ref and amount - Add a permission to read the blockedlog - Add more information on payments/invoice/thirdparty into log - Reset of module data after a migration from v6 (not compatible)	2017-12-15 16:56:08 +01:00
Laurent Destailleur	2eea3a1afa	Fix backlink of module setup pages	2017-12-15 10:36:35 +01:00
Laurent Destailleur	427f1490f8	Fix css	2017-12-14 13:52:32 +01:00
Laurent Destailleur	247c380d18	Several fixes	2017-12-12 16:11:40 +01:00
Laurent Destailleur	f886aac75a	Merge pull request #7944 from lampi87/develop public holiday in austria	2017-12-12 14:59:23 +01:00
Laurent Destailleur	06e63615e3	complete api detection	2017-12-12 13:05:22 +01:00
Laurent Destailleur	9880ef7364	Fix module website	2017-12-12 01:40:34 +01:00
Laurent Destailleur	48aada6090	Export of website	2017-12-11 21:27:43 +01:00
Laurent Destailleur	bb7c03906e	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/files.lib.php htdocs/societe/list.php	2017-12-11 15:25:09 +01:00
Laurent Destailleur	48499fb506	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-12-11 15:21:22 +01:00
Laurent Destailleur	f2e429e28f	Fix file integrity checker (exclude files excluded from package)	2017-12-11 15:03:34 +01:00
Laurent Destailleur	acf2d2ee9a	Fix scrutinizer reported bugs	2017-12-11 11:48:11 +01:00
Alexander Lampret	46aeb7068c	public holiday in austria	2017-12-11 10:51:58 +01:00
Laurent Destailleur	066e04f33d	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2017-12-11 00:22:05 +01:00
Laurent Destailleur	dbd96d1ac7	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/actions_sendmails.inc.php htdocs/loan/card.php htdocs/loan/class/loan.class.php	2017-12-10 21:46:23 +01:00
Laurent Destailleur	4017d09613	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-12-10 21:28:36 +01:00
Laurent Destailleur	f18edd5787	Update security.lib.php	2017-12-10 21:08:13 +01:00
Laurent Destailleur	7d553f58f5	Debug website module	2017-12-10 20:34:35 +01:00
patrick Delcroix	033016da7f	fix: unable to remove salaries, plus correct default rights management	2017-12-10 20:02:26 +01:00
Laurent Destailleur	2dae21259e	Fix the switch show more/less	2017-12-10 19:03:18 +01:00
Laurent Destailleur	e1f0483b23	Fix grabber of url when url is on second level dir. More phpunits	2017-12-10 17:59:19 +01:00
Laurent Destailleur	02d9e93ed4	Fix badge and use of data-html instead of html tag	2017-12-10 15:46:35 +01:00
Laurent Destailleur	4443c0f0a0	Fix style	2017-12-10 15:24:47 +01:00
Maxime Kohlhaas	3db4d10fc0	Fix event late alert on third event list #7912	2017-12-10 08:12:49 +01:00
Laurent Destailleur	e3dcff7f5b	Fix substition for menus title and urls	2017-12-09 15:35:01 +01:00
Philippe GRAND	8fa7b924d5	enhance image using awesome icon	2017-12-09 12:08:50 +01:00
Laurent Destailleur	95cb5025a2	Fix length of month too large More complete template	2017-12-08 16:15:41 +01:00
Laurent Destailleur	56b5eab2e4	Merge pull request #7911 from atm-alexis/NEW_blockedlog_reset_warning NEW warning on module blocked log reset if country code is FR	2017-12-08 13:47:44 +01:00
alexis Algoud	62cd77d999	NEW automatic activation of external module on country set	2017-12-08 10:13:03 +01:00
Laurent Destailleur	cf5265d405	Minor fix	2017-12-07 21:44:12 +01:00
Laurent Destailleur	c6e1087834	Fix test on vat amount	2017-12-05 19:47:46 +01:00
Laurent Destailleur	78c4b7f912	Fix look and feel v7	2017-12-04 20:17:07 +01:00
Laurent Destailleur	2458244ee3	Fix css	2017-12-02 16:24:38 +01:00
Laurent Destailleur	7b47ef3ca1	Change order or field	2017-12-02 11:34:56 +01:00
Laurent Destailleur	e8327fd9a1	Fix the eatby/sellby date was not visible.	2017-12-02 10:43:01 +01:00
Laurent Destailleur	46b281f703	Fix for #7697	2017-12-01 19:29:29 +01:00
Laurent Destailleur	89ef597690	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-12-01 18:12:52 +01:00
Laurent Destailleur	4969ae2abb	Fix missing the badge on virtual product tab	2017-12-01 17:48:51 +01:00
Laurent Destailleur	e36b62f539	Merge pull request #7900 from fappels/7.0_fix_warehouse_label_ref- Fix dispatch not adapted for label to ref change for warehouse	2017-12-01 16:26:21 +01:00
fappels	1c72dc608f	Fix travis	2017-12-01 16:22:34 +01:00
Laurent Destailleur	1d2b5dbe97	Merge pull request #7892 from atm-maxime/fix_contactlist_empty Fix filters on contact list must always appear	2017-12-01 15:54:03 +01:00
Laurent Destailleur	670465fcd8	Fix responsive and search	2017-12-01 12:01:17 +01:00
Laurent Destailleur	6796c08cb8	Debug/rewrite Blockedlog	2017-11-30 14:21:55 +01:00
Maxime Kohlhaas	879a0812d7	Fix filters on contact list must always appear	2017-11-29 20:04:15 +01:00
Laurent Destailleur	9fa6bfd1a5	Fix edit external user or not	2017-11-29 15:30:41 +01:00
Laurent Destailleur	a15a57317b	Debug accountancy module	2017-11-28 11:12:13 +01:00
Laurent Destailleur	533a82187a	NEW Add a protection so we can't journalize non balanced transactions	2017-11-27 17:12:48 +01:00
Scrutinizer Auto-Fixer	aab2799981	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-11-27 13:48:36 +00:00
Laurent Destailleur	a0406bc741	Standardize view of events for products	2017-11-26 20:24:20 +01:00
Laurent Destailleur	7e40ee5e4b	Fix substitution key for constant ok with php 5.3	2017-11-25 23:16:15 +01:00
Laurent Destailleur	c02528a479	NEW Accept substitution key __[ABC]__ replaced with value of const ABC	2017-11-25 19:55:31 +01:00
Laurent Destailleur	2fc5d9fefb	The form to test email can now use all sending profiles.	2017-11-25 18:52:47 +01:00
Laurent Destailleur	0b9a3087ea	Fix bug reported by scrutinizer	2017-11-25 12:11:02 +01:00
Laurent Destailleur	4cff4c6935	Simplify and standardize code for agenda pages	2017-11-25 00:12:45 +01:00
Laurent Destailleur	3db52b5f9e	Debug responsive of v7	2017-11-24 14:23:25 +01:00
Laurent Destailleur	b93e35cdd2	Fix a lot of request to use the IN getentity instead of = Fix a lot of request to use left join on type of payment table	2017-11-23 15:06:16 +01:00
Laurent Destailleur	b0cecab22b	Removed useless code	2017-11-22 21:26:24 +01:00
Laurent Destailleur	240f67d82b	Disable tab if not on develop mode	2017-11-22 21:23:42 +01:00
Laurent Destailleur	5fa8db1650	Work on timesheets	2017-11-22 21:19:40 +01:00
Laurent Destailleur	c3d8ef2104	Update functions.lib.php	2017-11-22 11:14:52 +01:00
Regis Houssin	a9bfe0f48f	Fix: some problems with medias in multicompany (backport 6.0 commit `762b4eb876`)	2017-11-22 10:12:51 +01:00
Regis Houssin	848a27283b	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_member	2017-11-22 09:51:57 +01:00
Regis Houssin	1595bb1148	NEW add possibility to remove address field	2017-11-22 09:51:46 +01:00
Laurent Destailleur	4b4412d5da	Standardize file names for ECM	2017-11-20 19:40:34 +01:00
Laurent Destailleur	e19ca7b6d4	Work on generic filemanager	2017-11-20 18:19:41 +01:00
Laurent Destailleur	304819a726	Work on module builder	2017-11-19 16:26:39 +01:00
Laurent Destailleur	80bdb45be8	Look and feel v6 - Show status of thirdparty in dol_banner	2017-11-18 01:48:16 +01:00
Laurent Destailleur	742bf29c65	Look and feel v6 - Show status of thirdparty in dol_banner	2017-11-18 01:29:42 +01:00
Laurent Destailleur	2cb190fc5c	Fix return code	2017-11-17 15:27:59 +01:00
Laurent Destailleur	ead629708c	Look and feel v6	2017-11-17 14:57:14 +01:00
Laurent Destailleur	405275693f	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/product/stock/replenishorders.php htdocs/projet/activity/perday.php	2017-11-17 14:20:08 +01:00
Laurent Destailleur	68f477eaf7	Merge pull request #7818 from dolibarr95/patch-29 Fix : syntax error in dol_print_graph()	2017-11-17 13:18:11 +01:00
Laurent Destailleur	e06087888b	NEW Show line "other filtered task" when using filter on timesheet.	2017-11-16 22:55:04 +01:00
Laurent Destailleur	f153d9c9ff	Fix time spent counted twice	2017-11-16 19:41:31 +01:00
Laurent Destailleur	4f25bc5e3b	NEW detection of edge browser	2017-11-16 14:44:55 +01:00
Laurent Destailleur	c527189088	Standardize page name	2017-11-16 12:18:25 +01:00
dolibarr95	c6c1552c01	syntax error bad syntax when add an url in dol_print_graph()	2017-11-15 11:11:45 +01:00
Laurent Destailleur	451d3ed8ed	NEW Add API to activate/unactivate a contract	2017-11-14 17:51:04 +01:00
florian HENRY	e195cf0b95	fix : return vat code for supplier price	2017-11-14 09:53:06 +01:00
Laurent Destailleur	97c9549087	Fix ref supplier must be output if it exists, even for free products	2017-11-13 11:30:41 +01:00
Laurent Destailleur	f33182acc5	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-11-12 20:49:53 +01:00
Laurent Destailleur	356525730d	FIX #7786	2017-11-12 20:12:56 +01:00
Laurent Destailleur	955ed7dbbf	NEW Show the supplier ref into supplier cards	2017-11-12 15:30:21 +01:00
Laurent Destailleur	186c8cdbf0	Fix selection of contact into creation of event	2017-11-12 13:40:05 +01:00
Laurent Destailleur	836f6bf3c9	Fix search filter when using extrafields 'links'	2017-11-12 12:39:23 +01:00
Laurent Destailleur	cba3a3846f	Merge pull request #7790 from frederic34/facrecmodelpdf NEW generate also document when invoice is build from recurring template	2017-11-11 17:42:26 +01:00
Laurent Destailleur	cb6bf91044	Merge pull request #7787 from libersoft/feature/correct-italian-address-format NEW Support Italian addresses format. Fixes #7785	2017-11-11 17:38:29 +01:00
Laurent Destailleur	01a41237bf	CSS	2017-11-11 14:20:08 +01:00
Laurent Destailleur	debc0480dd	CSS	2017-11-10 20:20:59 +01:00
Laurent Destailleur	c2d7b88bdd	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-11-10 13:51:59 +01:00
Laurent Destailleur	ab78007a54	Work on filemanager generic component	2017-11-10 13:45:38 +01:00
Frédéric FRANCE	6f647f8a40	generate doc on cron jobs	2017-11-09 23:39:28 +01:00
Laurent Destailleur	9b07f33649	Clear code	2017-11-09 09:50:55 +01:00
Laurent Destailleur	d18f65a6e2	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/functions.lib.php	2017-11-09 01:25:41 +01:00
Laurent Destailleur	ad71a22994	Code comment	2017-11-09 01:21:02 +01:00
Laurent Destailleur	c8a551e7de	Reorganize javascript at end of page.	2017-11-09 01:00:43 +01:00
Valerio Baldisserotto	15a501467e	FR: Support Italian address format. Fixes #7785	2017-11-08 11:43:52 +01:00
Laurent Destailleur	e7abc92f97	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/bank/transfer.php htdocs/core/lib/functions.lib.php	2017-11-06 21:37:19 +01:00
Laurent Destailleur	bc093ef969	FIX #7775 Order of deletion in delete method (trigger first)	2017-11-06 19:27:10 +01:00
Laurent Destailleur	bc9b816719	Fix deletion of files that contains __	2017-11-06 17:54:18 +01:00
Laurent Destailleur	864af9cc3b	Fix error not returned if output directory not writable	2017-11-06 11:47:03 +01:00
Laurent Destailleur	ea5dd3eb3d	NEW Add REST API for supplier proposals	2017-11-06 11:06:31 +01:00
Laurent Destailleur	534c50f46e	Move api that are admin features into a dedicated /admin api	2017-11-06 09:55:31 +01:00
Laurent Destailleur	7139cbb490	Fix regression	2017-11-05 19:00:43 +01:00
Laurent Destailleur	fd8f65341b	Merge pull request #7765 from bomuux/patch-3 Fix: vat reports now include expense reports vat	2017-11-05 18:37:25 +01:00
Laurent Destailleur	1e939ec90c	Merge pull request #7761 from hregis/develop_member Fix: broken feature (add more attr and css class)	2017-11-05 18:33:43 +01:00
Laurent Destailleur	202d36d582	Work on modulebuilder	2017-11-05 18:15:59 +01:00
Laurent Destailleur	e4ba6cfa10	Debu website module	2017-11-05 03:57:26 +01:00
Laurent Destailleur	c78c06776b	Fix bug reported by scrutinizer	2017-11-05 03:39:27 +01:00
Laurent Destailleur	91950ccbc7	Fix regression in getRandomPassword	2017-11-05 03:03:17 +01:00
Laurent Destailleur	05ee3e3825	Fix show message "files uploaded" only once even when n files.	2017-11-05 01:06:34 +01:00
Laurent Destailleur	bac6a434f4	Add link to make a direct download on card	2017-11-04 17:11:58 +01:00
bomuux	0a2d8a820b	FIX: make vat reports work with expensereports function tax_by_date : Fixed sql query for expense reports vat, now returning pad vat for expense report, previously returning nothing.	2017-11-03 21:06:56 +01:00
Laurent Destailleur	e78406e120	Debug cronjob	2017-11-03 20:04:18 +01:00
Laurent Destailleur	f32f3ff17f	Better default function to generate passwords	2017-11-03 18:02:17 +01:00
Laurent Destailleur	a346a1a5e9	Work on website module	2017-11-03 15:56:16 +01:00
Regis Houssin	2d4717b745	Fix: broken feature (add more attr and css class)	2017-11-03 14:46:45 +01:00
Laurent Destailleur	fa1fbe7db7	Work on websiteaccounts	2017-11-03 13:25:49 +01:00
Laurent Destailleur	ce3e586bd0	Fix doxygen	2017-11-03 11:44:31 +01:00
Laurent Destailleur	2a2c0aaa5f	Clean and debug code to execute CLI commands	2017-11-02 20:17:27 +01:00
Laurent Destailleur	f5e1ca3178	Fix break on project	2017-11-02 15:33:04 +01:00
Laurent Destailleur	cfacfab6cf	NEW Show badge with nbr of shipment on shimpen tab of order NEW Add button cancel on shipment creation	2017-11-02 12:38:36 +01:00
Laurent Destailleur	dbd85321b3	Merge pull request #7735 from grandoc/new_branc_30_10_17 Warning: trim() expects parameter 1 to be string, array given in /htt…	2017-11-02 09:58:57 +01:00
Laurent Destailleur	6ea558b639	Update functions.lib.php	2017-11-02 09:58:22 +01:00
Laurent Destailleur	f26d970d58	Remove option MAIN_HTML5_PLACEHOLDER (on by default now)	2017-11-01 10:17:24 +01:00
Laurent Destailleur	9458c80c48	Work on reminders	2017-10-31 23:10:29 +01:00
Laurent Destailleur	d39a19e976	Replace on/off img tick with fa-font	2017-10-31 12:32:30 +01:00
Laurent Destailleur	bd94ec0f1d	Use fontawesome for picto for on/off default.	2017-10-31 12:25:06 +01:00
Laurent Destailleur	068f5e32cb	NEW Tooltip for substitutions variables on tooltips on admin pages	2017-10-31 11:17:44 +01:00
Laurent Destailleur	b29f32171c	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog htdocs/comm/action/class/actioncomm.class.php htdocs/contrat/card.php htdocs/core/lib/project.lib.php htdocs/filefunc.inc.php	2017-10-30 18:22:26 +01:00
Philippe GRAND	f904c46a10	Warning: trim() expects parameter 1 to be string, array given in /httpdocs/core/lib/functions.lib.php on line 520	2017-10-30 14:22:34 +01:00
Laurent Destailleur	33aa0f3160	Code comment	2017-10-29 17:49:24 +01:00
Laurent Destailleur	cd5e43483e	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/contrat/card.php htdocs/core/lib/project.lib.php htdocs/expedition/card.php htdocs/projet/class/task.class.php	2017-10-28 22:08:16 +02:00
Laurent Destailleur	adc4db0f85	Standardize code	2017-10-28 16:55:25 +02:00
Laurent Destailleur	9676b83574	Google tag enabled also on mobile	2017-10-28 16:00:46 +02:00
Laurent Destailleur	9e382a7f1b	Can disabled output of notify messages	2017-10-28 13:36:23 +02:00
Laurent Destailleur	9a5d532786	Fix website	2017-10-27 18:45:12 +02:00
Laurent Destailleur	013ab9405e	Work on website module	2017-10-27 17:58:38 +02:00
Laurent Destailleur	01af1e3252	Work on website module	2017-10-27 15:42:48 +02:00
Laurent Destailleur	f02e731c67	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/core/lib/project.lib.php	2017-10-27 02:32:09 +02:00
Laurent Destailleur	fed0f3d09e	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 Conflicts: htdocs/core/lib/project.lib.php htdocs/projet/class/task.class.php	2017-10-27 02:30:33 +02:00
Laurent Destailleur	90bd9f2f4f	Fix trad	2017-10-26 20:57:23 +02:00
Laurent Destailleur	a1f862eba6	NEW Enhance framework so we can use html/icons into SELECT options.	2017-10-26 20:06:23 +02:00
Laurent Destailleur	67e5d72bd0	Fix doxygen	2017-10-26 14:56:07 +02:00
Laurent Destailleur	82b333e423	Fix migration to select2 4.0.5	2017-10-26 14:06:23 +02:00
Laurent Destailleur	5f5cbec1cf	Debug module website	2017-10-26 13:09:11 +02:00
Laurent Destailleur	6d6c4bf088	Fix export web site	2017-10-26 10:43:47 +02:00
Laurent Destailleur	202712be94	Work on module builder	2017-10-25 22:02:07 +02:00
Laurent Destailleur	f381361c8b	Work on modulebuilder	2017-10-24 19:57:36 +02:00
Laurent Destailleur	53d2f29cdd	Fix regression	2017-10-23 10:27:50 +02:00
Laurent Destailleur	f4f47c6732	NEW Remove tooltip tipTip library replaced with standatd jquery tooltip	2017-10-22 21:15:08 +02:00
Laurent Destailleur	efb369f857	Merge pull request #7497 from atm-florian/dev_accountancy NEW : lettrage in accountancy	2017-10-22 15:28:53 +02:00
Laurent Destailleur	b9bbba813a	Update company.lib.php	2017-10-22 15:28:03 +02:00
Laurent Destailleur	fb843430bf	FIX #7671	2017-10-22 03:22:31 +02:00
Laurent Destailleur	dbcf3ddbe8	NEW Upgrade jquery select2 to 4.0.4	2017-10-21 19:05:24 +02:00
Laurent Destailleur	1426737a26	Work on website	2017-10-21 12:26:14 +02:00
Laurent Destailleur	19a5780f7f	Clean code	2017-10-20 23:49:20 +02:00
Laurent Destailleur	3bca0ad07d	More modern picto for switch on/off Work on website module	2017-10-20 21:39:19 +02:00
Laurent Destailleur	ab4f5a3aea	Clean code	2017-10-20 18:15:43 +02:00
Laurent Destailleur	985675d680	Clean code	2017-10-20 18:04:46 +02:00
Laurent Destailleur	d82af57b57	NEW Add tab "Expense report" on user card	2017-10-19 20:56:23 +02:00
Laurent Destailleur	abd5251330	Better responsive	2017-10-19 19:53:29 +02:00
Laurent Destailleur	9c45e86a1c	Introduce main_doc into table of objects to know what is main doc. Work on option PROPOSAL_USE_ONLINE_SIGN	2017-10-19 11:40:40 +02:00
gauthier	3793ae323a	FIX : wrong personnal project time spent	2017-10-19 09:46:19 +02:00
florian HENRY	63f3ac2f2b	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_accountancy	2017-10-18 14:49:06 +02:00
Laurent Destailleur	69b131b919	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/propal/card.php htdocs/societe/class/api_thirdparties.class.php	2017-10-18 11:28:20 +02:00
florian HENRY	4273e507c5	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_accountancy Conflicts: htdocs/accountancy/bookkeeping/thirdparty_lettrage.php htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php htdocs/accountancy/class/lettering.class.php	2017-10-18 09:52:56 +02:00
Laurent Destailleur	aa1ff189e1	Fix var not correctly initialized when using api + multicompany	2017-10-17 12:58:26 +02:00
Laurent Destailleur	41464bf5ac	Merge pull request #7633 from defrance/patch-101 template file not only odt/ods	2017-10-16 20:25:20 +02:00
Rui Strecht	447cc208fe	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE # Conflicts: # htdocs/societe/class/societe.class.php	2017-10-16 09:34:24 +01:00
Laurent Destailleur	87814af7b6	Move function colorIsLight into functions.lib.php Fix scrutinizer bugs.	2017-10-16 09:29:10 +02:00
Laurent Destailleur	afdc176f47	Fix scrutinizer	2017-10-16 08:52:00 +02:00
BENKE Charlene	c44207f7d3	template file not only odt/ods	2017-10-14 12:39:39 +02:00
Scrutinizer Auto-Fixer	165741517e	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-10-13 11:28:26 +00:00
Laurent Destailleur	8113321062	Start to work on email sender profiles	2017-10-13 12:02:26 +02:00
Laurent Destailleur	2b55fb81b9	Standardize substition keys.	2017-10-13 10:35:21 +02:00
Laurent Destailleur	6497ca5394	prepare tzuserrel	2017-10-12 18:14:02 +02:00
Laurent Destailleur	50da6a0c9e	Prepare code for removing adodb	2017-10-12 14:59:38 +02:00
Laurent Destailleur	3f36cf23f5	NEW Break lines per project on the new timesheet page	2017-10-12 13:17:22 +02:00
Laurent Destailleur	cf3dd4be12	Merge pull request #7606 from dolibarr95/patch-23 NEW More picto for phone	2017-10-11 11:51:07 +02:00
Laurent Destailleur	eb75c2f98e	Merge pull request #7596 from hregis/develop_bug2 Fix: wrong POST GET name	2017-10-11 11:30:36 +02:00
dolibarr95	572a64bdbf	display mobile picto runs with #6617	2017-10-10 10:19:04 +02:00
Laurent Destailleur	9427655dd0	Option PROJECT_LINES_PERxxx_SHOW_THIRDPARTY is the default	2017-10-09 18:18:34 +02:00
Laurent Destailleur	084dc7798d	Standardize use of function getCommonSubstitutionArray	2017-10-09 14:51:42 +02:00
Rui Strecht	1a5cdf2406	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE # Conflicts: # htdocs/admin/company.php # htdocs/core/class/commonobject.class.php	2017-10-09 11:36:38 +01:00
Regis Houssin	64d9b625ff	Fix: wrong POST GET name	2017-10-09 11:03:16 +02:00
Laurent Destailleur	245c048b40	Merge pull request #7577 from OPEN-DSI/fix_0001 Fix carriage return when get full address formated for output on documents	2017-10-09 10:48:26 +02:00
Laurent Destailleur	3e0ccd6312	FIX #7585	2017-10-09 10:43:19 +02:00
KHELIFA	d77dfb9199	Fix return chariot	2017-10-09 09:26:25 +02:00
Laurent Destailleur	67c33840cf	Code comment	2017-10-08 23:19:19 +02:00
Laurent Destailleur	33624e1001	NEW Attaching doc automatically in email is now a parameter of template.	2017-10-08 16:34:42 +02:00
Laurent Destailleur	7465daa0da	Merge pull request #7583 from hregis/develop_admin NEW add '$moreatt' parameter in picto_from_langcode function	2017-10-07 13:45:16 +02:00
Laurent Destailleur	66978a3bb4	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/class/fournisseur.commande.class.php	2017-10-07 13:44:27 +02:00
Scrutinizer Auto-Fixer	328d39bc71	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-10-07 11:09:31 +00:00
Laurent Destailleur	74deb05527	Clean code. Use constant for status of supplier order process.	2017-10-07 13:04:31 +02:00
Laurent Destailleur	4347bc06a2	do no transform data:image	2017-10-07 02:40:03 +02:00
Laurent Destailleur	3cc48f156f	The new website module become wonderfull	2017-10-07 02:29:27 +02:00
Laurent Destailleur	aa3fd067fc	Fix regex UNGREEDY	2017-10-06 23:54:45 +02:00
Laurent Destailleur	8e187c2759	Debug module website	2017-10-06 22:49:08 +02:00
Regis Houssin	e0e10ff830	NEW add '$moreatt' parameter in picto_from_langcode function	2017-10-06 20:53:41 +02:00
Laurent Destailleur	df38f60617	Export website into zip	2017-10-06 18:29:18 +02:00
Laurent Destailleur	43d85af5ae	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-06 15:23:10 +02:00
KHELIFA	dc87133e0b	Fix carriage return when get full address formated for output on documents	2017-10-06 15:06:59 +02:00
Laurent Destailleur	1becbb8805	Fix bad date on time spent view	2017-10-06 14:38:33 +02:00
Laurent Destailleur	f9d9642340	FIX #6981	2017-10-06 14:07:28 +02:00
Laurent Destailleur	777486d74c	Keep usage of function dol_hash to encrypt a non encrypted data	2017-10-06 13:13:51 +02:00
Laurent Destailleur	4bc7eb0ec1	Merge pull request #7520 from hregis/develop_ldap Fix: Set LDAP password when LDAP key changed	2017-10-06 13:09:28 +02:00
Laurent Destailleur	06b18a740e	NEW Add date of birth on user card. NEW Show expected worked hours on the timesheet form.	2017-10-06 12:08:01 +02:00
Laurent Destailleur	edacf6789b	Remove dead code	2017-10-06 10:47:58 +02:00
Laurent Destailleur	848aadb48a	FIX Do not lose selected id after ENTER the TAB on autocomplete	2017-10-06 10:47:02 +02:00
Regis Houssin	8a79198769	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap Conflicts: htdocs/core/class/comment.class.php	2017-10-04 20:00:39 +02:00
Laurent Destailleur	8e0da9bfeb	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/holiday/document.php	2017-10-04 13:32:53 +02:00
Regis Houssin	c563c3d3ac	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap	2017-10-04 13:19:07 +02:00
Laurent Destailleur	9b3826a54c	Invert left and right (my own comment on left)	2017-10-04 13:17:16 +02:00
Laurent Destailleur	85606126a9	Standardize code for events	2017-10-04 12:58:13 +02:00
Regis Houssin	66ad30feb0	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap	2017-10-04 11:23:50 +02:00
Laurent Destailleur	75a7e086b3	Merge pull request #7427 from atm-arnaud/NEW_comment_generic_element New comment generic element	2017-10-04 11:13:39 +02:00
Regis Houssin	feea6246c2	NEW add possibility to hide LDAP tab for non admin	2017-10-04 09:13:41 +02:00
Regis Houssin	8d3ad9ddc8	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap	2017-10-04 08:43:07 +02:00
Laurent Destailleur	436ec93084	FIX is_erasable report bad value when thirdparty was not loaded	2017-10-04 03:22:41 +02:00
Laurent Destailleur	a6cf934973	Add log	2017-10-04 02:46:01 +02:00
Laurent Destailleur	5ddd77c950	Fix We must use dol_escape_htmltag for input field not dol_htmlentities	2017-10-03 18:35:35 +02:00
Laurent Destailleur	c22cd1cfe9	Fix test on entity must always be done using the "IN" instead of "="	2017-10-03 17:41:22 +02:00
Laurent Destailleur	f2e0ff0d30	Merge branch 'develop_dict' of https://github.com/hregis/dolibarr into hregis-develop_dict	2017-10-03 17:25:01 +02:00
Laurent Destailleur	422a3425a8	Merge pull request #7539 from defrance/patch-28 unable to delete salaries	2017-10-03 16:16:49 +02:00
Laurent Destailleur	a501a20487	NEW Search filters in lists are restored when using "back to list"	2017-10-03 16:00:52 +02:00
Laurent Destailleur	c4b3dc40c3	Allow : into file names	2017-10-03 10:54:51 +02:00
Laurent Destailleur	888e5ed2c5	Fix sanitize uploaded filename	2017-10-03 10:54:09 +02:00
Laurent Destailleur	793f1318de	Fix sanitize uploaded filename	2017-10-03 09:35:45 +02:00
Laurent Destailleur	26564cc79c	Allow : into file names	2017-10-02 20:38:15 +02:00
BENKE Charlene	41ba7af9fe	unable to delete salaries compta/salaries/cards ask for a salarie/payement/delete right to delete	2017-10-02 18:49:25 +02:00
Regis Houssin	e65b21a3bf	Fix: change the parameter value of dol_getIdFromCode	2017-10-02 11:59:17 +02:00
Regis Houssin	09e71f1390	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-10-02 11:51:27 +02:00
Laurent Destailleur	7c30b3ca5d	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-10-02 01:28:20 +02:00
Laurent Destailleur	f785203c0d	Creating a page from an external url can grab images too.	2017-10-01 18:27:54 +02:00
Laurent Destailleur	3ddd5d3d3a	The default value feature is sensitive to url parameters.	2017-10-01 14:54:17 +02:00
Laurent Destailleur	b7810d95b9	Fix permissions	2017-09-30 20:43:15 +02:00
Regis Houssin	46cc23c568	Fix: $this->pass is empty if DATABASE_PWD_ENCRYPTED is used	2017-09-30 10:41:35 +02:00
atm-ph	7ba2dd8397	Fix the pdf_getlineprogress hook isn't use because hookmanager is null	2017-09-28 15:25:51 +02:00
Rui Strecht	4839d0f84d	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE	2017-09-28 09:36:52 +01:00
Laurent Destailleur	537a551bb5	Fix vat visiblity on pdf	2017-09-27 21:58:42 +02:00
Laurent Destailleur	6bdfa99fc2	FIX The backtopage	2017-09-27 20:07:01 +02:00
Laurent Destailleur	fdc1aa2a03	NEW Move contacts of a thirdparty on tab Contacts/Addresses	2017-09-27 19:56:03 +02:00
Laurent Destailleur	8242469e40	FIX The unique index on email templates can work now.	2017-09-27 18:16:28 +02:00
Laurent Destailleur	f1f4a2fb44	Add email template to send SEPA mandate	2017-09-27 17:40:14 +02:00
Regis Houssin	9823d6622c	Fix: use default $shared value	2017-09-27 17:40:02 +02:00
Regis Houssin	20684b4505	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/core/modules/rapport/pdf_paiement.class.php htdocs/core/modules/rapport/pdf_paiement_fourn.class.php	2017-09-27 17:22:18 +02:00
arnaud	f29ea35dc8	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_comment_generic_element	2017-09-27 14:56:52 +02:00
Rui Strecht	3ebb18ab16	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE	2017-09-26 16:34:59 +01:00
Laurent Destailleur	d7dd6ed334	Fix undefined var	2017-09-26 16:15:22 +02:00
florian HENRY	6fcfe89565	NEW : lettrage in accountancy	2017-09-26 13:02:29 +02:00
Laurent Destailleur	5482f80c0e	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-26 10:30:47 +02:00
Laurent Destailleur	59571b1ce1	FIX #7473 Mass update of vat rates and other bugs on localtax	2017-09-26 10:29:44 +02:00
Regis Houssin	d592664150	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-09-25 06:48:26 +02:00
Regis Houssin	92ff974c5b	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap	2017-09-25 06:47:34 +02:00
Laurent Destailleur	4246cf24f3	Perf enhancement: Remove one include of js.	2017-09-24 20:36:27 +02:00
Laurent Destailleur	49e9326a6d	Code comment	2017-09-24 19:50:32 +02:00
Regis Houssin	06ee9f4775	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap	2017-09-24 16:10:55 +02:00
Laurent Destailleur	91d303465d	NEW Can add html content on right of tabs	2017-09-24 01:39:06 +02:00
Laurent Destailleur	b4e461e7ea	Debug modulebuilder	2017-09-23 18:17:34 +02:00
Laurent Destailleur	bee94b32d9	Debug modulebuilder	2017-09-23 15:12:25 +02:00
Laurent Destailleur	57adc28256	Work on modulebuilder	2017-09-23 01:45:03 +02:00
Laurent Destailleur	96aed9c29d	Work on modulebuilder	2017-09-22 23:38:25 +02:00
Regis Houssin	791c385e5b	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap Conflicts: htdocs/adherents/card.php	2017-09-22 20:26:22 +02:00
Laurent Destailleur	63ec14e47d	Convert sode to send member info email into new generic email template system.	2017-09-22 20:18:11 +02:00
Laurent Destailleur	6d7db96359	NEW Option "one email per recipient" when using bulk actions emails.	2017-09-22 16:31:05 +02:00
Laurent Destailleur	d4bde2a4ea	Fix date substitution for contracts	2017-09-22 15:12:36 +02:00
Laurent Destailleur	252f038468	Mutualize code of substitutions for emails	2017-09-22 14:34:31 +02:00
Laurent Destailleur	bd45ea5a03	Split page for invoice template into card + list. Add more filters.	2017-09-22 11:28:53 +02:00
Laurent Destailleur	beac7a7439	Work on direct download links	2017-09-20 21:29:27 +02:00
Rui Strecht	9fc8012663	Tiny fix to php doc variables	2017-09-20 14:30:53 +01:00
Rui Strecht	395100ca70	Added missing comments for new function parameters, removed unused parameter $searchlabel	2017-09-20 12:45:18 +01:00
Rui Strecht	42a57aab26	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE	2017-09-20 12:16:09 +01:00
Rui Strecht	f1126b65bf	Updated method to fetch state name, code and id to match method used with country Reverted some previous changes to allow backwards compatibility Extended MAIN_SHOW_REGION_IN_STATE to include showing region in thirdparty card	2017-09-20 12:06:35 +01:00
Regis Houssin	1f59e4f7e9	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap	2017-09-20 12:47:35 +02:00
Laurent Destailleur	8dfa87fcf6	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-19 19:30:28 +02:00
Laurent Destailleur	c38ed54990	Disable old datepicker	2017-09-19 17:31:37 +02:00
Laurent Destailleur	5f7631a95d	NEW Days where user is on vacation use different colors in timesheet.	2017-09-19 17:07:39 +02:00
Laurent Destailleur	2a04d497da	Use a different css into timespent entry page when user is on holiday	2017-09-19 16:40:55 +02:00
Laurent Destailleur	978702d04b	Fix false deprecated warning	2017-09-19 01:41:57 +02:00
Laurent Destailleur	b723d2c2d2	Fix scrutinizer bugs	2017-09-19 01:39:22 +02:00
Rui Strecht	76a2513c76	Added self to contributors list	2017-09-18 17:49:31 +01:00
Rui Strecht	998eea09bd	Added new option MAIN_SHOW_STATE_CODE (on/off; 1/0) to show state code in select fields options and values. Changed option MAIN_SHOW_REGION_IN_STATE to on/off - 1/0 and to mix with the new MAIN_SHOW_STATE_CODE (can show region name and state code)	2017-09-18 16:48:13 +01:00
arnaud	e7bb7a3588	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_comment_generic_element	2017-09-18 17:28:03 +02:00
arnaud	9795f48046	NEW comment system working with all objects	2017-09-18 17:27:29 +02:00
Laurent Destailleur	70b11f18b5	FIX #7367	2017-09-18 16:06:58 +02:00
Laurent Destailleur	da6b1e92b2	NEW Add the total in the perday view of the time spent form.	2017-09-18 14:18:34 +02:00
Laurent Destailleur	85d59b32b3	Add timespent entry into HR top menu too Faster update of total of timespent	2017-09-18 13:15:24 +02:00
Regis Houssin	f550e27579	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap	2017-09-18 12:15:01 +02:00
Laurent Destailleur	0355b0d9ed	Merge pull request #7414 from aspangaro/7.0-4 Accountancy - Finish moving admin to specific menu & some cleaning	2017-09-18 11:16:36 +02:00
Regis Houssin	a03ef95eaa	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/install/mysql/tables/llx_c_payment_term.sql	2017-09-18 09:11:04 +02:00
Laurent Destailleur	e244ee6715	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-17 21:17:04 +02:00
Laurent Destailleur	2c3428a1bf	Fix css	2017-09-17 20:48:09 +02:00
Laurent Destailleur	a3c555049d	NEW Add supplier proposals into stats of product page.	2017-09-17 18:08:23 +02:00
Laurent Destailleur	ab5724e7ff	Mutualize code for forms to send emails. Remove thousand line of code.	2017-09-17 17:12:14 +02:00
Regis Houssin	bdc425c203	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap	2017-09-16 21:41:55 +02:00
Regis Houssin	87b81fb2fd	NEW add members types ldap group management	2017-09-16 21:41:30 +02:00
Laurent Destailleur	630dc92a13	NEW Mass PDF Merging is available on contracts	2017-09-16 15:39:52 +02:00
Laurent Destailleur	695c231e78	Update code comment	2017-09-16 10:26:27 +02:00
Laurent Destailleur	bd7c4fe940	NEW Summary of last events on a card are sorted on decreasing date.	2017-09-16 10:12:44 +02:00
Laurent Destailleur	4e7e6cc658	Fix W3C	2017-09-16 09:15:10 +02:00
Alexandre SPANGARO	c2e1e2491d	Accountancy - Finish moving admin to specific menu & some cleaning	2017-09-16 06:53:29 +02:00
Laurent Destailleur	961d475a9d	More complete substitution system. Add __CONTRACT_NEXT_EXPIRATION_DATE__ and __CONTRACT_NEXT_EXPIRATION_DATETIME__	2017-09-16 03:45:29 +02:00
Laurent Destailleur	b13dbf1f06	Clean code. Make selection of template working even if public.	2017-09-16 00:49:46 +02:00
Laurent Destailleur	087e22ab94	Fix bad status picto	2017-09-16 00:14:39 +02:00
Regis Houssin	db17eb80ec	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/compta/facture/class/paymentterm.class.php	2017-09-15 16:45:49 +02:00
Laurent Destailleur	25c4dba8a0	Merge pull request #7402 from hregis/develop_ldap NEW: Add hook addAdminLdapOptions and doAction in ldap admin page	2017-09-15 15:51:38 +02:00
tysauron	2abb38afdf	Beaucoup beaucoup plus rapide Pour moi passe de 4 secondes a 0,8 (grosse base)	2017-09-15 12:48:57 +02:00
Laurent Destailleur	0ade500535	Better support of text editor when no js available.	2017-09-15 11:19:56 +02:00
Laurent Destailleur	e02c220c08	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-15 11:04:27 +02:00
Laurent Destailleur	cce1549f66	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/commande/card.php htdocs/core/lib/functions.lib.php htdocs/fourn/card.php htdocs/public/members/new.php	2017-09-15 11:02:34 +02:00
Regis Houssin	b9e0879847	NEW: Add hook addAdminLdapOptions and doAction in ldap admin page NEW: complete_head_from_modules() in ldap_prepare_head()	2017-09-15 10:57:22 +02:00
Laurent Destailleur	8f5206accf	NEW The lot of a product uses the link and picto when shown into list.	2017-09-15 10:45:41 +02:00
Laurent Destailleur	f16d88fd53	FIX #7391	2017-09-14 13:17:31 +02:00
Laurent Destailleur	2f80618545	Merge pull request #7390 from atm-arnaud/FIX_task_comment_design Fix task comment design	2017-09-14 12:21:58 +02:00
Regis Houssin	a494e01f00	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-09-14 12:07:19 +02:00
Laurent Destailleur	2d7916f77d	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/core/lib/json.lib.php	2017-09-14 11:49:02 +02:00
Laurent Destailleur	fe1ce5b3ac	Fix php 7.2 compatibility	2017-09-14 11:44:47 +02:00
Laurent Destailleur	205989b64b	Fix phpunit	2017-09-14 09:16:57 +02:00
Laurent Destailleur	b3b00f63e4	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-13 22:30:43 +02:00
Laurent Destailleur	fed3165b53	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/core/lib/price.lib.php	2017-09-13 21:53:03 +02:00
Laurent Destailleur	6d40f797d2	Fix regression	2017-09-13 21:50:14 +02:00
Laurent Destailleur	eadfbfe2bd	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/core/lib/functions2.lib.php	2017-09-13 20:57:53 +02:00
Laurent Destailleur	f2cd96b9c0	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: ChangeLog htdocs/adherents/class/adherent.class.php htdocs/core/lib/price.lib.php htdocs/filefunc.inc.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/supplier_proposal/list.php	2017-09-13 20:55:22 +02:00
Laurent Destailleur	dc38ec5051	Fix regression	2017-09-13 20:48:24 +02:00
Laurent Destailleur	9b22f046f5	FIX multicompany better accuracy in rounding and with revenue stamp.	2017-09-13 19:31:32 +02:00
Laurent Destailleur	a5a08006e9	FIX multicompany better accuracy in rounding and with revenue stamp.	2017-09-13 19:27:21 +02:00
Laurent Destailleur	c44a5ede43	FIX Several problem with the last event box on project/tasks Conflicts: htdocs/core/lib/functions2.lib.php	2017-09-13 15:16:06 +02:00
Laurent Destailleur	7767ac2aa7	FIX Several problem with the last event box on project/tasks	2017-09-13 15:12:54 +02:00
arnaud	4b6553d360	FIX comment color and create colorIsLight function	2017-09-13 10:43:44 +02:00
Laurent Destailleur	d340ce6380	Fix bugs	2017-09-12 19:59:27 +02:00
Laurent Destailleur	bc15a0f8e0	Fix search criteria list	2017-09-12 14:50:12 +02:00
Laurent Destailleur	a4665e17d4	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/customer/index.php htdocs/accountancy/expensereport/index.php htdocs/compta/facture/class/facture-rec.class.php htdocs/fichinter/class/fichinter.class.php htdocs/societe/class/societe.class.php htdocs/societe/list.php	2017-09-12 13:26:25 +02:00
Laurent Destailleur	627dd15b44	Suggested link for online payment use the generic link	2017-09-12 12:18:26 +02:00
Laurent Destailleur	fcf82f1163	Enhancement into setup of member module	2017-09-12 11:17:23 +02:00
Laurent Destailleur	1f56800a50	Merge pull request #7341 from atm-arnaud/NEW_task_discussion New task discussion	2017-09-11 15:20:13 +02:00
Laurent Destailleur	029f1c411f	Merge pull request #7357 from hregis/6.0_medias Fix: some problems with medias in multicompany	2017-09-11 14:13:51 +02:00
Regis Houssin	b5de8da3a6	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/core/modules/modFacture.class.php	2017-09-11 08:07:55 +02:00
Laurent Destailleur	214bad26db	Try a fix for dol_time_plus_duree when date is 2017-09-01 00:00 and timezone > 0	2017-09-11 03:30:10 +02:00
Laurent Destailleur	3e6ac36025	Try a fix for dol_time_plus_duree when date is 2017-09-01 00:00 and timezone > 0	2017-09-11 02:09:48 +02:00
Laurent Destailleur	cf56da8102	NEW Default filter and sort order can use partial list of query parameters to set the qualified URLs.	2017-09-11 00:02:52 +02:00
Laurent Destailleur	3afc90c88f	Fix missing translation	2017-09-10 22:26:45 +02:00
Laurent Destailleur	9f1e349506	Add hidden option message ONLINE_PAYMENT_MESSAGE_FORMIFVAT	2017-09-10 22:24:26 +02:00
Laurent Destailleur	2ae135baf1	NEW Add view of status of template invoice	2017-09-10 20:47:45 +02:00
Regis Houssin	762b4eb876	Fix: some problems with medias in multicompany	2017-09-09 17:48:04 +02:00
Laurent Destailleur	026f9d8e2a	Can set a dedicated message on payment forms	2017-09-09 10:54:30 +02:00
Laurent Destailleur	c7537732d2	NEW Can set a dedicated message on payment forms	2017-09-09 10:03:09 +02:00
Laurent Destailleur	259cca0230	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/dict.php htdocs/admin/mails_templates.php	2017-09-08 13:30:54 +02:00
arnaud	fdd758abb4	FIX empty test on conf fortask comment was bad	2017-09-08 09:17:22 +02:00
arnaud	82440fd399	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_task_discussion	2017-09-07 16:24:34 +02:00
arnaud	8906c95eea	NEW comments system on task	2017-09-07 16:23:51 +02:00
Laurent Destailleur	bde293af22	Fix filter on extrafield with type sellist	2017-09-07 15:34:25 +02:00
Regis Houssin	66e548427c	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/compta/resultat/clientfourn.php htdocs/core/lib/functions.lib.php htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-09-07 10:50:35 +02:00
Laurent Destailleur	7c2c496823	Fix pagination on account list page	2017-09-06 19:53:28 +02:00
Laurent Destailleur	859d0dfe97	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2017-09-06 19:24:42 +02:00
Laurent Destailleur	33e2179b65	FIX SQL injection	2017-09-06 18:17:57 +02:00
Laurent Destailleur	d26b2a694d	FIX Security fixes (filter onload js, less verbose error message in download and viewimage, show info to encourage dolibarr_main_prod=1)	2017-09-06 11:39:30 +02:00
Laurent Destailleur	0c066b471d	Debug modulebuilder	2017-09-05 22:33:55 +02:00
Laurent Destailleur	f29a4c1fb1	Make accountancy pages responsive	2017-09-05 20:42:34 +02:00
Laurent Destailleur	f23a681dc0	Clean code	2017-09-05 10:16:08 +02:00
Laurent Destailleur	a0cdf784da	Standardize code	2017-09-05 09:43:22 +02:00
Laurent Destailleur	8de51ede18	Add warning to warn against json emulation	2017-09-04 13:22:21 +02:00
Laurent Destailleur	e6f0e76988	Add option MAIN_DISABLE_DEFAULT_FILTER_FOR_QUICK_SEARCH	2017-09-02 15:30:00 +02:00
Laurent Destailleur	a6a5602572	NEW Can set email of thirdparty as unique and/or mandatory	2017-09-02 12:36:53 +02:00
Laurent Destailleur	4b9f54e571	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/install/mysql/data/llx_accounting.sql htdocs/install/mysql/migration/5.0.0-6.0.0.sql htdocs/install/mysql/tables/llx_holiday_config.sql	2017-09-01 17:34:57 +02:00
Laurent Destailleur	1da71d48cd	Work on export site	2017-09-01 11:10:03 +02:00
Laurent Destailleur	31a74d448c	Work on accounting reports.	2017-08-31 22:38:30 +02:00
Laurent Destailleur	8248bc1c64	Uniformize code of accounting report	2017-08-31 15:44:36 +02:00
Regis Houssin	8e8f94df11	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/compta/facture/card.php htdocs/compta/facture/class/facture-rec.class.php	2017-08-30 19:33:23 +02:00
Juanjo Menent	bfc5f01e1e	NEW Add detail of all tax rates into pdf column tax sale. -Can be hidden by pdf setup page -For know if localtax is applied into line we have to read totaltax line	2017-08-30 14:36:00 +02:00
Laurent Destailleur	991a33f7b6	Make different vat rates visible	2017-08-29 20:40:51 +02:00
Laurent Destailleur	6c202c5fa1	Fix vat rate to show and not vat amount	2017-08-29 19:55:49 +02:00
Laurent Destailleur	8f34de1036	NEW Can include tag {uuu} into some numbering masks to replace with user	2017-08-29 19:44:35 +02:00
Laurent Destailleur	dabd882056	Use a slash	2017-08-29 17:24:49 +02:00
Laurent Destailleur	e862ba9daf	NEW Add detail of all tax rates into pdf column tax sale.	2017-08-29 17:22:03 +02:00
Laurent Destailleur	eebaff95cf	Fix pb with imagick	2017-08-29 13:41:44 +02:00
Laurent Destailleur	560d975063	Code comment	2017-08-29 12:59:13 +02:00
Laurent Destailleur	9312005318	NEW Move accountancy features into a dedicated menu	2017-08-29 12:43:47 +02:00
Laurent Destailleur	a60cd49fb0	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/actions_sendmails.inc.php htdocs/core/class/CMailFile.class.php htdocs/filefunc.inc.php	2017-08-28 12:53:02 +02:00
Laurent Destailleur	1b1ce4fdf5	Code comment	2017-08-27 19:40:43 +02:00
Regis Houssin	526ccc870b	Fix: add compatibility with old modules	2017-08-27 13:53:08 +02:00
Regis Houssin	1ce1899a46	Fix: add comment	2017-08-27 13:42:46 +02:00
Regis Houssin	d800d10766	Fix: use resprint instead resarray	2017-08-27 13:19:57 +02:00
Laurent Destailleur	c573df4f0e	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/user/card.php	2017-08-26 22:33:56 +02:00
Laurent Destailleur	4052e15565	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/comm/action/card.php	2017-08-26 21:58:29 +02:00
Laurent Destailleur	03eb870576	Fix sql syntax error	2017-08-26 20:16:12 +02:00
Laurent Destailleur	254d92070f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-08-26 19:58:01 +02:00
Laurent Destailleur	c64a21f47b	Fix regression in cleaning sql	2017-08-26 19:57:22 +02:00
Laurent Destailleur	b3f77ed9f7	Merge pull request #7276 from atm-john/new_develop_extrafields_facture_rec NEW extrafield on facture_rec	2017-08-26 19:26:09 +02:00
Laurent Destailleur	d9a85e6d3b	FIX Install run_sql function accept -- into sql content.	2017-08-26 19:19:23 +02:00
Laurent Destailleur	ebe84b6ac5	Fix run sql with large data	2017-08-26 16:24:55 +02:00
Laurent Destailleur	f2a437fa89	Enhance modulebuilder	2017-08-26 15:22:13 +02:00
Laurent Destailleur	98f5fbab5d	Fix error on contact/address not linked on thirdparty	2017-08-25 13:50:45 +02:00
Laurent Destailleur	d8ead2693f	Fix field position	2017-08-24 17:59:20 +02:00
John	0653a5d177	Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_develop_extrafields_facture_rec	2017-08-24 14:35:01 +02:00
Laurent Destailleur	326d3df63f	FIX select of category FIX pb with extrafield list and key '0' Conflicts: htdocs/core/class/extrafields.class.php	2017-08-24 13:28:56 +02:00
Laurent Destailleur	7da6f93d7e	FIX select of category FIX pb with extrafield list and key '0'	2017-08-24 13:23:15 +02:00
Regis Houssin	982fca541d	Fix: (Agenda) Allowed if link to third party is empty	2017-08-24 08:33:40 +02:00
Regis Houssin	1befd9c67f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-08-23 21:05:36 +02:00
Laurent Destailleur	90afbcb034	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/bank.php htdocs/core/lib/functions.lib.php	2017-08-23 17:02:53 +02:00
Laurent Destailleur	f3ef6448d7	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/admin/supplier_payment.php htdocs/core/lib/ajax.lib.php htdocs/don/admin/donation.php htdocs/product/admin/product.php	2017-08-23 16:11:51 +02:00
Laurent Destailleur	4da49dfc2d	FIX #7239	2017-08-23 15:02:38 +02:00
Laurent Destailleur	e25a428118	Fix compatibility with Internet Explorer	2017-08-23 12:32:28 +02:00
Laurent Destailleur	aae24c26a3	Some fixes with smartphones	2017-08-22 20:20:34 +02:00
Regis Houssin	2f537a1ade	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/compta/charges/index.php htdocs/compta/paiement/list.php htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-08-22 18:49:40 +02:00
Laurent Destailleur	a2b41a30fc	Fix duplicate header in website module	2017-08-22 15:44:28 +02:00
Laurent Destailleur	ec56ff59d6	Fix invalid link after renaming a website key.	2017-08-22 15:32:45 +02:00
John	b18104788e	New extrafield on facture_rec	2017-08-22 15:22:41 +02:00
Laurent Destailleur	14cd150762	NEW Introduce experimental feature to search dolistore from application	2017-08-22 14:47:01 +02:00
Regis Houssin	e86d3d7905	Fix: Travis error "Missing parameter name"	2017-08-22 09:47:33 +02:00
Laurent Destailleur	583fc485a9	Work on website module	2017-08-21 03:13:44 +02:00
Laurent Destailleur	68c31c55c5	FIX delete dir when there is symlinks	2017-08-21 01:26:22 +02:00
Laurent Destailleur	eedf5e0a22	FIX delete dir when there is symlinks	2017-08-21 01:24:34 +02:00
Laurent Destailleur	ac3a270e17	FIX Do not delete files into sym links Conflicts: htdocs/core/lib/files.lib.php	2017-08-21 00:43:52 +02:00
Laurent Destailleur	b9511fd4c6	FIX Do not delete files into sym links	2017-08-21 00:40:32 +02:00
Laurent Destailleur	5c5c4046a1	Prepare setup for email reminder	2017-08-20 16:07:22 +02:00
Laurent Destailleur	260beed512	NEW Generated files are now indexed in database	2017-08-18 23:19:55 +02:00
Laurent Destailleur	097b660c41	Mutualize code	2017-08-18 16:25:00 +02:00
Laurent Destailleur	4d46b2ae58	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/modules/propale/doc/pdf_azur.modules.php htdocs/filefunc.inc.php	2017-08-17 22:21:30 +02:00
Laurent Destailleur	744f0ab198	Merge remote-tracking branch 'origin/5.0' into 6.0	2017-08-17 22:03:26 +02:00
Juanjo Menent	3330f040ba	FIX: Bad tax calculation with expense report	2017-08-16 11:19:28 +02:00
Laurent Destailleur	d37d1a033a	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/compta/bank/bankentries.php htdocs/core/lib/admin.lib.php htdocs/install/mysql/migration/repair.sql	2017-08-11 19:56:17 +02:00
Laurent Destailleur	975fd0a6d3	Fix font size	2017-08-07 15:43:42 +02:00
Laurent Destailleur	66ffc9ca47	Debug modulebuilder	2017-08-05 11:44:27 +02:00
Laurent Destailleur	180b7d3c11	Debug modulebuilder	2017-08-05 11:35:42 +02:00
Laurent Destailleur	1c157c7c3d	Fix pb with mix collation. Add a way to fix this in repair.	2017-08-04 21:23:40 +02:00
Laurent Destailleur	402e6bf650	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/bank/various_payment/card.php htdocs/compta/bank/various_payment/index.php htdocs/compta/paiement/list.php htdocs/core/modules/modCron.class.php	2017-08-04 15:39:00 +02:00
Laurent Destailleur	7c840b8348	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-08-04 15:32:30 +02:00
Laurent Destailleur	a7dda865c9	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-08-04 15:29:54 +02:00
Laurent Destailleur	a3beceade2	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2017-08-04 15:28:55 +02:00
Laurent Destailleur	fa752348c8	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/bank/various_payment/index.php htdocs/contact/list.php htdocs/langs/en_US/errors.lang	2017-08-02 17:56:09 +02:00
Laurent Destailleur	2a92ee6008	Fix look and feel v6	2017-08-02 14:10:43 +02:00
Laurent Destailleur	5b1f5b0f20	Fix translation done twice into field title of array	2017-08-02 13:31:53 +02:00
Ferran Marcet	09c271b7c5	Fix: Correction in the calculation of the next week	2017-08-02 10:31:16 +02:00
Laurent Destailleur	71d49f1c6f	Fix pb in ecm	2017-08-01 18:44:34 +02:00
Laurent Destailleur	f9dc628f0b	Add tool to fix missing thumbs	2017-08-01 15:53:22 +02:00
Laurent Destailleur	b6a7ce6822	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-08-01 10:22:37 +02:00
Laurent Destailleur	7d6d4adcdb	Fix combo for multicompany not visible where there is other hooks by other modules	2017-07-31 18:16:41 +02:00
Regis Houssin	0dc0fe81fc	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-31 07:40:01 +02:00
Laurent Destailleur	7a69df08c5	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/cron/class/cronjob.class.php	2017-07-31 02:39:42 +02:00
Laurent Destailleur	69357dd91c	Merge pull request #7113 from atm-ph/new_develop_expense_report NEW Add expense report rules and ik	2017-07-31 02:33:49 +02:00
Laurent Destailleur	80f096a9d8	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-07-31 02:09:15 +02:00
Laurent Destailleur	bb8d458468	Fix menu editor	2017-07-30 19:41:45 +02:00
Laurent Destailleur	5e17c2efb9	Fix into filters of time consumed	2017-07-28 23:32:55 +02:00
Laurent Destailleur	25c5ed8f72	Fix for compatibility	2017-07-28 18:09:38 +02:00
Laurent Destailleur	b0e62f9d24	Enhance image replacement	2017-07-28 17:17:40 +02:00
Laurent Destailleur	60493d0a47	Several fixes (permission, missing method or class) in REST APIs	2017-07-28 11:03:30 +02:00
atm-ph	1f3f9e40b1	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report	2017-07-27 16:01:53 +02:00
Laurent Destailleur	ec27eb5b1e	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/contact/list.php htdocs/societe/list.php	2017-07-27 02:09:40 +02:00
Laurent Destailleur	7e0a165131	Fix some pb in search using phone	2017-07-26 20:33:25 +02:00
Regis Houssin	acd5780e32	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-26 08:58:56 +02:00
Laurent Destailleur	bd85d87e3e	Fix pb with .svg	2017-07-25 23:02:48 +02:00
Laurent Destailleur	ab72fbffc6	Fix pb with .svg files	2017-07-25 23:02:14 +02:00
Laurent Destailleur	e62a8d7bfa	Debug modulebuilder	2017-07-25 01:22:06 +02:00
Laurent Destailleur	73c7aa378e	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/contrat/list.php htdocs/fichinter/list.php	2017-07-23 20:30:03 +02:00
Laurent Destailleur	9043cf759b	Fix clone function	2017-07-23 20:27:30 +02:00
Laurent Destailleur	25b107defb	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/contrat/list.php htdocs/fichinter/list.php	2017-07-23 19:09:00 +02:00
Regis Houssin	2efb86b5d8	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-23 10:36:14 +02:00
Laurent Destailleur	854a6ca3d5	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-07-22 16:40:45 +02:00
Laurent Destailleur	44023606c6	Fix pb in dolGetFirstLineOfText. Add PHPunit	2017-07-22 12:47:35 +02:00
Laurent Destailleur	f64a9968a9	Debug modulebuilder	2017-07-22 01:00:43 +02:00
Regis Houssin	26df1389f4	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/install/mysql/migration/5.0.0-6.0.0.sql	2017-07-21 20:42:21 +02:00
Laurent Destailleur	f97ecd0a45	The css files is also parsed with function to clean images	2017-07-21 20:16:53 +02:00
Laurent Destailleur	058e88c6f3	Fix title in html header	2017-07-21 12:26:11 +02:00
Laurent Destailleur	23d9353a3d	Fix title in html header	2017-07-21 12:21:48 +02:00
Laurent Destailleur	302ee97d31	Debug module website	2017-07-21 02:51:56 +02:00
Laurent Destailleur	28254655e9	Debug module website	2017-07-21 02:30:02 +02:00
Laurent Destailleur	3b8f60f90e	Fix pb of recursive include in website module	2017-07-20 16:49:20 +02:00
Regis Houssin	c8bd11660d	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-18 15:23:43 +02:00
Laurent Destailleur	4582b54e91	Fix use command standard @... to mark a change in official code	2017-07-17 20:09:19 +02:00
Laurent Destailleur	d832bfc056	Some fix into dol_compress_dir function.	2017-07-17 11:05:38 +02:00
Laurent Destailleur	330f3af74d	Fix pb in recursive dol_dir_list return.	2017-07-17 10:26:36 +02:00
Laurent Destailleur	4d9ae5bb44	Work on modulebuilder	2017-07-16 14:57:30 +02:00
Laurent Destailleur	7b2a71802b	Do some TODO on modulebuilder module.	2017-07-16 13:00:35 +02:00
Regis Houssin	200f232164	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-16 07:51:20 +02:00
Laurent Destailleur	ab6646d16b	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/compta/bank/bankentries.php htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2017-07-15 03:54:50 +02:00
Laurent Destailleur	312b153005	Fix phpcs	2017-07-13 23:46:01 +02:00
Laurent Destailleur	7eb4562432	Code comment	2017-07-13 15:22:07 +02:00
Laurent Destailleur	85d9a2f790	Merge pull request #7145 from hregis/6.0_bug2 Fix: missing group name with dol_banner_tab	2017-07-13 14:36:17 +02:00
Laurent Destailleur	23fbef3dae	Fix the delete dir functions does not return real nb of deleted files.	2017-07-13 00:26:05 +02:00
Regis Houssin	d63e15f0c6	Fix: missing group name with dol_banner_tab	2017-07-12 15:52:58 +02:00
Laurent Destailleur	33ceb22b8b	Fix error management into modulebuilder	2017-07-12 13:25:18 +02:00
Laurent Destailleur	40b3ae2a15	Debug modulebuilder	2017-07-12 11:52:07 +02:00
Laurent Destailleur	11cc1f04c4	Work on modulebuilder	2017-07-12 01:55:07 +02:00
Regis Houssin	cb6b81d897	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-11 19:10:22 +02:00
Laurent Dinclaux	64a5be3e00	Fixes travis error: Arguments with default values must be at the end of the argument list	2017-07-10 14:14:21 +11:00
Laurent Dinclaux	244574f8e6	Fixes functions comments	2017-07-10 13:19:59 +11:00
Laurent Dinclaux	253f7e252d	Fixes local taxes repports by rate	2017-07-10 13:15:14 +11:00
Laurent Destailleur	aa66676b7d	Quick hack to solve missing alias name on doc.	2017-07-09 15:15:23 +02:00
Laurent Destailleur	f40afcf023	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/accountancy/class/bookkeeping.class.php htdocs/compta/facture/list.php htdocs/compta/paiement/class/cpaiement.class.php htdocs/compta/sociales/card.php htdocs/core/lib/functions.lib.php htdocs/expensereport/card.php htdocs/expensereport/class/expensereport.class.php htdocs/product/stats/facture.php	2017-07-08 18:32:34 +02:00
Laurent Destailleur	ba3b6b6aa5	Better support of vat with code in expense report	2017-07-08 18:09:45 +02:00
Laurent Destailleur	2ea7f38d38	Fix migration of version that is not a final version	2017-07-08 12:48:17 +02:00
Laurent Destailleur	eff4282cc2	Clean files	2017-07-07 22:19:01 +02:00
Laurent Destailleur	252d8da8fc	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/categories/class/categorie.class.php htdocs/core/class/commondocgenerator.class.php htdocs/core/lib/functions.lib.php htdocs/core/modules/DolibarrModules.class.php htdocs/filefunc.inc.php htdocs/societe/class/societe.class.php htdocs/supplier_proposal/class/supplier_proposal.class.php	2017-07-07 15:11:53 +02:00
phf	b8865c425f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report	2017-07-05 10:48:01 +02:00
phf	1beec51928	New expense report rules and ik (index kilometers) - MAIN_USE_EXPENSE_IK - MAIN_USE_EXPENSE_RULE	2017-07-05 10:44:52 +02:00
Laurent Destailleur	9e26e6b0a3	Fix bad value for ref of old contracts	2017-07-03 11:42:17 +02:00
Regis Houssin	3f882cb33a	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-03 09:24:05 +02:00
Laurent Destailleur	c56ea50251	Currency symbol for peru is before value	2017-07-02 14:30:24 +02:00
Laurent Destailleur	658fe93d8c	Fix menu editor (data not aligned)	2017-07-01 12:42:49 +02:00
Laurent Destailleur	b308cfef1d	Fix dol_trunc	2017-06-30 18:30:01 +02:00
Regis Houssin	fa247ffd98	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-29 08:51:42 +02:00
Laurent Destailleur	05318bb4ec	More complete dol_string_nospecial	2017-06-28 19:02:09 +02:00
Laurent Destailleur	1a860c42ee	Look and feel v6	2017-06-27 16:42:11 +02:00
Laurent Destailleur	1fafa4017d	Fix test on currency name	2017-06-27 12:33:29 +02:00
Laurent Destailleur	3b7667292b	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-27 11:59:40 +02:00
Laurent Destailleur	08af9bf365	List before	2017-06-27 10:37:00 +02:00
Laurent Destailleur	2be848025f	Fix parameter withcode of currency_name function. Add PHPUnit tests	2017-06-26 10:09:22 +02:00
Laurent Destailleur	4a21457b8a	Fix position of page nb	2017-06-26 09:28:02 +02:00
Laurent Destailleur	63dcdc3a03	Fix API was loading definition of all APIs at each call.	2017-06-25 17:09:08 +02:00
Laurent Destailleur	693b2fe3b4	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture.php htdocs/core/ajax/ajaxdirpreview.php htdocs/core/class/conf.class.php htdocs/core/class/html.formfile.class.php htdocs/core/lib/functions.lib.php htdocs/core/tpl/objectline_create.tpl.php	2017-06-23 11:20:29 +02:00
Laurent Destailleur	45004493e0	Fix multicurrency and vat_src_code not propaged on invoice from shipment.	2017-06-23 11:12:17 +02:00
Laurent Destailleur	014cb4b004	Fix navigation on security event list	2017-06-21 12:03:49 +02:00
Laurent Destailleur	4102403482	Look and feel v6	2017-06-21 11:37:34 +02:00
Regis Houssin	2fffd2fa6f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-20 23:26:21 +02:00
Laurent Destailleur	ec9bbe2b52	Help/Need debug of some online instances with the log view	2017-06-20 16:54:37 +02:00
Laurent Destailleur	08a86fa03d	Start #6981	2017-06-20 12:17:13 +02:00
Regis Houssin	909826e24f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-20 06:25:35 +02:00
Laurent Destailleur	eef5df583e	Fix php 7.2	2017-06-20 00:50:30 +02:00
Laurent Destailleur	287e727e71	Fix detection of relative URL	2017-06-19 13:47:25 +02:00
Regis Houssin	544d051fe3	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-19 07:06:57 +02:00
Laurent Destailleur	996ec4926b	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/propal/list.php htdocs/core/lib/files.lib.php htdocs/don/card.php	2017-06-18 22:16:34 +02:00
Laurent Destailleur	0ef507ae7f	Fix rename of file to remove .noexe extension.	2017-06-18 21:52:51 +02:00
Laurent Destailleur	86a6a83647	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog htdocs/admin/tools/index.php htdocs/bookmarks/bookmarks.lib.php htdocs/compta/facture.php htdocs/core/tpl/passwordforgotten.tpl.php htdocs/fourn/ajax/getSupplierPrices.php htdocs/main.inc.php htdocs/product/stats/card.php htdocs/public/paypal/paymentko.php	2017-06-18 21:13:48 +02:00
Laurent Destailleur	abe736c6a6	Escape hml tags	2017-06-18 19:42:59 +02:00
Regis Houssin	dcc152d4a4	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-18 06:52:20 +02:00
Laurent Destailleur	b73228899a	Merge pull request #7024 from defrance/patch-14 Introduce weight conversion lb & oz	2017-06-17 17:52:20 +02:00
BENKE Charlene	12cab2dfe0	Once to Ounce	2017-06-17 16:30:03 +02:00
Regis Houssin	a0299042e4	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-17 12:05:33 +02:00
Laurent Destailleur	7c41c9a3e4	Fix activation of dependency for a dedicated country. BlockedLog depends now on CashDesk only.	2017-06-17 11:43:00 +02:00
Laurent Destailleur	bebe7baa80	Fix images into medias not reabable into send emails	2017-06-17 10:44:08 +02:00
BENKE Charlene	17247c64f0	add WeightUnitonce	2017-06-17 10:26:01 +02:00
Laurent Destailleur	1d91ce90d3	FIX image from medias directory into PDF free text	2017-06-17 00:16:22 +02:00
Laurent Destailleur	b228fe6a2a	Fix auto focus on module page	2017-06-16 16:06:20 +02:00
Regis Houssin	c656856ec2	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug_restapi	2017-06-16 10:52:43 +02:00
Laurent Destailleur	ac708a8ee9	Debug accounting module with new structure v6 Make accounting module compatible with the new vat code to identify 2 vat code with same rate.	2017-06-15 23:58:56 +02:00
Regis Houssin	9410466d72	Fix: better check and security	2017-06-15 21:51:31 +02:00
Regis Houssin	cd095e99c9	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-14 12:16:10 +02:00
Laurent Destailleur	b889db997a	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture.php htdocs/core/datepicker.php htdocs/core/get_menudiv.php htdocs/core/menus/standard/auguria.lib.php htdocs/core/menus/standard/eldy.lib.php htdocs/core/search_page.php htdocs/main.inc.php htdocs/master.inc.php htdocs/product/list.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php htdocs/user/card.php htdocs/user/index.php	2017-06-14 10:48:34 +02:00
Laurent Destailleur	7939daa225	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/core/lib/functions.lib.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php htdocs/user/index.php	2017-06-14 10:18:24 +02:00
Laurent Destailleur	70c7bcc85f	Complete css to get value unique	2017-06-13 15:57:30 +02:00
Laurent Destailleur	c8856182a6	Fix look and feel v6	2017-06-13 15:34:18 +02:00
Regis Houssin	773abff80e	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-12 21:24:10 +02:00
Laurent Destailleur	ba3a74576c	Merge 5.0	2017-06-12 18:22:51 +02:00
Laurent Destailleur	2916444f6c	Fix check on module product for external user	2017-06-12 15:30:00 +02:00
Laurent Destailleur	0207f86aa5	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-06-12 12:03:26 +02:00
Laurent Destailleur	6d130351a0	Fix css	2017-06-12 11:32:10 +02:00
atm-ph	946e72f269	Fix 6982 missing parameter to get more informations about files	2017-06-11 12:26:51 +02:00
Regis Houssin	6cac4b15d3	Fix: Parameter must be an array or an object that implements Countable	2017-06-11 06:54:40 +02:00
Regis Houssin	3445c9d329	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/core/lib/functions.lib.php	2017-06-11 06:27:49 +02:00
Laurent Destailleur	36b18f0300	Save MAIN_VERSION_FIRST_INSTALL that is not erased.	2017-06-10 22:11:12 +02:00
Laurent Destailleur	9c482b9f2a	FIX CVE-2017-7886	2017-06-10 21:37:27 +02:00
Laurent Destailleur	d037515e37	FIX SQL injection on user/index.php parameter search_statut. Conflicts: htdocs/user/index.php	2017-06-10 20:10:57 +02:00
Laurent Destailleur	b62da4bb7a	Fix a parameter is required to know what we share.	2017-06-10 20:04:24 +02:00
Laurent Destailleur	890ac81e4d	Fix menu entried must be greyed, sub menus not visible fi not allowed on parent.	2017-06-10 19:16:42 +02:00
Laurent Destailleur	87c8659e72	Fix responsive	2017-06-10 00:45:18 +02:00
phf	c1f3a168cd	Fix wrong attribute name for loop	2017-06-09 16:57:20 +02:00
Regis Houssin	0e8f36dc92	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-09 14:00:48 +02:00
Laurent Destailleur	1af74b4c42	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: dev/skeletons/skeleton_list.php htdocs/admin/perms.php htdocs/core/class/commonobject.class.php htdocs/core/class/hookmanager.class.php htdocs/core/lib/files.lib.php htdocs/product/class/product.class.php htdocs/product/class/service.class.php htdocs/product/index.php htdocs/product/list.php htdocs/public/members/new.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2017-06-09 12:50:56 +02:00
Laurent Destailleur	929946ad47	Fix several problem with hook printFieldListWhere	2017-06-09 10:12:01 +02:00
Regis Houssin	fa58f0f3e8	Fix: add entity filter	2017-06-09 09:25:15 +02:00
Regis Houssin	c95b5a4567	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-09 08:04:08 +02:00
Laurent Destailleur	a63050bf46	FIX Warnings Conflicts: htdocs/core/lib/files.lib.php htdocs/core/lib/images.lib.php	2017-06-09 00:38:30 +02:00
Laurent Destailleur	75624376a5	FIX Warnings	2017-06-09 00:27:19 +02:00
Regis Houssin	ade915af5f	New: add dictionnary sharing (multicompany)	2017-06-08 16:36:42 +02:00
Regis Houssin	4b98a1aefd	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-08 15:05:45 +02:00
Laurent Destailleur	543630e487	Fix missing count of nb of columns into lists	2017-06-08 14:14:06 +02:00
Regis Houssin	1baa620688	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-08 10:33:26 +02:00
Laurent Destailleur	7587a3d592	Merge branch 'develop' into develop_transverse	2017-06-08 10:25:04 +02:00
Regis Houssin	44dba391c1	New: add dictionnary sharing (multicompany)	2017-06-08 10:24:16 +02:00
Regis Houssin	b66da3d148	New: big refactorization of multicompany transverse mode	2017-06-06 10:23:33 +02:00
Regis Houssin	2df33d1df3	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2017-06-03 11:45:15 +02:00
Laurent Destailleur	7f18dfee0d	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: dev/skeletons/build_class_from_table.php dev/skeletons/skeleton_card.php htdocs/compta/facture/class/facture.class.php htdocs/core/lib/functions.lib.php htdocs/filefunc.inc.php htdocs/projet/card.php	2017-06-03 01:55:05 +02:00
Laurent Destailleur	9e629bdb02	Work on modulebuilder	2017-06-02 20:01:25 +02:00
Laurent Destailleur	c59d216cf5	NEW Can read time spent of others (hierarchy only or all if granted)	2017-06-02 13:24:45 +02:00
Laurent Destailleur	5c58ed8ca7	Add a better error message when payment link is not valid.	2017-06-02 09:13:04 +02:00
Laurent Destailleur	976c8e0752	Fix security to test access on a task	2017-06-01 19:53:54 +02:00
Laurent Destailleur	76e1438fe6	FIX REST api to get project when user has permission to read all.	2017-06-01 17:29:47 +02:00
Laurent Destailleur	f4cdb6b254	Fix month on 2 chars. Some setup return on 1 char only. More phpunit assert.	2017-06-01 15:33:23 +02:00
Laurent Destailleur	7ad92c3a4d	Fix new generic substitution system	2017-06-01 13:32:20 +02:00
Laurent Destailleur	77df19009d	Removed duplicated code	2017-06-01 12:11:45 +02:00
Laurent Destailleur	417f71a8be	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-01 02:01:34 +02:00
Laurent Destailleur	c70beaa56b	Complete work for mutualizing generic substitution system.	2017-06-01 01:57:22 +02:00
Laurent Destailleur	40334dbe14	Merge pull request #6905 from atm-quentin/NEW_project_mask_with_user_extrafield NEW_extrafield_in_project_mask	2017-05-31 19:46:22 +02:00
Laurent Destailleur	a49174313f	Replace {extra_ with {user_extra_	2017-05-31 19:45:54 +02:00
Laurent Destailleur	6c7179d281	Test of commit with autoremove trail space	2017-05-31 19:20:33 +02:00
Laurent Destailleur	d5f83d6bbe	NEW #6915 Simplest change.	2017-05-31 19:15:39 +02:00
Laurent Destailleur	145cb628cd	FIX dol_string_nohtmltag make 2 passes to clean html into html attributes.	2017-05-31 11:11:25 +02:00
Laurent Destailleur	c39ca4cff8	NEW Introduce function dol_compress_dir	2017-05-31 00:20:35 +02:00
Regis Houssin	5c5663c5ae	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +02:00
Laurent Destailleur	fa6bc03765	Fix typo	2017-05-30 01:34:20 +02:00
Laurent Destailleur	d56cd44ebc	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-05-29 19:11:41 +02:00
Quentin Vial-Gouteyron	f563746310	NEW_extrafield_in_project_mask	2017-05-29 15:38:40 +02:00
Laurent Destailleur	c71488e58b	Removed deprecated code	2017-05-29 15:09:13 +02:00
Laurent Destailleur	0c5bf21f3a	Merge pull request #6900 from aspangaro/6.0-d1 Review expense report - Look and feel v6	2017-05-29 10:56:57 +02:00
Laurent Destailleur	452579150d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.form.class.php	2017-05-29 10:43:26 +02:00
Laurent Destailleur	e667d72547	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: dev/skeletons/build_class_from_table.php htdocs/compta/facture.php htdocs/core/class/html.form.class.php	2017-05-29 10:41:51 +02:00
Laurent Destailleur	16456cf19f	Merge pull request #6891 from hregis/develop_api NEW add REST api "memberstypes"	2017-05-29 10:29:04 +02:00
Laurent Destailleur	425192ef84	Merge branch 'develop' into 6.0-multijournal	2017-05-29 10:23:46 +02:00
Laurent Destailleur	70636cc59f	FIX SQL injection on user/index.php parameter search_statut.	2017-05-29 09:59:21 +02:00

... 18 19 20 21 22 ...

5264 Commits