60032 Commits

Author	SHA1	Message	Date
Maxime Kohlhaas	7585461486	Fix #9070	2018-11-30 22:16:17 +01:00
Maxime Kohlhaas	5dcb3d2a1f	Fix extrafields in import tool	2018-11-30 19:23:05 +01:00
Laurent Destailleur	28902e18ee	Fix for screen with antiblue system	2018-11-28 16:32:53 +01:00
ptibogxiv	21f4d474b4	Fix sql don.class.php	2018-11-28 16:11:10 +01:00
Laurent Destailleur	0373cad2cd	FIX Method setValid not found	2018-11-28 16:11:00 +01:00
Marc de Lima Lucio	c13cc5d697	FIX: form actions: select_type_actions could be too small + bad init	2018-11-28 15:46:27 +01:00
Juanjo Menent	2f61d29b06	FIX: #10080 Supplier translations are in english	2018-11-28 10:40:45 +01:00
Ferran Marcet	9d6c95e8a9	Merge remote-tracking branch 'upstream/7.0' into 7.0	2018-11-27 11:39:07 +01:00
Ferran Marcet	d8537a3c76	FIX Lines are not inserted correctly if VAT have code	2018-11-27 11:36:31 +01:00
Laurent Destailleur	b5c136bc32	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-26 23:02:23 +01:00
Laurent Destailleur	653b99cb33	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-26 23:02:07 +01:00
Laurent Destailleur	ecb6ea9151	Merge pull request #10058 from frederic34/patch-2 ... correct link and avoid warning in resource list	2018-11-24 11:17:56 +01:00
fappels	322ce410d7	Add missing paid field in fetch sql	2018-11-23 09:42:43 +01:00
Laurent Destailleur	1d4c756783	FIX Remote ip detection was wrong with proxy (example: cloudflare)	2018-11-22 11:44:37 +01:00
Laurent Destailleur	084516b885	Fix ip detection of geoip	2018-11-21 15:11:57 +01:00
Frédéric FRANCE	e8cac0df35	correct link and avoid warning in resource list	2018-11-21 14:06:06 +01:00
Laurent Destailleur	25ee999d27	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-19 20:05:32 +01:00
Laurent Destailleur	20dbbaf5cc	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-19 20:05:04 +01:00
Laurent Destailleur	fb6aa01207	FIX #10030 better german chart	2018-11-19 20:04:31 +01:00
Laurent Destailleur	8191df4857	Merge pull request #9962 from atm-john/fix_extrafield_view ... FIX hidden extrafield	2018-11-19 18:37:18 +01:00
Laurent Destailleur	8535844737	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-11-19 18:27:00 +01:00
Laurent Destailleur	1931fd33eb	Merge pull request #10041 from atm-ph/fix_8.0_optional_param ... Fix new params has been added not optional	2018-11-19 18:26:21 +01:00
Laurent Destailleur	bd8856b988	Merge pull request #10033 from frederic34/patch-9 ... Update CMailFile.class.php	2018-11-19 18:20:20 +01:00
Laurent Destailleur	7a3f088fcb	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-11-19 18:19:11 +01:00
Laurent Destailleur	77bc1c4313	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/core/actions_massactions.inc.php	2018-11-19 18:18:43 +01:00
Laurent Destailleur	4bedeabc5b	FIX #10036	2018-11-19 18:02:29 +01:00
gauthier	ecdfa5219b	FIX : We want to be able to send PDF of paid invoices	2018-11-19 17:31:45 +01:00
Laurent Destailleur	2d09008610	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-19 15:55:59 +01:00
Laurent Destailleur	f85ab8d0a6	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/comm/propal/card.php	2018-11-19 15:55:41 +01:00
atm-ph	129034ba76	Fix new params has been added not optional	2018-11-19 15:46:30 +01:00
florian HENRY	dc2f1e9812	fix list agenda extrafield visibility	2018-11-19 11:25:48 +01:00
Frédéric FRANCE	30b1db34cd	Update CMailFile.class.php	2018-11-17 11:33:01 +01:00
Laurent Destailleur	f2bbb54b8f	Merge pull request #10011 from atm-gauthier/7.0_fix_search_categ_product_on_supplierorderlist ... FIX : filter on product category doesn't work	2018-11-15 16:44:40 +01:00
Laurent Destailleur	f3228dc4f8	Merge pull request #10010 from atm-john/Fix_cat_photo_upload ... Fix event message on upload category picture fail	2018-11-15 16:43:59 +01:00
Laurent Destailleur	3ca45e0e40	Fix double dot in sql filename	2018-11-15 10:59:55 +01:00
gauthier	85dd0ec2dd	FIX : filter on product category doesn't work	2018-11-13 15:24:53 +01:00
John BOTELLA	c6cf748ba7	Fix envent message on upload category picture	2018-11-13 14:44:10 +01:00
John BOTELLA	500bb7bc96	best conditions testing	2018-11-13 10:20:34 +01:00
gauthier	f404cae546	FIX : Same on customer card	2018-11-12 16:04:42 +01:00
gauthier	66ea8bbe87	FIX : fourn payment modes musn't be available on customer docs	2018-11-12 15:58:41 +01:00
tarrsalah	5eb897e049	FIX sql query performance on list_qualified_avoir_supplier_invoices.	2018-11-12 12:11:40 +01:00
Laurent Destailleur	5ec602cafa	Merge pull request #9983 from hregis/8.0_bug ... FIX missing field "visible"	2018-11-10 12:19:35 +01:00
Regis Houssin	ee06f36f4c	FIX missing field "visible"	2018-11-09 11:36:20 +01:00
Regis Houssin	5d1d77a966	FIX missing action "edit" for the hook	2018-11-09 10:32:08 +01:00
Laurent Destailleur	8a89da25c6	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/margin/tabs/thirdpartyMargins.php	2018-11-08 20:18:13 +01:00
Laurent Destailleur	400b48bd9b	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-11-08 20:14:59 +01:00
Laurent Destailleur	9012f6ecc5	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-11-08 20:14:40 +01:00
Laurent Destailleur	1b8649be6f	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-08 20:14:02 +01:00
Laurent Destailleur	d6bd325f70	Merge pull request #9980 from atm-john/fix_supplier_order_list_socid ... FIX supplier order list keep socid	2018-11-08 20:13:52 +01:00
Laurent Destailleur	9a31a61c9d	FIX #9971	2018-11-08 20:05:01 +01:00
Laurent Destailleur	f919e6ddb0	Merge pull request #9971 from atm-gauthier/FIX_langs_projet ... FIX : OppStatusShort doesn't exists	2018-11-08 20:00:49 +01:00
Laurent Destailleur	76ac3bd457	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-08 19:57:42 +01:00
Laurent Destailleur	be788e6167	FIX responsive	2018-11-08 19:57:31 +01:00
Laurent Destailleur	e84e7f02c8	Merge pull request #9963 from atm-john/fix_marge_sign ... FIX marge sign	2018-11-08 19:37:52 +01:00
Laurent Destailleur	01baddb096	Merge pull request #9959 from hregis/8.0_bug ... FIX export only prices of the current entity !	2018-11-08 19:26:09 +01:00
Laurent Destailleur	d1aabf9566	Merge pull request #9976 from atm-john/fix_warning ... FIX Warning: count()	2018-11-08 19:25:32 +01:00
Laurent Destailleur	78778e4c58	Merge pull request #9948 from frederic34/patch-9 ... FIX mode is only customer in stats fichinter	2018-11-08 19:16:00 +01:00
Laurent Destailleur	588de2cc86	Fix filter on entity on project	2018-11-08 18:45:02 +01:00
Laurent Destailleur	27dcf18637	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-08 18:43:31 +01:00
Laurent Destailleur	e92a63ba73	FIX If we change customer/supplier rule we can't edit old thirdparty.	2018-11-08 17:15:35 +01:00
John BOTELLA	98548337ae	FIX supplier order list keep socid	2018-11-08 15:38:25 +01:00
Frédéric FRANCE	8bb1545ed0	Update index.php	2018-11-08 12:16:05 +01:00
Frédéric FRANCE	670eed1e68	Update index.php	2018-11-08 12:13:07 +01:00
John BOTELLA	7c4dad2728	FIX Warning: count()	2018-11-08 12:12:45 +01:00
Laurent Destailleur	c55f83b0b7	Fix multicompany filter missing	2018-11-08 11:25:29 +01:00
gauthier	70826c3191	FIX : same on lines	2018-11-07 16:32:23 +01:00
gauthier	05a679a10c	FIX : OppStatusShort doesn't exists	2018-11-07 16:26:25 +01:00
John BOTELLA	abb6b41f91	Fix screen size fall	2018-11-07 11:25:13 +01:00
John BOTELLA	9d780a1722	Fix sign	2018-11-07 10:11:29 +01:00
John BOTELLA	4f7be36249	fix extrafield hidden	2018-11-07 09:14:29 +01:00
Regis Houssin	d32fd9fda5	FIX export only prices of the current entity !	2018-11-06 18:08:29 +01:00
Laurent Destailleur	7e33af6677	Fix max size	2018-11-06 17:40:59 +01:00
Laurent Destailleur	52aa860008	Code comment	2018-11-06 09:39:22 +01:00
Laurent Destailleur	f0305a7beb	Prepare 8.0.4	2018-11-05 13:50:12 +01:00
Laurent Destailleur	4c591daab1	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/core/class/html.formprojet.class.php	2018-11-05 10:39:22 +01:00
Laurent Destailleur	56a70ab4e5	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-11-05 10:23:15 +01:00
Laurent Destailleur	693cf72fca	Merge pull request #9920 from ATM-Marc/FIX_6.0_task_activity_access ... FIX: task time screen: bad task assignments	2018-11-05 10:21:28 +01:00
Laurent Destailleur	2900947019	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-05 09:56:57 +01:00
Laurent Destailleur	e1e0001fda	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-11-05 09:56:00 +01:00
Laurent Destailleur	8b373fb7a3	Merge pull request #9935 from atm-maxime/fix_socdelete_unlink_parent ... Fix parent link was not removed on societe deletion #9106	2018-11-05 09:35:41 +01:00
Laurent Destailleur	98a3af620b	FIX #9934	2018-11-05 09:26:23 +01:00
Laurent Destailleur	d130e79384	Merge pull request #9936 from ptibogxiv/patch-84 ... Fix payout	2018-11-05 09:17:18 +01:00
Frédéric FRANCE	488ac8c8f0	Update index.php	2018-11-03 23:44:25 +01:00
Frédéric FRANCE	c01113e28b	typo	2018-11-03 22:49:30 +01:00
Frédéric FRANCE	d6b909a280	Update index.php	2018-11-03 18:26:11 +01:00
Frédéric FRANCE	8ab53012b7	mode is only customer in stats fichinter	2018-11-03 18:20:36 +01:00
ptibogxiv	263e8ed4af	Fix payout	2018-11-01 20:45:08 +01:00
Maxime Kohlhaas	29c0448a2e	Fix parent link was not removed on societe deletion #9106	2018-11-01 15:41:58 +01:00
Maxime Kohlhaas	d1133916e0	Fix tracking field in dictionnary should not be mandatory	2018-11-01 15:33:14 +01:00
Laurent Destailleur	1140735554	Fix css	2018-11-01 15:20:05 +01:00
Laurent Destailleur	4b402aa6d1	Fix regression on name of array	2018-10-31 15:41:00 +01:00
Laurent Destailleur	be8e48b265	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php	2018-10-31 15:38:29 +01:00
Laurent Destailleur	07719eaf1e	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-10-31 15:31:44 +01:00
Laurent Destailleur	ca726e6c94	FIX Error generating ODT when option to use contact on doc on	2018-10-31 15:31:22 +01:00
Laurent Destailleur	693570c48b	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/core/modules/modSociete.class.php	2018-10-31 11:50:29 +01:00
Laurent Destailleur	c9ef298839	Fix setup template emails	2018-10-31 11:38:04 +01:00
Laurent Destailleur	ea5b0f53d0	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-10-30 22:32:54 +01:00
Laurent Destailleur	866729cd21	FIX bad link in notification	2018-10-30 22:32:42 +01:00
Frédéric FRANCE	46fd3bcaf8	fix display holiday month report if none	2018-10-30 21:15:52 +01:00
Laurent Destailleur	064417dcf1	Merge pull request #9889 from atm-maxime/fix_invoice_from_contract2 ... Fix invoice creation from contract was invoicing closed services #9087	2018-10-30 21:13:38 +01:00
Marc de Lima Lucio	2fbc305683	FIX: task time screen: last fix was overkill	2018-10-30 16:00:56 +01:00
Laurent Destailleur	b9078c6d58	Fix phpcs	2018-10-30 15:30:04 +01:00
Laurent Destailleur	ecdecfcbce	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-10-30 15:28:23 +01:00
Laurent Destailleur	2b526f7469	Fix phpcs	2018-10-30 15:28:11 +01:00
Laurent Destailleur	68804cf8a5	Merge pull request #9890 from atm-maxime/fix_import_societe_alias ... FIX missing name alias field in societe import/export #9091	2018-10-30 15:00:34 +01:00
Laurent Destailleur	4dca94480e	Merge pull request #9892 from atm-maxime/fix_supp_inv_clone ... Fix invoice supplier clone was not getting all lines parameters #9800	2018-10-30 14:59:48 +01:00
Laurent Destailleur	cb2a5baa45	Merge pull request #9919 from atm-john/Fix_clone_fourn_invoice ... Fix clone fourn order and invoice lines special code	2018-10-30 14:55:50 +01:00
Laurent Destailleur	2c8b7a4a3d	Merge pull request #9905 from atm-maxime/fix_currency_change ... Fix changing currency in a doc was recalculating amounts in company currency #9801	2018-10-30 14:48:46 +01:00
Laurent Destailleur	afe61579e8	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-10-30 14:29:26 +01:00
Laurent Destailleur	b0ef8680ff	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-10-30 14:28:25 +01:00
Laurent Destailleur	a231932972	Merge pull request #9904 from atm-maxime/fix_replenish_qtymin ... FIX replenish wasn't caring about supplier price min quantity #9561	2018-10-30 14:25:55 +01:00
Laurent Destailleur	8ce035fc36	Merge pull request #9894 from librethic-code/patch-1 ... FIX: keep external module element when adding resource	2018-10-30 14:06:38 +01:00
Laurent Destailleur	0127682996	Merge pull request #9881 from grandoc/8.0 ... merging and typo	2018-10-30 12:41:56 +01:00
Laurent Destailleur	ca6d15a3eb	Merge pull request #9820 from laudeco/hotfix/9640_member_email ... FIX the member e-mail on resign and validation.	2018-10-30 12:41:34 +01:00
Laurent Destailleur	9bb1572e63	Update functions.lib.php	2018-10-30 12:41:06 +01:00
Laurent Destailleur	06bffeeca5	Merge pull request #9910 from atm-ph/fix_8.0_pgsql ... Fix pgsql : operator does not exist: timestamp without time zone ~~ u…	2018-10-30 12:31:04 +01:00
Laurent Destailleur	a8e6c3832e	Update list.php	2018-10-30 12:30:56 +01:00
Marc de Lima Lucio	8911d72be8	FIX: task time screen: prevent users with access to all project from assigning to tasks they're not allowed to do	2018-10-30 12:28:04 +01:00
Laurent Destailleur	7f1776c3a1	Merge pull request #9903 from atm-maxime/fix_loan_accounting ... FIX default accounting accounts on loan creation #9643	2018-10-30 12:21:25 +01:00
John BOTELLA	1e819ca7c1	FIX special code on create supplier invoice from supplier order	2018-10-30 10:46:33 +01:00
John BOTELLA	ca47d1b8b1	Fix clone fourn order and invoice lines special code	2018-10-30 10:26:59 +01:00
Laurent Destailleur	8fbf5b1f33	FIX deletion on draft is allowed if we are allwoed to create	2018-10-29 18:28:19 +01:00
Laurent Destailleur	0266db7aa8	FIX deletion on draft is allowed if we are allwoed to create	2018-10-29 18:19:40 +01:00
Laurent Destailleur	d02fccd7e4	Fix deletion of draft invoice	2018-10-29 14:56:00 +01:00
Laurent Destailleur	824757bca6	Fix perm to delete	2018-10-29 14:47:33 +01:00
Laurent Destailleur	27d82d0e8e	FIX Delete of draft invoice	2018-10-29 14:41:00 +01:00
Laurent Destailleur	85b8c9f219	FIX Delete of draft invoice	2018-10-29 14:35:42 +01:00
atm-ph	c83e67123d	Fix pgsql : operator does not exist: timestamp without time zone ~~ unknown	2018-10-29 11:04:16 +01:00
Laurent Destailleur	04f80f0925	FIX Do not show check box if not applicable	2018-10-29 02:27:51 +01:00
Laurent Destailleur	553e984465	FIX Selection of addmaindocfile is lost on error	2018-10-29 02:14:41 +01:00
Laurent Destailleur	244c7f8dc3	FIX thirdparty property of object not loaded when only one record	2018-10-29 02:14:36 +01:00
Laurent Destailleur	6e3822345c	Fix use setup of template for attached files in mass actions	2018-10-29 02:14:31 +01:00
Maxime Kohlhaas	b68b8fe412	Fix changing currency in a doc was recalculating amounts in company currency #9801	2018-10-28 11:02:51 +01:00
Maxime Kohlhaas	46d3bec104	Fix replenish wasn't caring about supplier price min quantity #9561	2018-10-28 10:25:56 +01:00
Maxime Kohlhaas	2fe4763570	Fix default accounting accounts on loan creation #9643	2018-10-28 09:22:55 +01:00
Librethic	fcd687642c	FIX: keep external module element when adding resource ... When adding object from external module as a resource we need to keep @modulename as defined into url rather than use `element` property (which do not contain @modulename).	2018-10-27 11:46:12 +02:00
Maxime Kohlhaas	4ec80b5136	Fix invoice supplier clone was not getting all lines parameters #9800	2018-10-27 10:53:01 +02:00
Frédéric FRANCE	a30091fd74	Update commande.class.php	2018-10-27 09:51:19 +02:00
Maxime Kohlhaas	abb343d37e	Fix missing name alias field in societe import/export #9091	2018-10-27 09:42:08 +02:00
Maxime Kohlhaas	1b054f1b36	Fix invoice creation from contract was invoicing closed services #9087	2018-10-27 09:21:49 +02:00
Laurent Destailleur	d800fe9256	FIX extrafields of taks not visible in creation	2018-10-26 16:21:01 +02:00
De Coninck Laurent	d347cf3a85	set a message	2018-10-26 16:18:27 +02:00
Philippe GRAND	f450e04856	Merge remote-tracking branch 'upstream/8.0' into 8.0	2018-10-26 15:38:15 +02:00
Laurent Destailleur	ed0393dfa8	Merge pull request #9875 from atm-john/Fix_title ... FIX title	2018-10-26 15:14:44 +02:00
Laurent Destailleur	35421d135a	FIX Total of timespent ... Conflicts: htdocs/core/js/timesheet.js	2018-10-26 15:04:02 +02:00
atm-john	8a9b9f1736	Fix title	2018-10-25 21:53:48 +02:00
Marc de Lima Lucio	16c35035c1	FIX: pdf typhon: order reference duplicate	2018-10-25 12:07:40 +02:00
Laurent Destailleur	f44162715e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-10-24 13:31:04 +02:00
Laurent Destailleur	30a2004d53	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-10-24 13:30:54 +02:00
John BOTELLA	fccea99e23	FIX translation in select unit form	2018-10-24 10:23:27 +02:00