dolibarr

Author	SHA1	Message	Date
atm-lena	6562334f7b	FIX sendEmailsReminder() function	2020-08-28 09:37:18 +02:00
Laurent Destailleur	4624cf98ee	Merge pull request #14545 from cfoellmann/defaults-payment-selections FIX allow use of default settings for payment term and condition on proposal creation	2020-08-27 21:04:10 +02:00
Laurent Destailleur	f997d11761	Update card.php	2020-08-27 21:02:01 +02:00
Laurent Destailleur	7730569dff	Update card.php	2020-08-27 21:00:01 +02:00
Laurent Destailleur	9f8d1f0e63	Merge pull request #14520 from TobiasSekan/ShowUserOnExternalCalenderEvents NEW Show user on external calender events (when found)	2020-08-27 20:10:13 +02:00
Laurent Destailleur	0309510ab8	Fix avoid duplicate event recorded from email collector	2020-08-27 18:50:08 +02:00
atm-lena	c0f254d10c	Translation + decode	2020-08-27 16:03:25 +02:00
atm-lena	e3ce3cbb7c	Function sendEmailsReminder()	2020-08-27 15:49:56 +02:00
atm-lena	f57325237a	WIP : sendEmailsReminder()	2020-08-27 12:30:59 +02:00
atm-lena	5856033892	Replace "agenda_send" and "event_push" to "actioncomm_send"	2020-08-27 11:15:08 +02:00
stickler-ci	b0fe7bc2e0	Fixing style errors.	2020-08-27 08:47:57 +00:00
atm-lena	4ef2644300	Use date.lib.php functions	2020-08-27 10:29:23 +02:00
atm-lena	9d1fc28eba	Fix type reminder "push" to "browser"	2020-08-27 09:35:02 +02:00
atm-lena	bbc554070c	Fix	2020-08-27 09:33:40 +02:00
atm-lena	6a60228bc3	Translation	2020-08-26 17:11:32 +02:00
atm-lena	efe60ebc58	Error management	2020-08-26 17:02:34 +02:00
atm-lena	cc29654f47	WIP : rename fk_project to fk_actioncomm + add line to sql file to install	2020-08-26 16:48:09 +02:00
atm-lena	a01d1b58c7	Add fk_email_template	2020-08-26 16:06:20 +02:00
atm-lena	cf9337b644	Add fk_project to actioncommreminder object	2020-08-26 15:58:14 +02:00
atm-lena	c10556473f	Clean	2020-08-26 15:35:12 +02:00
atm-lena	552e655668	Add field "entity" in actioncommrminder object and table	2020-08-26 15:22:32 +02:00
atm-lena	2fb5824836	Calcul date of reminder for event create	2020-08-26 15:12:08 +02:00
atm-lena	d3ac39589a	WIP	2020-08-26 12:48:12 +02:00
atm-lena	42f492877e	WIP	2020-08-26 11:36:32 +02:00
atm-lena	3046556d7b	Add checkbox "AddReminder"	2020-08-26 11:19:14 +02:00
atm-lena	a4018f41f7	WIP	2020-08-26 10:52:36 +02:00
atm-lena	7df993c7ed	Add "select_model_mail" function + add select to create event	2020-08-25 17:26:32 +02:00
atm-lena	94b2f3c5e1	Add $conf conditions	2020-08-25 12:57:36 +02:00
atm-lena	25840c2b3d	Create Event - Add fields	2020-08-25 12:40:29 +02:00
Sekan, Tobias	a7895f3496	Merge branch 'ShowUserOnExternalCalenderEvents' of https://github.com/TobiasSekan/dolibarr into ShowUserOnExternalCalenderEvents	2020-08-25 12:20:10 +02:00
Sekan, Tobias	4c851884e5	Address feedback	2020-08-25 12:16:44 +02:00
stickler-ci	a60968e95b	Fixing style errors.	2020-08-24 14:17:15 +00:00
Christian Foellmann	0e9677fd34	allow default settings for "cond_reglement_id" and "mode_reglement_id" (cherry picked from commit 2e5475d181af2e8ceb6ea220424fd1329e72e342)	2020-08-24 16:08:44 +02:00
Laurent Destailleur	d23e83779f	Merge branch 'develop' into ParseTranspAndPrioFromExternalCalendar	2020-08-23 18:21:18 +02:00
Laurent Destailleur	053aa1b750	Merge pull request #14509 from TobiasSekan/ShowLocationOnImportCalenderEvents NEW Show place from events on import calender	2020-08-23 18:11:02 +02:00
Laurent Destailleur	a265bec7ca	NEW Events in agenda for contact FIX Saving contacts of an events	2020-08-23 02:38:56 +02:00
Laurent Destailleur	6ad18ceef0	Remove useless code	2020-08-21 19:48:31 +02:00
stickler-ci	183013e9ed	Fixing style errors.	2020-08-21 12:02:03 +00:00
Sekan, Tobias	9af5354dfe	Parse priority and transparency from external calender events	2020-08-21 13:57:03 +02:00
stickler-ci	61cce2e700	Fixing style errors.	2020-08-21 06:46:00 +00:00
Sekan, Tobias	22ff5a320f	fix not working external calender on/off	2020-08-21 08:40:23 +02:00
Sekan, Tobias	bb1452917b	fix wrong event percentage	2020-08-21 08:33:19 +02:00
Sekan, Tobias	ba98db934d	Show user on external calender events	2020-08-21 08:18:26 +02:00
Laurent Destailleur	ad0625b6ec	Debug posting message from ticket page	2020-08-21 01:11:22 +02:00
Sekan, Tobias	546571a6f8	Show place from events on import calender	2020-08-20 08:20:00 +02:00
Laurent Destailleur	7217dc3114	Better perf for phpunit on very large databases	2020-08-19 01:43:48 +02:00
Laurent Destailleur	964c4ef0d2	Standardize code. Use model_pdf.	2020-08-18 14:48:38 +02:00
Alexandre SPANGARO	27c36713d3	Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport	2020-08-16 22:10:02 +02:00
Tim Otte	0e03578e91	Fixed translation of product units in documents	2020-08-04 11:51:40 +02:00
Laurent Destailleur	e455f8afa6	Merge pull request #14369 from Tim-Otte/fix-product-unit-translation Fixed translation of product units in documents	2020-08-04 11:50:50 +02:00
Tim Otte	360afccecc	Fixed translation of product units in documents	2020-08-04 11:02:16 +02:00
Laurent Destailleur	4afdfdda53	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/card.php	2020-08-02 22:42:17 +02:00
Laurent Destailleur	66d4b7372e	FIX Look and feel v12 Conflicts: htdocs/comm/card.php htdocs/societe/tpl/linesalesrepresentative.tpl.php	2020-08-02 22:38:20 +02:00
Laurent Destailleur	87f71e7681	FIX Look and feel v12	2020-08-02 22:36:14 +02:00
kkhelifa-opendsi	fe0f77b967	Merge branch 'develop' into stcommcontact	2020-07-31 16:41:17 +02:00
Tim Otte	85c5f423b1	Added fetch_thirdparty (without the site crashes)	2020-07-29 12:55:58 +02:00
Tim Otte	c5816478d9	Added fetch_thirdparty (without the site crashes)	2020-07-28 11:14:55 +02:00
Laurent Destailleur	dd86c21382	FIX dolGetElementUrl and agenda page for external modules	2020-07-25 03:01:04 +02:00
Laurent Destailleur	46fccf8eb1	FIX dolGetElementUrl and agenda page for external modules	2020-07-24 11:53:44 +02:00
Laurent Destailleur	42234ba506	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/price.lib.php	2020-07-24 00:07:57 +02:00
VERDOL Gauthier	55298317e3	FIX : wrong link to third invoice templates	2020-07-20 16:22:48 +02:00
Abdessalam@MEGALOGI	1e6273b92d	Update card.php La description d'un produit/service libre (HTML) d'un devis est formatée en texte simple.	2020-07-18 23:11:17 +02:00
Laurent Destailleur	8b5f4fe9a6	Fix massaction delete on events	2020-07-11 12:21:53 +02:00
Laurent Destailleur	b6452dbbc0	Merge pull request #14196 from Tim-Otte/fix-proposals-urgent FIX: Hotfix for "Call to a member function getNomUrl() on null in comm/propal/card.php"	2020-07-10 02:51:25 +02:00
Laurent Destailleur	46119dc786	Fix per user	2020-07-09 12:49:48 +02:00
Laurent Destailleur	b2bd90ae1a	Fix link to list of event	2020-07-09 12:33:28 +02:00
Laurent Destailleur	9592fdb3fc	CSS	2020-07-09 11:55:16 +02:00
Laurent Destailleur	1dfd2d565b	FIX Reposition and nav	2020-07-08 18:18:47 +02:00
Laurent Destailleur	96d935832c	FIX Reposition and nav	2020-07-08 18:18:08 +02:00
Laurent Destailleur	5ea47f3ade	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/resultat/index.php htdocs/product/admin/product.php htdocs/projet/tasks/list.php	2020-07-08 18:11:58 +02:00
Laurent Destailleur	96729769f7	Standardize Agenda view	2020-07-08 18:06:14 +02:00
Tim Otte	a73f77cfef	Fixed same error like before	2020-07-07 12:43:15 +02:00
Laurent Destailleur	4fd970af28	Fix phpcs	2020-07-07 01:29:31 +02:00
Laurent Destailleur	14c98f277b	NEW Can change VAT rate of all lines of a draft object in one step.	2020-07-06 22:48:22 +02:00
Laurent Destailleur	f72a836231	Fix look and feel v12	2020-07-06 16:59:25 +02:00
Laurent Destailleur	4dcc073b3a	Fix param GETPOST	2020-07-06 16:54:30 +02:00
Laurent Destailleur	3939a640e9	Fix note in creation	2020-07-06 16:52:28 +02:00
stickler-ci	19eef8aa93	Fixing style errors.	2020-07-06 01:26:46 +00:00
Alexandre SPANGARO	59ee22537d	Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport	2020-07-06 03:24:27 +02:00
Laurent Destailleur	83eaddb17b	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/core/class/evalmath.class.php htdocs/core/class/extrafields.class.php htdocs/install/mysql/migration/11.0.0-12.0.0.sql htdocs/langs/en_US/cashdesk.lang htdocs/societe/class/societe.class.php	2020-07-04 13:13:17 +02:00
Tim Otte	bce0a93227	Hotfix for an error in v12	2020-07-03 00:33:54 +02:00
Laurent Destailleur	0ea55209ae	Merge pull request #14165 from ptibogxiv/patch-345 FIX non numeric value on comm/card.php	2020-07-03 00:24:32 +02:00
Regis Houssin	a5431a40da	FIX missing possibility to change entity when propal cloning	2020-07-02 10:16:20 +02:00
ptibogxiv	cc132775f3	FIX non numeric value on comm/car.php	2020-07-01 16:18:19 +02:00
Tim Otte	94a1d71fba	Hotfix for an error in v12	2020-06-30 15:20:30 +02:00
Laurent Destailleur	0aa08edb38	Merge pull request #14139 from OPEN-DSI/new-societe-card-set-sales-representative NEW can edit and set sales representatives directly on thirdparty card	2020-06-28 21:08:24 +02:00
Laurent Destailleur	90d4458aab	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/class/facture.class.php	2020-06-27 00:38:51 +02:00
Laurent Destailleur	29ba9c82c3	Fix #14120	2020-06-26 17:17:13 +02:00
lvessiller	ad36447295	NEW can edit and set sales representatives directly on thirdparty card	2020-06-26 12:20:53 +02:00
Laurent Destailleur	333d4873c3	Properties ->contactid has been renamed into ->contact_id	2020-06-25 12:17:47 +02:00
Laurent Destailleur	18c23680f7	Fix bad object	2020-06-25 12:17:06 +02:00
Laurent Destailleur	ee5156034d	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-06-24 20:03:40 +02:00
Laurent Destailleur	de62037ba5	Fix signed only in margin calculation of project	2020-06-24 12:58:10 +02:00
Laurent Destailleur	6d25b8630b	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/prelevement.php htdocs/core/class/rssparser.class.php	2020-06-23 11:38:20 +02:00
Laurent Destailleur	4d2cbf7006	Fix alert picto of expired services not visible Fix CSS	2020-06-23 11:27:40 +02:00
Laurent Destailleur	501fd2f7a3	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/takepos/admin/receipt.php	2020-06-21 20:48:41 +02:00
Laurent Destailleur	bb3320f103	FIX #14104	2020-06-20 18:34:19 +02:00
Laurent Destailleur	c54294285a	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/mailing/class/html.formadvtargetemailing.class.php htdocs/core/class/commonobject.class.php htdocs/core/class/html.form.class.php	2020-06-20 12:28:14 +02:00
florian HENRY	7fef9a813e	fix warning and clean old code about multiselect category	2020-06-18 20:03:03 +02:00
Laurent Destailleur	4627f06c70	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-06-16 22:57:50 +02:00
Laurent Destailleur	b7d835eceb	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-06-15 16:10:27 +02:00
Laurent Destailleur	40e16672e3	FIX BlindBoolean SQL injection reported by Christian Weiler <sak1.s3curity@gmail.com>	2020-06-15 15:08:52 +02:00
Laurent Destailleur	90b5ed9908	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/website.lib.php	2020-06-11 23:41:35 +02:00
Laurent Destailleur	e94ef09977	css	2020-06-10 22:24:15 +02:00
Laurent Destailleur	8dbc0ff040	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/prelevement.php htdocs/admin/system/phpinfo.php htdocs/modulebuilder/index.php	2020-05-31 00:31:14 +02:00
Laurent Destailleur	94e02269ee	Fix: missing fk_project	2020-05-31 00:20:01 +02:00
Laurent Destailleur	ddebe1bbba	FIX Missing ref into popup	2020-05-30 23:52:47 +02:00
Laurent Destailleur	02bf646abe	FIX Missing ref into popup	2020-05-30 23:51:02 +02:00
stickler-ci	029f5570e5	Fixing style errors.	2020-05-28 12:55:29 +00:00
Supermanu	0baea21947	NEW Add mass deletion for events Only users with the right `allactions->delete` will be able to mass delete.	2020-05-28 14:45:54 +02:00
Supermanu	721b99bb2f	Add calendar selection for agenda view	2020-05-28 11:24:37 +02:00
Frédéric FRANCE	e5402988d9	Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword	2020-05-24 17:58:18 +02:00
Laurent Destailleur	fd61214b97	Merge	2020-05-24 01:06:45 +02:00
Frédéric FRANCE	5c78eca68a	prepare new rule	2020-05-23 21:14:44 +02:00
Frédéric FRANCE	174ddc5fd4	prepare new rule	2020-05-23 21:07:47 +02:00
Laurent Destailleur	127534ef55	Fix common var name seems to be $objref for subdir of doc	2020-05-23 20:09:31 +02:00
stickler-ci	66637ba0b6	Fixing style errors.	2020-05-23 16:39:06 +00:00
Frédéric FRANCE	2085ac73e7	Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword	2020-05-23 18:34:58 +02:00
Laurent Destailleur	4e3fbb9d05	Merge pull request #13912 from TobiasSekan/NewEventMassactionPercent NEW mass-actions for the event list view	2020-05-23 14:26:51 +02:00
Laurent Destailleur	7397806ae7	Update actioncomm.class.php	2020-05-23 14:26:28 +02:00
Frédéric FRANCE	b41ac00b98	add new rule	2020-05-21 15:05:19 +02:00
Frédéric FRANCE	ee6fadd0d5	add new rule	2020-05-21 01:41:27 +02:00
Laurent Destailleur	92cbff7749	Clean code	2020-05-20 23:40:04 +02:00
stickler-ci	f0bb7d233f	Fixing style errors.	2020-05-19 06:29:23 +00:00
Tobias Sekan	7fd6151c43	Add massactions for event list	2020-05-19 08:18:38 +02:00
Tobias Sekan	223224d12c	Add function to update the event percent + const	2020-05-19 08:07:21 +02:00
Laurent Destailleur	ff8d22a80d	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 Conflicts: htdocs/expedition/class/expedition.class.php scripts/cron/cron_run_jobs.php	2020-05-18 15:57:01 +02:00
Laurent Destailleur	9336828710	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 Conflicts: htdocs/comm/action/class/actioncomm.class.php htdocs/compta/paiement/card.php htdocs/expedition/class/expedition.class.php	2020-05-18 15:54:39 +02:00
Laurent Destailleur	45345440a4	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/expedition/class/expedition.class.php scripts/cron/cron_run_jobs.php	2020-05-18 15:50:36 +02:00
Maxime Kohlhaas	cf96383bf9	Fix : entity was missing in actioncomm fetch	2020-05-18 10:44:55 +02:00
Laurent Destailleur	ab07330668	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-05-14 16:34:45 +02:00
Laurent Destailleur	f5b9151f17	Merge pull request #13871 from FHenry/11.0 fix template email on propal list	2020-05-14 16:10:33 +02:00
Laurent Destailleur	136d002639	Merge pull request #13872 from simnandez/11.0 FIX: Do not show stats panel if the user does not have permissions	2020-05-14 16:09:37 +02:00
ptibogxiv	e1db0ef855	Update index.php	2020-05-12 10:57:51 +02:00
Juanjo Menent	66beb7c14f	FIX: Do not show stats panel if the user does not have permissions	2020-05-12 10:17:47 +02:00
florian HENRY	d9e26b8569	fix template email on prpal list	2020-05-12 08:38:03 +02:00
Laurent Destailleur	4584fa1aa6	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/asset/list.php htdocs/compta/bank/list.php htdocs/contrat/services_list.php htdocs/core/lib/date.lib.php htdocs/expensereport/list.php htdocs/fichinter/list.php htdocs/holiday/list.php htdocs/projet/tasks/list.php htdocs/supplier_proposal/list.php htdocs/user/list.php	2020-05-11 19:43:06 +02:00
Laurent Destailleur	44d36815bd	Look and feel v12	2020-05-11 19:00:27 +02:00
Laurent Destailleur	42ee755ea5	Look and feel v12	2020-05-08 02:52:55 +02:00
Maxime Kohlhaas	1a9afe6b20	Fix missing hook params for printFieldListValue	2020-05-08 01:40:25 +02:00
Laurent Destailleur	206b16410e	Revert the option to avoid to introduce a feature that is duplicate with already existing view "Events/Agenda". It also keeps a common behaviour between other tools. Maxi debug on messages of tickets	2020-05-07 22:52:32 +02:00
Scrutinizer Auto-Fixer	8f0e00b4aa	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-05-02 01:39:56 +00:00
Laurent Destailleur	8208e81622	Merge pull request #13767 from indelog/statsbytype Add possibility to filter stats by ThirdParty type and categorie	2020-05-01 22:05:06 +02:00
Laurent Destailleur	c27b3c5966	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/tpl/extrafields_list_search_sql.tpl.php	2020-04-30 18:49:20 +02:00
DEMAREST Maxime (Indelog)	790cffb7ae	Correct select label for categories in stats pages	2020-04-29 15:24:13 +02:00
DEMAREST Maxime (Indelog)	1bd9372022	Forgot comments to document news params for the modified methods	2020-04-29 10:00:29 +02:00
DEMAREST Maxime (Indelog)	40f1bed8d0	Add possibility to filter stats by ThirdParty type and categorie	2020-04-29 09:17:44 +02:00
kamel	4dd42496fa	Correction pour validation Stickler CI / stickler-ci	2020-04-27 17:48:05 +02:00
kamel	9cb90cb384	NEW: Add prospect status managment for the contact with managment of custom icon	2020-04-27 17:35:14 +02:00
Laurent Destailleur	1c70e49695	Merge branch 'develop' into 12.0_a23	2020-04-27 14:14:13 +02:00
gauthier	7f56c4a785	FIX : Another "Access to undeclared static property: Contact::$table_element" && "Societe::$table_element"	2020-04-27 11:18:53 +02:00
Laurent Destailleur	4c605283f5	Fix phpcs	2020-04-27 00:09:21 +02:00
Laurent Destailleur	31157931a9	Fix phpcs	2020-04-26 23:52:23 +02:00
Laurent Destailleur	1121d2c1c6	Look and feel v12	2020-04-25 13:49:44 +02:00
Laurent Destailleur	7bbfd2175d	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/class/fournisseur.commande.dispatch.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/reception/class/reception.class.php	2020-04-24 18:58:47 +02:00
Laurent Destailleur	9679b1f04c	Merge pull request #13704 from frederic34/actioncomm_note actioncomm note deprecated	2020-04-23 18:52:56 +02:00
Marc Guenneugues	94be1870ec	Clean line extrafields when deleting proposal	2020-04-23 18:02:53 +02:00
Laurent Destailleur	72c6ac1c72	Complete #13708 , normalization of code	2020-04-23 13:21:39 +02:00
Frédéric FRANCE	177008ab65	actioncomm note deprecated	2020-04-23 00:45:33 +02:00
Frédéric FRANCE	4220d6b253	actioncomm note deprecated	2020-04-23 00:38:42 +02:00
Laurent Destailleur	16e46c672c	Clean code	2020-04-20 15:06:27 +02:00
Laurent Destailleur	d847f67e45	Look and feel v12	2020-04-20 03:10:26 +02:00
Laurent Destailleur	5c18404083	Move to jquery 4.0.13 with fix in reponsive Restore some files modified by error.	2020-04-18 15:15:35 +02:00
Laurent Destailleur	8f7c3fc867	Fix: restore jselect2 4.0.5 (4.0.6 create troubles in responsive)	2020-04-18 14:39:02 +02:00
Laurent Destailleur	47ff3f866a	css	2020-04-18 12:54:28 +02:00
Laurent Destailleur	7c6c600225	CSS	2020-04-18 11:38:24 +02:00
Laurent Destailleur	07ce3fc34d	Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop	2020-04-18 11:08:21 +02:00
Laurent Destailleur	23876684cb	Responsive	2020-04-18 11:06:28 +02:00
Laurent Destailleur	5254a94038	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/ldap.php htdocs/commande/class/commande.class.php htdocs/commande/index.php htdocs/commande/list.php htdocs/compta/facture/list.php htdocs/expedition/list.php htdocs/fourn/commande/list.php htdocs/fourn/facture/list.php htdocs/loan/list.php htdocs/product/class/product.class.php htdocs/supplier_proposal/list.php	2020-04-16 15:58:59 +02:00
atm-quentin	f7c07640dd	viewstatut to search_status	2020-04-15 15:01:00 +02:00
Scrutinizer Auto-Fixer	387ea73bf3	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-04-13 11:24:42 +00:00
Laurent Destailleur	96d087c99d	Fix clean event report	2020-04-13 02:59:33 +02:00
Laurent Destailleur	596ba8d679	Clean deprecated code.	2020-04-13 01:10:35 +02:00
Laurent Destailleur	92b6b1a042	Look and feel v12	2020-04-12 18:13:43 +02:00
stickler-ci	a873afdad9	Fixing style errors.	2020-04-12 15:08:44 +00:00
Laurent Destailleur	51f73526f9	Merge branch 'develop' into patch-8	2020-04-12 17:07:57 +02:00
Laurent Destailleur	fe4cd2e7bc	Update actioncomm.class.php	2020-04-12 17:05:12 +02:00
Laurent Destailleur	422e33a68b	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/ihm.php htdocs/comm/action/class/actioncomm.class.php htdocs/compta/stats/cabyprodserv.php htdocs/filefunc.inc.php htdocs/takepos/invoice.php	2020-04-12 17:01:44 +02:00
Laurent Destailleur	1cda760621	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 Conflicts: htdocs/comm/action/class/actioncomm.class.php	2020-04-12 16:54:09 +02:00
Laurent Destailleur	eebf48b27c	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/comm/action/class/actioncomm.class.php	2020-04-12 16:52:58 +02:00
Frédéric FRANCE	e2660fd31c	Update actioncomm.class.php	2020-04-11 22:38:28 +02:00
Frédéric FRANCE	88f18ec3ce	can't remove actioncomm if there is a category	2020-04-11 22:24:50 +02:00
Laurent Destailleur	0845f0bcd3	Merge pull request #13523 from bb2a/patch-2 add in default search	2020-04-10 12:12:28 +02:00
Laurent Destailleur	5ff981bf61	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/user/perms.php	2020-04-10 12:04:21 +02:00
Laurent Destailleur	874cbcefc7	Fix permission to close a proposal or order was not correctly used #13547	2020-04-10 11:54:14 +02:00
Scrutinizer Auto-Fixer	444c293c01	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-04-10 08:59:32 +00:00
Anthony Berton	a7440687ec	Update list.php	2020-04-10 10:38:31 +02:00
Laurent Destailleur	4ff503d20a	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/product/stock/list.php htdocs/supplier_proposal/list.php	2020-04-10 02:07:51 +02:00
Laurent Destailleur	7fe8c7eab3	FIX #11855	2020-04-10 01:37:04 +02:00
Laurent Destailleur	83af4ebea4	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/modules/expedition/doc/pdf_espadon.modules.php htdocs/product/stock/class/entrepot.class.php htdocs/product/stock/list.php	2020-04-10 01:22:22 +02:00
Laurent Destailleur	63f0c07a07	Add warning	2020-04-08 18:32:13 +02:00
Laurent Destailleur	1adee36314	Upgrade to font awesome 5.13	2020-04-07 21:11:18 +02:00
Laurent Destailleur	ff1b3db54b	Fix regression on hamburger picto	2020-04-06 23:38:30 +02:00
Laurent Destailleur	28a1b7af35	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/modulebuilder/index.php htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php htdocs/supplier_proposal/class/supplier_proposal.class.php	2020-04-03 18:07:24 +02:00
Laurent Destailleur	193a10bc39	FIX cloning of emailing when no content selected	2020-04-03 02:29:10 +02:00
Laurent Destailleur	84cda962c1	Clean dead code	2020-04-02 12:03:29 +02:00
Laurent Destailleur	4207d94f53	FIX Bad position of total in column Conflicts: htdocs/fourn/facture/paiement.php	2020-03-27 19:10:01 +01:00
Laurent Destailleur	a4797634d5	FIX Bad position of total in column	2020-03-27 19:08:39 +01:00
Laurent Destailleur	c27592bad2	Clean deprecated params on all fetch_optionals()	2020-03-27 16:02:58 +01:00
Laurent Destailleur	004397304e	FIX Foreign currency lost when splitting a discount	2020-03-26 02:32:53 +01:00
Laurent Destailleur	f0de10897a	FIX Foreign currency lost when splitting a discount	2020-03-26 02:32:24 +01:00
Laurent Destailleur	fa3bba942f	Start to save the VAT src code into table of discounts to reuse them later	2020-03-26 02:01:30 +01:00
Alexandre SPANGARO	c3e5cf901d	Work on split module fournisseur	2020-03-24 22:20:25 +01:00
Alexandre SPANGARO	e6d9f7885c	Work on split module fournisseur	2020-03-24 21:22:20 +01:00
Laurent Destailleur	62fefab5ac	Standardize color of status	2020-03-24 19:06:37 +01:00
Laurent Destailleur	a5379c7144	FIX All forms must use newToken() Conflicts: htdocs/commande/card.php htdocs/compta/cashcontrol/cashcontrol_card.php htdocs/supplier_proposal/card.php	2020-03-24 13:14:23 +01:00
Laurent Destailleur	1ff15e1fd9	FIX All forms must use newToken()	2020-03-24 13:10:35 +01:00
Scrutinizer Auto-Fixer	e8083e2a65	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-03-23 14:54:02 +00:00
Laurent Destailleur	01e60562b9	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/commande/index.php htdocs/takepos/takepos.php	2020-03-23 15:38:10 +01:00
Alexandre SPANGARO	d5729e6dcc	Work on split module fournisseur	2020-03-23 05:53:33 +01:00
Alexandre SPANGARO	e6a59dcdbb	Work on split module fournisseur	2020-03-23 05:43:41 +01:00
Alexandre SPANGARO	6e9a07d119	Work on split module fournisseur	2020-03-22 05:33:30 +01:00
Laurent Destailleur	599bf89f60	Fix can edit emailing after sending has started	2020-03-20 20:46:21 +01:00
Laurent Destailleur	5d9e713a1c	Fix better default sort order	2020-03-20 20:36:59 +01:00
Laurent Destailleur	68cadb58bb	Fix better default sort order	2020-03-20 20:36:26 +01:00
Laurent Destailleur	8bab245c7e	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog htdocs/core/tpl/contacts.tpl.php	2020-03-18 18:50:55 +01:00
Laurent Destailleur	8192e9dc67	FIX Missing token in form	2020-03-14 03:02:49 +01:00
Laurent Destailleur	6e71bb8707	Look and feel v12: Use color of status for dotnuts	2020-03-14 02:17:08 +01:00
Laurent Destailleur	3b72005f93	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/card.php htdocs/filefunc.inc.php htdocs/langs/fr_FR/admin.lang htdocs/langs/fr_FR/cashdesk.lang htdocs/langs/fr_FR/errors.lang htdocs/langs/fr_FR/products.lang htdocs/langs/fr_FR/projects.lang	2020-03-14 00:22:11 +01:00
florian HENRY	ca269864f7	let keep it to expedition	2020-03-13 14:55:34 +01:00
Laurent Destailleur	33c5db9cc3	Prepare code for the new pagination possibility	2020-03-13 13:07:11 +01:00
Laurent Destailleur	d380da3f4c	Merge pull request #13250 from FHenry/dev_fix_createLineWithCOrrectLink NEW : special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other documents lines the id of original lines and origin class line rather than origin object id and origin object type	2020-03-12 12:57:04 +01:00
Laurent Destailleur	2994a5f35e	Merge pull request #13336 from Dolibarr/scrutinizer-patch-2 Scrutinizer Auto-Fixes	2020-03-12 12:47:52 +01:00
Laurent Destailleur	54b32d94e0	Fix field required	2020-03-12 12:47:08 +01:00
Scrutinizer Auto-Fixer	f413ce6aac	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-03-12 11:45:44 +00:00
florian HENRY	eaa9d22783	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_fix_createLineWithCOrrectLink	2020-03-12 09:45:04 +01:00
florian HENRY	29b2ea77d5	NEW : special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other document s lines the id of origin lines and origin class line rather than origin object id and origin object type	2020-03-12 09:44:43 +01:00
florian HENRY	6edaa7ac11	fix getentity on comm/card.php	2020-03-11 18:00:35 +01:00
florian HENRY	f40c8ce507	fix getentity on comm/card.php	2020-03-11 17:58:41 +01:00
Laurent Destailleur	82f0d8a3bc	Fix bad params	2020-03-09 17:38:47 +01:00
Laurent Destailleur	3edc3dd382	Fix fields definition	2020-03-08 20:10:31 +01:00
Laurent Destailleur	343a80fd3d	Fix table fields	2020-03-08 19:25:00 +01:00
Laurent Destailleur	054ffb7547	Depreciate variables not used by Dolibarr.	2020-03-06 14:38:06 +01:00
Laurent Destailleur	d0f22c7bff	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/boxes/box_graph_product_distribution.php	2020-03-06 14:22:42 +01:00
Laurent Destailleur	d4b67a6cef	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 Conflicts: htdocs/contrat/list.php htdocs/core/lib/functions.lib.php	2020-03-06 14:19:30 +01:00
Laurent Destailleur	aaf9aef5c8	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/contrat/list.php	2020-03-06 14:17:21 +01:00
Laurent Destailleur	ad9d0a3472	Fix graph of product distribution when too much record	2020-03-06 12:45:02 +01:00
ATM-Nicolas	a9d7bbc2ed	FIX : Remove unexisting link	2020-03-06 09:52:19 +01:00
Laurent Destailleur	0bd2740779	NEW Can force position of legend of graph on right (instead of top)	2020-03-05 17:23:19 +01:00
Laurent Destailleur	fc31680bd0	Several fix for chart.js graphs	2020-03-05 02:55:06 +01:00
Laurent Destailleur	f35f0ecf9d	Look and feel v12	2020-03-05 01:54:12 +01:00
Laurent Destailleur	7d0d0aa75a	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/card.php	2020-03-04 01:56:50 +01:00
Laurent Destailleur	0b37c2c201	FIX #13263	2020-03-04 00:53:07 +01:00
Laurent Destailleur	2b6aaa652d	Merge pull request #13256 from ATM-Marc/NEW_list_multicurrency NEW: add multicurrency columns to document lists	2020-03-03 23:12:53 +01:00
Laurent Destailleur	7866f89585	Merge pull request #13260 from atm-quentin/FIX_ecm_files FIX ecm_files didnt match cause document ref contained "/"	2020-03-03 23:09:02 +01:00
ptibogxiv	b6bad0c936	Update api_proposals.class.php	2020-03-03 13:40:26 +01:00
ptibogxiv	fa5aeebcd8	NEW get proposal by ref with API	2020-03-03 13:39:22 +01:00
atm-quentin	9446138951	FIX ecm_files didnt match cause document ref contained "/"	2020-03-03 12:07:18 +01:00
Laurent Destailleur	f0d458682d	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-02-29 00:15:17 +01:00
Laurent Destailleur	87b3cf9765	FIX Bad link to template invoices	2020-02-28 12:01:43 +01:00
Marc de Lima Lucio	cdddccde16	NEW: propal list: enable multicurrency columns	2020-02-27 17:34:45 +01:00
Laurent Destailleur	096a568e83	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/extrafields.class.php	2020-02-23 23:42:23 +01:00
Laurent Destailleur	3075e40f8c	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 Conflicts: htdocs/comm/remx.php htdocs/core/boxes/box_contacts.php htdocs/core/lib/functions.lib.php htdocs/core/lib/security.lib.php	2020-02-23 23:37:46 +01:00
Laurent Destailleur	5919570b34	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2020-02-23 23:31:51 +01:00
Laurent Destailleur	11ff3f6562	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2020-02-23 23:31:03 +01:00
Laurent Destailleur	530930b7aa	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2020-02-23 23:30:38 +01:00
Maxime Kohlhaas	0ab16ed5ae	Fix #10179 discount split	2020-02-23 16:50:24 +01:00
Laurent Destailleur	44eda2d4ad	Fix doxygen	2020-02-20 13:42:43 +01:00
Laurent Destailleur	895503d2eb	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/index.php htdocs/core/class/CMailFile.class.php	2020-02-20 00:21:25 +01:00
Laurent Destailleur	2cfca2a45e	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 Conflicts: htdocs/comm/action/card.php htdocs/comm/index.php htdocs/core/boxes/box_fournisseurs.php htdocs/core/boxes/box_propales.php htdocs/societe/index.php	2020-02-20 00:18:58 +01:00
Laurent Destailleur	394c256ca1	Merge pull request #13129 from mapiolca/patch-33 Fix issue with unselect data	2020-02-19 11:37:52 +01:00
Scrutinizer Auto-Fixer	fd48877dc6	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-02-18 22:47:25 +00:00
Laurent Destailleur	2ac064059a	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/en_US/admin.lang htdocs/projet/element.php	2020-02-18 22:40:43 +01:00
root	0dcb83e6bf	referer XSS patches	2020-02-18 22:31:24 +01:00
Laurent Destailleur	2069438115	Merge pull request #13125 from 418sec/develop dolibarr - Cross-site Scripting (XSS) - Fix:	2020-02-18 22:29:53 +01:00
Laurent Destailleur	9ce0e6869e	Fix trans	2020-02-18 11:55:39 +01:00
VESSILLER	d1e9f3a505	FIX keep assigned users in session when loading projects and tasks	2020-02-18 11:18:00 +01:00
Pierre Ardoin	dbb7db376b	fix error code	2020-02-18 09:16:12 +01:00
Pierre Ardoin	49dd8e30aa	Fix not display data	2020-02-18 08:28:39 +01:00
Laurent Destailleur	be7bed7063	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-02-17 14:00:05 +01:00
Laurent Destailleur	e59ac41182	Fix phpcs	2020-02-17 13:59:44 +01:00
Laurent Destailleur	a6b0fec90b	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/exports/class/export.class.php	2020-02-17 12:35:34 +01:00
Laurent Destailleur	504a67daee	FIX duplicate class name into some log lines	2020-02-17 12:34:00 +01:00
Jamie Slome	2d9162aedb	Merge branch 'develop' into develop	2020-02-17 10:49:41 +00:00
Laurent Destailleur	35ada37d4d	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog htdocs/comm/propal/list.php htdocs/filefunc.inc.php	2020-02-14 19:14:26 +01:00
Laurent Destailleur	bb895cb1d8	FIX ref_client not visible in tooltip.	2020-02-13 18:00:59 +01:00
Scrutinizer Auto-Fixer	011803ac71	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-02-13 11:36:05 +00:00
Scrutinizer Auto-Fixer	17010478ba	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-02-13 09:44:08 +00:00
Laurent Destailleur	33b7fc11f0	Fix status of emailing target	2020-02-13 10:41:53 +01:00
Laurent Destailleur	495b3d54f1	Fix status of emailing target	2020-02-13 10:41:31 +01:00
Laurent Destailleur	74d3912763	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/class/fournisseur.facture.class.php	2020-02-11 16:52:58 +01:00
Laurent Destailleur	644b27bcf9	Fix look and feel v11	2020-02-10 13:34:09 +01:00
Laurent Destailleur	b9a8d82b2f	FIX Filter on list of events were lost after "Back to list"	2020-02-10 13:29:26 +01:00
Laurent Destailleur	f70dd8ec06	Clean code. Load thirdparty for correct lang before generating doc	2020-02-10 00:22:53 +01:00
Laurent Destailleur	8645fd8946	FIX CVE-2019–17223 FIX #13053	2020-02-09 18:28:57 +01:00
Laurent Destailleur	5fccbcc469	Merge pull request #13054 from hregis/10.0_mc FIX missing hook parameter	2020-02-08 16:08:13 +01:00
Laurent Destailleur	716f765ce1	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/modules/expedition/doc/pdf_espadon.modules.php	2020-02-08 16:00:06 +01:00
Laurent Destailleur	df7cdd1da8	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 Conflicts: htdocs/admin/tools/export_files.php htdocs/comm/mailing/class/advtargetemailing.class.php htdocs/core/tpl/advtarget.tpl.php	2020-02-08 15:42:35 +01:00
Laurent Destailleur	4e4fd4c76c	Remove code using a no more used field	2020-02-07 13:15:51 +01:00
Regis Houssin	a915a4faaf	FIX missing hook parameter	2020-02-07 11:14:13 +01:00
Laurent Destailleur	fe0d1a81eb	Fix filter on current user is stupi on the view "per user".	2020-02-06 21:16:48 +01:00
atm-arnaud	bd6d49f04a	FIX advanced target emailing sql and ergonomy	2020-02-06 12:08:50 +01:00
Laurent Destailleur	f3597926c4	Fix missing escape returned by ci	2020-02-06 10:05:13 +01:00
oscim	7cc87423e4	ref_ext is not in sql requete for save ref_ext is not in sql requete for save	2020-02-05 22:31:27 +01:00
Laurent Destailleur	1344ce06a5	Merge pull request #12317 from OPEN-DSI/new-propal-tooltip-note NEW add public and private notes in propal list	2020-02-05 21:41:17 +01:00
Laurent Destailleur	66590cca10	Update list.php	2020-02-05 21:40:49 +01:00
root	2419f122c4	referer XSS patches	2020-02-03 23:10:04 +00:00
Alexandre SPANGARO	d6d3fff9dc	Merge branch 'develop' into 10.0_intracommreport	2020-02-03 21:15:07 +01:00
Laurent Destailleur	4765198af2	Clean code from using deprecated field amount	2020-02-02 19:03:37 +01:00
Scrutinizer Auto-Fixer	5fda829023	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-01-30 00:48:28 +00:00
Laurent Destailleur	25f0e893ba	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-29 23:49:43 +01:00
Laurent Destailleur	1144b937eb	Fix phpcs	2020-01-29 23:34:54 +01:00
Laurent Destailleur	7b10c2440b	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-29 23:08:42 +01:00
kadogo	b2610903a4	NEW enable put for agendaevents api	2020-01-29 22:55:44 +01:00
Laurent Destailleur	80707d6a5e	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-28 17:24:26 +01:00
Laurent Destailleur	3a9e238dc6	FIX Missing value of $formconfirm as parameters of hook	2020-01-28 12:00:27 +01:00
Laurent Destailleur	51d750cb49	Merge pull request #12865 from TobiasSekan/ExportIcalWithHolidays New: Export ical with holidays	2020-01-28 03:19:34 +01:00
Tobias Sekan	ce9d1a320f	Update actioncomm.class.php after review	2020-01-27 08:27:13 +01:00
Laurent Destailleur	df478dc170	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-27 01:53:49 +01:00
Laurent Destailleur	ae087d665c	Merge pull request #12916 from RubenRuCh/11.0 Fix: strict mode mysql compatibility	2020-01-26 22:24:25 +01:00
Laurent Destailleur	0f2141269a	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/supplier_proposal/class/supplier_proposal.class.php	2020-01-25 14:43:57 +01:00
Laurent Destailleur	09f809f347	FIX #12913	2020-01-25 14:03:24 +01:00
Laurent Destailleur	27a0858050	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/product/stock/class/mouvementstock.class.php	2020-01-23 17:41:31 +01:00
AdrianDominik	d302f190a7	Fix: strict mode mysql compatibility	2020-01-23 13:29:28 +01:00
Laurent Destailleur	25665daa40	FIX #11957	2020-01-22 14:53:40 +01:00
Laurent Destailleur	59dfbc49a7	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-22 14:42:18 +01:00
Laurent Destailleur	bfc8369418	Fix phpcs	2020-01-22 14:15:08 +01:00
Laurent Destailleur	f06f15de2e	Merge pull request #12861 from TobiasSekan/ShowHolidaysInAgenda New: Show holidays in the agenda view (month, week, day)	2020-01-22 14:13:55 +01:00
Laurent Destailleur	d3411a79ef	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-22 14:11:44 +01:00
Laurent Destailleur	d87419f3db	FIX #11957	2020-01-22 13:34:07 +01:00
Laurent Destailleur	2d07a08e55	Fix init of specimen	2020-01-21 00:22:57 +01:00
Laurent Destailleur	80483fc085	Fix init of specimen	2020-01-21 00:20:03 +01:00
Laurent Destailleur	6fd717539d	Merge pull request #12887 from Dolibarr/scrutinizer-patch-5 Scrutinizer Auto-Fixes	2020-01-18 20:21:29 +01:00
Laurent Destailleur	24d439845b	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/product/stock/class/mouvementstock.class.php	2020-01-18 20:20:25 +01:00
Scrutinizer Auto-Fixer	8744f6ab7b	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-01-18 15:17:07 +00:00
Laurent Destailleur	81f8a486c9	Look and feel v11	2020-01-17 14:56:06 +01:00
stickler-ci	b47e2e8127	Fixing style errors.	2020-01-16 12:55:08 +00:00
Tobias Sekan	651bf8c1fc	Export ical with holidays	2020-01-16 13:49:05 +01:00
VESSILLER	48297759fb	Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-propal-tooltip-note	2020-01-16 10:53:57 +01:00
stickler-ci	eca59220d8	Fixing style errors.	2020-01-16 09:44:49 +00:00
Tobias Sekan	72e227a543	Add link to leave request for holidays in agenda	2020-01-16 10:37:16 +01:00
Tobias Sekan	bbd7900fc7	Show holidays in agenda	2020-01-16 10:34:45 +01:00
Laurent Destailleur	2b7e45cb09	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-15 20:13:54 +01:00
Laurent Destailleur	2c40e4be94	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-15 20:13:45 +01:00
Laurent Destailleur	98eda68afb	Fix linkg to public notes	2020-01-15 19:49:45 +01:00
Laurent Destailleur	132bb67d14	Merge pull request #12364 from aspangaro/11.0_a1 NEW Propal list - Add date start & date end	2020-01-15 17:52:55 +01:00
Laurent Destailleur	3f79c00542	Merge branch 'develop' into actioncomm_category	2020-01-15 14:21:06 +01:00
Laurent Destailleur	b47db086cb	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/product/inventory/class/inventory.class.php htdocs/product/inventory/list.php	2020-01-10 14:30:42 +01:00
Laurent Destailleur	d97a59ac4a	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 Conflicts: ChangeLog htdocs/comm/remise.php htdocs/core/class/html.form.class.php htdocs/filefunc.inc.php htdocs/product/list.php htdocs/variants/combinations.php	2020-01-10 14:25:26 +01:00
Laurent Destailleur	97f62c68f2	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-08 13:38:03 +01:00
Laurent Destailleur	622dc7e8d7	Debug v11	2020-01-07 22:01:55 +01:00
Laurent Destailleur	7ef3ee56bd	Fix MRP	2020-01-07 20:28:21 +01:00
ptibogxiv	e820af4aa0	FIX: multicompany for discount	2020-01-07 13:07:36 +01:00
Laurent Destailleur	6dcba0f053	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-04 14:27:55 +01:00
Laurent Destailleur	38de69f5a9	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 Conflicts: htdocs/admin/dict.php htdocs/comm/action/list.php htdocs/compta/bank/releve.php htdocs/compta/salaries/card.php htdocs/core/actions_addupdatedelete.inc.php htdocs/filefunc.inc.php htdocs/langs/en_US/boxes.lang htdocs/langs/en_US/main.lang htdocs/product/class/product.class.php htdocs/product/reassort.php htdocs/product/stock/product.php htdocs/projet/element.php	2020-01-04 14:20:25 +01:00
Laurent Destailleur	afd32135f2	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/takepos/invoice.php	2020-01-01 22:37:13 +01:00
Laurent Destailleur	e4a03e98b7	FIX Do not record resource owner of event when not defined. More log to track payment errors.	2020-01-01 12:47:01 +01:00
Laurent Destailleur	d2efe1d427	Fix SQL injection on type parameter in list of events	2019-12-31 17:52:28 +01:00
Frédéric FRANCE	90235d0528	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-31 13:57:40 +01:00
Alexandre SPANGARO	c664a1e42d	Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport	2019-12-31 08:34:37 +01:00
Laurent Destailleur	945296bb55	Merge pull request #12690 from atm-greg/Hook_on_ics_generation NEW hook on ics generation to add more events in eventarray	2019-12-30 22:03:07 +01:00
VESSILLER	046aba8abd	FIX indented errors	2019-12-26 10:14:05 +01:00
lvessiller-opendsi	dec64b45e8	Merge branch 'develop' into new-propal-tooltip-note	2019-12-26 10:06:38 +01:00
VESSILLER	bf1bf10a53	FIX resolve conflicts	2019-12-26 09:56:35 +01:00
VESSILLER	23b4e3ad6d	FIX resolve conflicts	2019-12-26 09:50:15 +01:00
Alexandre SPANGARO	af4b0f54c5	Merge remote-tracking branch 'upstream/develop' into 11.0_a1	2019-12-23 20:44:32 +01:00
Laurent Destailleur	dcf07646cc	Fix specimen	2019-12-21 14:02:06 +01:00
Laurent Destailleur	19c14f354e	Fix specimen	2019-12-21 14:01:40 +01:00
Laurent Destailleur	f44b85f557	Fix $_SESSION['newtoken'] must be newToken()	2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer	455178ff73	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-12-18 14:20:36 +00:00
Scrutinizer Auto-Fixer	c8baaa2995	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-12-16 12:06:25 +00:00
Laurent Destailleur	838633d0de	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/system/filecheck.php htdocs/api/class/api_setup.class.php htdocs/compta/facture/card.php htdocs/compta/stats/index.php htdocs/core/actions_massactions.inc.php htdocs/install/upgrade2.php htdocs/loan/card.php htdocs/loan/document.php htdocs/loan/info.php htdocs/loan/note.php htdocs/loan/schedule.php htdocs/product/list.php htdocs/ticket/card.php htdocs/user/class/user.class.php	2019-12-14 14:53:49 +01:00
Laurent Destailleur	d17c177251	Merge pull request #12684 from frederic34/hookagendaperuser add hook like for per day/week/month	2019-12-14 13:52:51 +01:00
Laurent Destailleur	835d22f556	Merge branch 'develop' into doxygen_todo	2019-12-14 13:46:40 +01:00
Laurent Destailleur	6a03015fa4	Fix warning	2019-12-13 16:29:58 +01:00
Laurent Destailleur	d38c73c90a	FIX output of emails from and error on emailing pages.	2019-12-13 15:52:08 +01:00
Frédéric FRANCE	57055bad03	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-13 14:36:00 +01:00
Laurent Destailleur	ce47de453e	Fix HTML5	2019-12-12 10:31:08 +01:00
Frédéric FRANCE	307bad1d2a	doxygen todo	2019-12-11 19:11:13 +01:00
atm-greg	caaa95da6a	hook on ics generation to add more events in eventarray	2019-12-11 15:33:36 +01:00
Frédéric FRANCE	5c59ddb357	add hook like for per day/week/month	2019-12-10 21:11:52 +01:00
Laurent Destailleur	f98713efdd	Update propal.class.php	2019-12-10 19:20:23 +01:00
Laurent Destailleur	452976850f	Update propal.class.php	2019-12-10 19:18:45 +01:00
David	4c463cdbb5	FIX: propal update Update fields 'date' and 'fin_validite'	2019-12-10 16:16:33 +01:00
Scrutinizer Auto-Fixer	54ca37dc65	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-12-09 09:35:58 +00:00
Laurent Destailleur	4d489f64b0	Fix getpost	2019-12-06 17:42:09 +01:00
Laurent Destailleur	796f34628d	Debug v11	2019-12-06 17:40:22 +01:00
Laurent Destailleur	a4272ab947	Debug v11	2019-12-06 09:20:45 +01:00
Laurent Destailleur	93d66d8213	Debug v11	2019-12-06 08:50:26 +01:00
Frédéric FRANCE	d9bfa62367	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-05 21:47:42 +01:00
Florian Mortgat	3f6715a377	FIX: add URL param "restore_last_search_values=1" to all backlinks that point to a list	2019-12-05 15:34:41 +01:00
Frédéric FRANCE	4c5c6b6ff1	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-03 17:56:43 +01:00
Laurent Destailleur	7a1a932755	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/action/list.php htdocs/main.inc.php	2019-12-03 15:03:10 +01:00
Laurent Destailleur	d153918a10	Fix trans	2019-12-03 15:00:52 +01:00
Laurent Destailleur	41a176ce72	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/remx.php htdocs/core/modules/modStripe.class.php htdocs/product/stock/replenish.php htdocs/stripe/payout.php	2019-12-03 13:58:15 +01:00
Laurent Destailleur	eb5a2bd1a5	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/expensereport/card.php htdocs/user/card.php	2019-12-03 13:52:42 +01:00
Laurent Destailleur	072db96b11	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-12-03 13:48:38 +01:00
Scrutinizer Auto-Fixer	36a74cd160	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-12-03 10:17:29 +00:00
Laurent Destailleur	6f7343b14f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-12-02 11:01:26 +01:00
Laurent Destailleur	6d81bc77cb	Fix look and feel v11	2019-12-02 11:00:09 +01:00
Laurent Destailleur	92070fa491	Fix name of variable $trigger_name into $triggersendname	2019-12-02 09:38:16 +01:00
Frédéric FRANCE	25ed2b930f	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-01 16:10:37 +01:00
Maxime Kohlhaas	a220d43bd6	Fix #11849 : missing price2num in discount split	2019-12-01 01:41:13 +01:00
Laurent Destailleur	a2a96f8796	# WARNING: head commit changed in the meantime Restore file for travis	2019-12-01 00:41:11 +01:00
Frédéric FRANCE	35394639a4	The property ownerid does not exist on ActionComm	2019-11-28 22:26:25 +01:00
Scrutinizer Auto-Fixer	5f99e25c45	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-28 11:36:20 +00:00
Frédéric FRANCE	b2912e688b	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-27 22:54:05 +01:00
Frédéric FRANCE	4c4ae5b6e1	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-26 08:10:40 +01:00
Frédéric FRANCE	3edac06fae	Form selectAvailabilityDelay returns void	2019-11-26 00:06:57 +01:00
Laurent Destailleur	e4d9f99484	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/remx.php htdocs/expedition/card.php htdocs/fourn/facture/card.php	2019-11-22 15:04:40 +01:00
Laurent Destailleur	9eb98ca94c	Merge pull request #12478 from ptibogxiv/patch-281 FIX display job of contact list	2019-11-22 14:26:12 +01:00
Laurent Destailleur	d487f6b84d	Clean code	2019-11-22 14:10:12 +01:00
Laurent Destailleur	3daeb24da1	Fix confusion with field name in sql	2019-11-21 13:05:13 +01:00
ptibogxiv	f73bd0e0a6	FIX display job of contact list can see différent contact with same name but different job	2019-11-20 13:07:26 +01:00
Laurent Destailleur	d7e8c71091	Look and feel v11	2019-11-20 12:45:15 +01:00
Frédéric FRANCE	d182eee4bf	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-19 23:26:00 +01:00
Laurent Destailleur	fb70893229	Fix missing class reposition	2019-11-19 21:29:49 +01:00
Frédéric FRANCE	2e5f539b2a	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-18 17:45:52 +01:00
Alexandre SPANGARO	b3e09e050c	fix missing param	2019-11-18 11:36:12 +01:00
Alexandre SPANGARO	b11579c1bd	Merge remote-tracking branch 'upstream/develop' into 11.0_a1	2019-11-18 09:26:40 +01:00
Laurent Destailleur	2689f7515c	Fix pb with colspan and extrafields. Fix remove empty id	2019-11-16 14:38:05 +01:00
Frédéric FRANCE	6784ea9fae	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-16 09:21:57 +01:00
Laurent Destailleur	4fc7b8c3b1	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/tpl/extrafields_list_search_title.tpl.php	2019-11-14 12:49:42 +01:00
Laurent Destailleur	a29adc94f3	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/comm/card.php htdocs/langs/en_US/admin.lang	2019-11-14 12:48:33 +01:00
Laurent Destailleur	9d963a7ca6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-11-14 12:44:32 +01:00
Scrutinizer Auto-Fixer	ddcc14dc16	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-14 11:09:15 +00:00
Laurent Destailleur	f5da126cff	Fix property not defined	2019-11-14 12:01:01 +01:00
Frédéric FRANCE	a3e092b227	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-14 09:21:26 +01:00
Laurent Destailleur	171b94fc5c	Merge pull request #12429 from Dolibarr/scrutinizer-patch-5 Scrutinizer Auto-Fixes	2019-11-14 08:50:24 +01:00
Laurent Destailleur	86094613e8	Merge pull request #12428 from Dolibarr/scrutinizer-patch-4 Scrutinizer Auto-Fixes	2019-11-14 08:50:06 +01:00
Frédéric FRANCE	446c66da62	use class CONST	2019-11-14 08:15:39 +01:00
Frédéric FRANCE	3bac051521	use class CONST	2019-11-14 08:07:16 +01:00
Frédéric FRANCE	9040f6d9c7	can tag actioncomm	2019-11-13 21:18:34 +01:00
Frédéric FRANCE	3ec7568559	FIX #12385	2019-11-13 20:44:21 +01:00
Scrutinizer Auto-Fixer	b40ecc3933	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer	ac40dd8bbe	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer	8a527631a0	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-13 18:35:02 +00:00
Laurent Destailleur	3430a88c72	Fix $conf not defined	2019-11-12 10:13:22 +01:00
Laurent Destailleur	c02cd80b75	Clean code	2019-11-12 10:11:30 +01:00
Scrutinizer Auto-Fixer	c85e54b08c	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-12 08:46:08 +00:00
Frédéric FRANCE	2148d6ed05	css	2019-11-11 20:33:34 +01:00
stickler-ci	bb74d2f8bd	Fixing style errors.	2019-11-10 10:00:07 +00:00
Philippe GRAND	6e0c028d51	add some comment	2019-11-10 10:59:44 +01:00
Scrutinizer Auto-Fixer	812d0af1d9	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-08 14:51:54 +00:00
Laurent Destailleur	cb1e5954f6	Fix regression	2019-11-08 13:10:41 +01:00
Laurent Destailleur	cb3fd5728b	Fix color for not busy events	2019-11-08 13:04:49 +01:00
Laurent Destailleur	dc84d7e844	Code comment	2019-11-08 11:29:56 +01:00
Laurent Destailleur	34564ea084	Merge pull request #12381 from TobiasSekan/FixIcalExportAlwaysSameUser Fix ICAL export add a user to all events	2019-11-08 11:26:57 +01:00
Tobias Sekan	3677855ebc	Fix ICAL export add a user to all events	2019-11-07 15:45:34 +01:00
Laurent Destailleur	26e95c9161	Merge pull request #12359 from TobiasSekan/FixMixedEventsWithSameTime Fix mixed order of events with same time	2019-11-07 11:43:39 +01:00
Alexandre SPANGARO	938d997e51	NEW Propal list - Add date start & date end	2019-11-07 06:33:33 +01:00
VESSILLER	bcafef42b0	NEW tooltip notes with first public note and then private note	2019-11-06 16:45:52 +01:00
Tobias Sekan	6fdbe8923f	Fix mixed order of events with same time	2019-11-06 10:33:26 +01:00
Frédéric FRANCE	35751a80ab	100% centpercent	2019-11-05 21:24:41 +01:00
Laurent Destailleur	94bd0f71d9	Fix pb with permission	2019-11-05 19:41:30 +01:00
VESSILLER	fefb4a7f95	FIX replace <br /> by <br>	2019-11-05 15:13:44 +01:00
Laurent Destailleur	ce1dec253f	FIX #11364	2019-11-05 12:47:38 +01:00
Laurent Destailleur	4ca85eacc1	Debug module BOM	2019-11-04 15:45:50 +01:00
Laurent Destailleur	11500fb8d9	FIX confusion between permto... and permisstionto...	2019-11-04 15:33:49 +01:00
VESSILLER	668bb0cb86	NEW add public and private notes in propal list	2019-11-04 11:03:39 +01:00
Laurent Destailleur	4909a21f8a	Fix css	2019-11-03 22:09:20 +01:00
Laurent Destailleur	630a150b09	Fix multicurrency rate must be visible if currency differs only	2019-11-03 17:48:16 +01:00
Laurent Destailleur	9c5e17d676	Merge pull request #12214 from homer8173/patch-8 Implement new now feature	2019-11-02 15:09:06 +01:00
Laurent Destailleur	93f3b1d2db	Clean APIs	2019-11-02 15:05:14 +01:00
Laurent Destailleur	df750b6a9d	Merge pull request #12287 from TobiasSekan/AddAttendeeToIcal NEW Add attendee to ical export + cleanup	2019-11-02 13:40:27 +01:00
Laurent Destailleur	e087ac434d	Merge pull request #12283 from frederic34/socid replace deprecated user->societe_id by user->socid	2019-11-02 13:34:21 +01:00
Laurent Destailleur	137cfe9d4c	Merge pull request #12276 from frederic34/patch-11 css	2019-11-02 13:31:34 +01:00
Laurent Destailleur	07e9e2e872	Merge pull request #12274 from frederic34/patch-7 css	2019-11-02 13:31:10 +01:00
Laurent Destailleur	d232b7a387	Merge pull request #12286 from grandoc/new_branch_01_11_2019 add some comment	2019-11-02 13:00:23 +01:00
Laurent Destailleur	58ffb73627	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-11-02 12:59:49 +01:00
Laurent Destailleur	45c77b4560	Renaming some libelle into label	2019-11-02 12:59:38 +01:00
Laurent Destailleur	25e64b0610	Merge branch 'develop' into socid	2019-11-02 12:01:06 +01:00
Laurent Destailleur	c12e66e2a2	Merge branch 'develop' into new_branch_01_11_2019	2019-11-02 12:00:04 +01:00
Laurent Destailleur	1797b49778	Merge pull request #12288 from frederic34/patch-14 form_select_status_action returns void	2019-11-02 11:48:07 +01:00
Laurent Destailleur	3943cb18c2	Merge pull request #12295 from frederic34/actioncomm_doxygen doxygen for actioncomm class	2019-11-02 11:37:30 +01:00
Laurent Destailleur	4fd20157c2	Merge pull request #12298 from frederic34/patch-22 Update propal.class.php	2019-11-02 10:08:33 +01:00
Frédéric FRANCE	77d4ca81dc	Merge remote-tracking branch 'upstream/develop' into socid	2019-11-02 09:14:15 +01:00
Laurent Destailleur	941043dd67	Fix navigation on resources	2019-11-02 00:17:08 +01:00
Laurent Destailleur	cea2c3a9f4	Look and feel v11	2019-11-01 23:58:14 +01:00
Frédéric FRANCE	dbed10a701	Merge remote-tracking branch 'upstream/develop' into socid	2019-11-01 21:39:20 +01:00
Frédéric FRANCE	693506cebd	Update propal.class.php socid is int	2019-11-01 20:26:55 +01:00
Frédéric FRANCE	bb9b435875	doxygen for actioncomm class	2019-11-01 17:12:07 +01:00
Frédéric FRANCE	400defd93d	form_select_status_action returns void	2019-11-01 15:04:37 +01:00
Laurent Destailleur	e3b5be7475	All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed into 'labelStatus'. All properties 'labelstatusshort' and 'labelstatut_short' were renamed into 'labelStatusShort'.	2019-11-01 12:52:03 +01:00
Sekan, Tobias	0bfff92032	Add attendee to ical export + cleanup	2019-11-01 11:59:54 +01:00
Philippe Grand	4b5ca5c25e	Update mailing.class.php	2019-11-01 11:15:53 +01:00
stickler-ci	0c6938aa2a	Fixing style errors.	2019-11-01 09:44:29 +00:00
Philippe GRAND	c851a9faff	add some comment	2019-11-01 10:38:58 +01:00
Laurent Destailleur	c215d534fc	Fix phpcs	2019-10-31 21:16:41 +01:00
Frédéric FRANCE	e93aaa2a75	replace deprecated user->societe_id by user->socid	2019-10-31 20:46:31 +01:00
Frédéric FRANCE	a59c3ab0be	Update index.php	2019-10-30 18:55:04 +01:00
Frédéric FRANCE	ade50b5362	css	2019-10-30 18:50:55 +01:00
Laurent Destailleur	66a288a343	Merge pull request #12235 from frederic34/scopeindent clean indent	2019-10-30 02:57:59 +01:00
Laurent Destailleur	6073692654	Merge pull request #12243 from TobiasSekan/FixEventSortNonNumeric Fix non-numeric error in sort event function	2019-10-30 02:57:00 +01:00
Laurent Destailleur	c952c7e3c2	Merge pull request #12237 from grandoc/new_branch_26_10_2019 Internationalization	2019-10-30 02:53:34 +01:00
iouston	2072768ec2	NEW : add name_alias in fields to search all	2019-10-29 11:20:10 +01:00
Tobias Sekan	bfe7ad211f	Fix non-numeric error in sort event function Fix non-numeric error in sort event function and fix mixed space and tab indent, use spaces	2019-10-28 09:53:27 +01:00
Philippe GRAND	c07dc1cd5f	Internationalization	2019-10-26 22:40:10 +02:00
Frédéric FRANCE	c44425d0a0	start clean indent in compta directory	2019-10-26 14:51:57 +02:00
Frédéric FRANCE	1a10b30a76	clean indent in comm directory	2019-10-26 14:28:40 +02:00
Norbert Penel	a67b3d8cf5	Implement new now feature `8d75e83e55`	2019-10-24 18:55:43 +02:00
Laurent Destailleur	2201b11fd3	NEW Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_SALE_PROPOSAL NEW Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_PROPOSAL	2019-10-24 13:41:04 +02:00
Laurent Destailleur	da00591bba	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/product.lib.php htdocs/expedition/card.php htdocs/product/list.php	2019-10-23 04:04:32 +02:00
Laurent Destailleur	161f2a018f	Fix responsive and bad closing td	2019-10-23 03:50:48 +02:00
Laurent Destailleur	b88968520b	Move code of extrafields to the new architecture	2019-10-22 17:08:37 +02:00
Frédéric FRANCE	86f22c4563	do not ignore lines with mix od tabs and spaces	2019-10-20 17:17:22 +02:00
Laurent Destailleur	b813dfe3c9	Merge pull request #12172 from TobiasSekan/FixMissingIcalAuthor Fix missing organizer and contact on ical export	2019-10-20 13:49:47 +02:00
Laurent Destailleur	89b0730483	Update actioncomm.class.php	2019-10-20 13:49:36 +02:00
Tobias Sekan	28dea51c4a	Fix missing organizer in ical export	2019-10-18 13:18:09 +02:00
Laurent Destailleur	f85899742b	Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen	2019-10-17 17:48:42 +02:00
Laurent Destailleur	1a021e85f6	Merge pull request #12141 from TobiasSekan/FixNoneNumericValue Fix non-numeric value encountered on ical export	2019-10-17 17:39:25 +02:00
Tobias Sekan	daa7f54295	fix - not removed old code line	2019-10-17 08:10:21 +02:00
Frédéric FRANCE	e75f7d448c	Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen	2019-10-16 20:00:01 +02:00
Laurent Destailleur	8152c60878	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/core/actions_sendmails.inc.php	2019-10-16 17:13:14 +02:00
Laurent Destailleur	f88733f46a	Html code simplest	2019-10-16 14:14:32 +02:00
Tobias Sekan	741627897e	fix interchanged allocation	2019-10-16 13:56:11 +02:00
Laurent Destailleur	a57b456aa6	Merge pull request #12143 from frederic34/patch-19 NEW Add location into event tooltip. Use full day for fullday events	2019-10-16 13:21:55 +02:00
Laurent Destailleur	e07e01580d	Replace deprecated code with new one	2019-10-16 03:34:32 +02:00
Frédéric FRANCE	ccd9da99f4	Update list.php	2019-10-15 20:11:15 +02:00
Frédéric FRANCE	6a8e8907ef	Update list.php	2019-10-15 17:55:07 +02:00
Tobias Sekan	199fb3be0f	Fix non-numeric value encountered on ical export	2019-10-15 14:29:27 +02:00
Laurent Destailleur	fb3d20107c	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog htdocs/exports/export.php htdocs/filefunc.inc.php	2019-10-15 03:51:57 +02:00
Laurent Destailleur	65b6bc26ba	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/facture/list.php	2019-10-14 23:54:24 +02:00
Laurent Destailleur	0fe3159a8a	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/fourn/facture/list.php	2019-10-14 23:52:46 +02:00
Laurent Destailleur	0d4866c38c	Merge pull request #12118 from iouston/patch-3 NEW: Add 2 hidden options to set the default sorting (sort and order) on document page	2019-10-14 21:23:59 +02:00
Laurent Destailleur	176436ec34	Update document.php	2019-10-14 21:23:52 +02:00
Laurent Destailleur	5d02763288	Merge pull request #12129 from cyrilus/develop ADD option MAIN_DONT_KEEP_NOTE_ON_CLONING to remove note on cloning	2019-10-14 20:39:08 +02:00
stickler-ci	4b7987374b	Fixing style errors.	2019-10-14 14:46:04 +00:00
iouston	0a9cc96564	Update document.php Add 2 hidden options for set by default a sort (sort and order) on document page	2019-10-14 15:01:57 +02:00
Laurent Destailleur	9efc5a1b9d	Fix extension	2019-10-13 15:00:07 +02:00
Laurent Destailleur	33f6206031	NEW Add link to export target of emailings into a CSV file.	2019-10-12 20:12:24 +02:00
Laurent Destailleur	9c94ffeea9	Fix css	2019-10-12 18:40:41 +02:00
Laurent Destailleur	9ba992b8b6	Work on inventory module	2019-10-12 12:31:35 +02:00
Frédéric FRANCE	849eda2023	Update index.php	2019-10-12 00:05:26 +02:00
Frédéric FRANCE	c3e8aec07c	fix translation for showemailing in lang files, it's ShowEMailing not ShowEmailing	2019-10-11 23:54:05 +02:00
Laurent Destailleur	f345b5fdb0	Fix look and feel v10	2019-10-11 19:32:45 +02:00
Laurent Destailleur	a8676e63c8	CSS	2019-10-10 16:46:50 +02:00
ro@t.com	2149b155d1	ADD option MAIN_DONT_KEEP_NOTE_ON_CLONING to remove note on cloning	2019-10-10 15:57:26 +02:00
Laurent Destailleur	b6c600c171	css	2019-10-10 11:44:03 +02:00
Laurent Destailleur	51ef2cd20a	FIX #12058	2019-10-07 20:20:06 +02:00
Laurent Destailleur	07d1a3fe8b	css	2019-10-07 18:17:22 +02:00
Laurent Destailleur	c83f40fc7e	Debug contact by default	2019-10-07 15:42:37 +02:00
Laurent Destailleur	f56da782ab	Merge pull request #12038 from Ahuahuachi/develop NEW Add hidden options to send by email even for draft status	2019-10-07 14:18:53 +02:00
Laurent Destailleur	d4f4f33122	Merge pull request #12048 from frederic34/patch-17 Update card.php	2019-10-07 10:23:51 +02:00
Laurent Destailleur	866dcf18fe	Look and feel v11	2019-10-06 15:34:22 +02:00
Laurent Destailleur	2b66282b61	NEW Code for extrafields uses the new array $extrafields->attributes	2019-10-06 14:41:52 +02:00
Frédéric FRANCE	bfd8bc839e	Update card.php	2019-10-06 10:28:09 +02:00
Alfredo Altamirano	140784d741	Merge remote-tracking branch 'Dolibarr/develop' into develop	2019-10-03 20:32:26 -05:00
Alfredo Altamirano	b6882af1b6	Add hidden options to send by email for all status	2019-10-03 20:21:13 -05:00
Laurent Destailleur	b60ee4c18c	css	2019-10-03 09:58:49 +02:00
Laurent Destailleur	24570f7165	Look and feel v11. Picto are fontawesome.	2019-10-02 18:14:41 +02:00
Laurent Destailleur	320e9bbeec	Text on tooltip can also be clickable	2019-10-02 15:54:42 +02:00
Laurent Destailleur	c6d38227b6	NEW Use a dedicated css for the pencil to edit a field	2019-10-02 14:44:38 +02:00
Laurent Destailleur	8ad81a092a	Clean code	2019-10-01 16:19:54 +02:00
Alexandre SPANGARO	16c6c9ae75	Merge remote-tracking branch 'upstream/develop' into 11.0_https	2019-10-01 06:12:24 +02:00
Alexandre SPANGARO	91b3bf76fd	Merge branch 'develop' into 11.0_https	2019-10-01 06:11:43 +02:00
Frédéric FRANCE	fec67aade4	Merge remote-tracking branch 'upstream/develop' into zapier	2019-09-30 18:44:34 +02:00
Laurent Destailleur	d3eafa86d7	Merge pull request #11988 from frederic34/patch-12 Add hook beforeAgenda in comm/action/index.php	2019-09-30 18:03:25 +02:00
Laurent Destailleur	ce7e8c83a3	Use a dedicated css imgforviewmode for button used to switch view	2019-09-30 17:08:57 +02:00
Frédéric FRANCE	4a305ec95c	Add hook beforeAgenda in comm/action/index.php	2019-09-30 15:59:05 +02:00
Laurent Destailleur	d8de78dca9	Merge pull request #11984 from fuhraih/develop Fix 11554 and 7533	2019-09-30 15:31:41 +02:00
Laurent Destailleur	b28cd1bb57	Merge pull request #11972 from aspangaro/11.0_fa_icon NEW Add fa_icon on load_fiche_titre	2019-09-30 15:26:28 +02:00
Alexandre SPANGARO	aec50d3ac9	NEW Add fa_icon on load_fiche_titre	2019-09-30 10:14:55 +02:00
Frédéric FRANCE	258424416e	Merge remote-tracking branch 'upstream/develop' into zapier	2019-09-30 07:49:52 +02:00
Laurent Destailleur	a2140412e0	Fix title	2019-09-30 00:41:38 +02:00
Laurent Destailleur	2b57d486dc	NEW Upgrade ACE editor to v1.4.6	2019-09-28 13:50:32 +02:00
Laurent Destailleur	86e5465197	Standardize extrafields code	2019-09-28 10:55:09 +02:00
Alexandre SPANGARO	288aea190b	Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon	2019-09-28 06:09:40 +02:00
Alexandre SPANGARO	7f93f046e9	NEW Add fa_icon on load_fiche_titre	2019-09-28 06:02:25 +02:00
fuhraih	5757159c30	FIX #7533 Infinite loop in Agenda per user view if workinghours not set correctly Remove the spaces in the Working_hours and Working_days stored	2019-09-27 22:29:12 +02:00
Laurent Destailleur	c5e7413ed2	Merge branch 'develop' into fix-resource-event-move-check-busy	2019-09-27 15:35:14 +02:00
Laurent Destailleur	34813a931f	Merge branch 'develop' into patch-10	2019-09-27 14:45:09 +02:00
Laurent Destailleur	f90bfb54d4	Merge pull request #11913 from frederic34/actioncommcarddoaction add doaction to actioncommcard	2019-09-27 14:34:49 +02:00
Laurent Destailleur	138b494b98	Merge pull request #11936 from aspangaro/11.0_translation Translate and some fix	2019-09-27 12:15:50 +02:00
Frédéric FRANCE	41cb628d05	Merge remote-tracking branch 'upstream/develop' into zapier	2019-09-25 08:06:44 +02:00
Laurent Destailleur	961f2b5165	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/categories/viewcat.php htdocs/fourn/class/fournisseur.product.class.php htdocs/takepos/invoice.php	2019-09-24 14:25:02 +02:00
Laurent Destailleur	5838fa1229	Fix az09 -> aZ09	2019-09-24 14:20:45 +02:00
Laurent Destailleur	db334a3b94	FIX Var not enough sanitized	2019-09-24 14:16:24 +02:00
Alexandre SPANGARO	02dbc11f98	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
Alexandre SPANGARO	1c13a38ce9	Typo abscissa	2019-09-23 21:45:23 +02:00
Laurent Destailleur	40f75b16d8	FIX Substitution of __PROJECT_XXX__ not done	2019-09-23 13:04:22 +02:00
VESSILLER	ea5ff59076	FIX check if a resource is in use after a drag and drop from events	2019-09-17 16:43:36 +02:00
Frédéric FRANCE	850b9fd52a	Merge remote-tracking branch 'upstream/develop' into zapier	2019-09-17 08:24:31 +02:00
Frédéric FRANCE	155e8fb500	fix syntax	2019-09-17 08:18:01 +02:00
Frédéric FRANCE	0d63c43ccd	add doaction to actioncommcard	2019-09-17 08:15:01 +02:00
Frédéric FRANCE	ecac1f9f40	wip	2019-09-17 08:02:55 +02:00
Frédéric FRANCE	a2d3cde291	some update after night	2019-09-17 07:59:46 +02:00
Frédéric FRANCE	fb7ef3cefc	Update card.php	2019-09-16 23:12:11 +02:00
Frédéric FRANCE	f369c1a80a	Update card.php	2019-09-16 20:59:13 +02:00
Frédéric FRANCE	67b73cf0e6	Update actioncomm.class.php	2019-09-16 20:57:20 +02:00
Laurent Destailleur	434ab2965a	Merge pull request #11820 from OPEN-DSI/new-resource-add-event-check-busy NEW check if a resource is in use in an event	2019-09-15 15:47:07 +02:00
Laurent Destailleur	4d0ef33471	FIX #11857	2019-09-15 15:43:03 +02:00
Frédéric FRANCE	c9c7d60fc0	Merge remote-tracking branch 'upstream/develop' into zapier	2019-09-14 16:37:10 +02:00
Laurent Destailleur	56a99f6e6d	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-09-12 11:22:13 +02:00
Laurent Destailleur	db900cb5ea	FIX EDB-ID:47370	2019-09-11 17:51:50 +02:00
Laurent Destailleur	61cf47aa16	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-09-10 00:14:07 +02:00
Laurent Destailleur	66a9fabd06	If you develop your own emailing target selector and used parent::add_to_target(...), you must now use parent::addToTargets(...)	2019-09-09 14:18:25 +02:00
Laurent Destailleur	28ba5abb89	Clean code	2019-09-09 13:31:14 +02:00
VESSILLER	66611f4097	FIX rename "resource" (reserved) by "dolresource"	2019-09-09 09:29:43 +02:00
Frédéric FRANCE	bd4c9a64a8	wip	2019-09-07 14:48:25 +02:00
Laurent Destailleur	a5f7211730	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/accountancy/bookkeeping/balance.php htdocs/install/repair.php	2019-09-06 16:10:55 +02:00
Laurent Destailleur	529dd05226	Replace deprecated code	2019-09-06 10:53:05 +02:00
Laurent Destailleur	bb81f66a1a	Add phpunit test for Lessc	2019-09-06 10:36:49 +02:00
VESSILLER	815d0bbc20	FIX rename "dolresource" into "resource" for compatibility with PR 11822	2019-09-05 11:57:12 +02:00
VESSILLER	9ed09db93c	FIX replace "<br />" by "<br>"	2019-09-05 09:41:15 +02:00
VESSILLER	4ef7e755ad	FIX only check on busy resources before updating an event	2019-09-05 09:29:40 +02:00
VESSILLER	b70587c150	NEW check if a resource is in use in an event	2019-09-04 15:14:16 +02:00
Laurent Destailleur	750182f9cd	Removed deprecated method actioncomm->add(), use create() instead	2019-09-04 13:54:36 +02:00
Laurent Destailleur	da3d230182	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: .stickler.yml htdocs/takepos/invoice.php	2019-09-03 17:34:49 +02:00
Laurent Destailleur	c32100c714	Merge pull request #11768 from atm-florian/10_fixeventlist fix event list with description	2019-09-03 15:02:22 +02:00
Laurent Destailleur	52a543953c	Fix position of tests	2019-09-03 14:58:54 +02:00
Laurent Destailleur	17ccb8fa10	Fix missing tooltip	2019-09-03 14:56:13 +02:00
Laurent Destailleur	a95e02e3f6	FIX #11789 FIX #11790	2019-09-03 14:52:03 +02:00
Laurent Destailleur	98459363df	Merge pull request #11795 from jtraulle/fix-doxygen-examples Fix Wrongly catched examples by Doxygen	2019-09-03 12:45:23 +02:00
Laurent Destailleur	6c96478040	Removed deprecated code	2019-09-02 22:57:55 +02:00
Laurent Destailleur	f54d4e3fc2	Replace deprecated code with new one	2019-08-31 02:34:54 +02:00
Laurent Destailleur	4a76dfa6ff	Fix link to setup	2019-08-30 18:23:43 +02:00
Jean Traullé	c32c7d48ba	Fix Wrongly catched examples by Doxygen	2019-08-30 17:14:59 +02:00
Laurent Destailleur	05c9e97fe4	The deprecated method get_OutstandingBill has been removed. You can use getOutstandingBills() instead.	2019-08-29 00:45:02 +02:00
Laurent Destailleur	cb8bee7899	Responsive	2019-08-28 19:48:20 +02:00
Laurent Destailleur	9fd4f839ec	Use css "pictomodule" for picto of modules	2019-08-28 19:28:50 +02:00
Laurent Destailleur	931586269a	Fix td	2019-08-28 18:23:41 +02:00
Laurent Destailleur	042e9df720	Sort	2019-08-28 18:20:19 +02:00
Laurent Destailleur	d668b79738	NEW Add column tms into the table of targets for emailing	2019-08-28 18:14:46 +02:00
florian HENRY	243fca9a1a	fix event list with description	2019-08-27 16:12:07 +02:00
Laurent Destailleur	d304749eca	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-08-19 10:19:14 +02:00
Laurent Destailleur	18886c701d	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/comm/action/class/actioncomm.class.php htdocs/core/lib/company.lib.php	2019-08-19 00:02:26 +02:00
Laurent Destailleur	3f105a97bf	Debug the new workboard	2019-08-18 04:56:48 +02:00
Laurent Destailleur	5351d78a96	Merge branch 'develop' into develop_new_dashboard	2019-08-18 01:26:56 +02:00
Laurent Destailleur	b1be6bf4f2	FIX #11422 Can't edit his own events with standard rights	2019-08-18 01:24:54 +02:00
Laurent Destailleur	8874a0f3c1	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-08-15 23:39:11 +02:00
Laurent Destailleur	386f929fe3	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/core/lib/website.lib.php htdocs/core/modules/facture/doc/pdf_sponge.modules.php	2019-08-15 23:39:02 +02:00
Laurent Destailleur	6430c74793	Merge pull request #11168 from hregis/develop_menu NEW add new function "setEntity()" and better compatibility with Multicompany	2019-08-15 21:00:05 +02:00
Laurent Destailleur	f26a13ff13	NEW Removed deprecated code that create linked object from ->origin	2019-08-15 19:50:18 +02:00
Laurent Destailleur	ac8bf7b066	Update propal.class.php	2019-08-15 19:48:29 +02:00
Regis Houssin	7c8b3c9a38	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-08-13 07:34:02 +02:00
Juanjo Menent	7dab396d08	Fix: error creating a budget from an intervention	2019-08-12 17:29:25 +02:00
Laurent Destailleur	63efe82ff3	Merge pull request #11639 from ptibogxiv/patch-213 NEW list by date_cloture on propal list	2019-08-10 01:07:07 +02:00
Laurent Destailleur	14fabeb377	Variable rangtouse -> ranktouse	2019-08-10 00:46:20 +02:00
ptibogxiv	4de68397ae	NEW list by date_cloture on propal list	2019-08-05 21:03:48 +02:00
John Botella	b4c4e5a662	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard	2019-08-02 14:52:01 +02:00
Laurent Destailleur	d0de3ef08d	Merge pull request #11603 from bafbes/abb100067 Fix:syntax error in sql query	2019-08-01 16:06:01 +02:00
Laurent Destailleur	d7a41c6b72	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/en_US/admin.lang	2019-08-01 12:54:27 +02:00
John Botella	9b84987cc1	prepare new dashboard	2019-08-01 12:33:19 +02:00
Laurent Destailleur	5eb8f05061	FIX #11584	2019-08-01 12:23:02 +02:00
Abbes Bahfir	bf2d052d62	Fix:syntax error in sql query	2019-07-31 17:48:17 +01:00
Regis Houssin	d9ea61e47c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu Conflicts: htdocs/commande/class/commande.class.php	2019-07-31 12:49:56 +02:00
Laurent Destailleur	11e3aa5860	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-29 11:07:11 +02:00
Laurent Destailleur	7931f0b422	Fix sql error	2019-07-29 11:06:39 +02:00
Laurent Destailleur	a5e3adc6f1	Fix travis	2019-07-29 10:51:17 +02:00
Laurent Destailleur	db461792a0	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-29 01:36:35 +02:00
Laurent Destailleur	9a7113f4f5	FIX Update the file index table when we validate/rename a ref.	2019-07-28 22:26:55 +02:00
Laurent Destailleur	9f7d118f6f	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-27 02:40:56 +02:00
Laurent Destailleur	2867e31a63	Fix CSS	2019-07-27 01:13:39 +02:00
Laurent Destailleur	bef3423764	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/en_US/admin.lang	2019-07-22 19:12:27 +02:00
Laurent Destailleur	9f95b10d0e	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/comm/action/list.php htdocs/comm/action/peruser.php htdocs/compta/prelevement/card.php htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php	2019-07-22 19:11:27 +02:00
Laurent Destailleur	f39f710fd9	Merge pull request #11538 from atm-maxime/fix_agenda_list_filter Fix lost filter in action list	2019-07-22 18:44:22 +02:00
Alexandre SPANGARO	2c74caff90	WIP	2019-07-22 06:56:55 +02:00
Maxime Kohlhaas	7ec8b48b18	Fix lost filter in action list	2019-07-21 22:21:11 +02:00
florian HENRY	b046bcc197	fix warning php	2019-07-20 15:19:25 +02:00
florian HENRY	d03d79222e	fix warning php	2019-07-20 15:15:48 +02:00
florian HENRY	d88fec52bf	fix warining message	2019-07-20 15:07:59 +02:00
Laurent Destailleur	865ebb9de2	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/ticket/class/ticket.class.php	2019-07-20 13:29:10 +02:00
Laurent Destailleur	e5c3945ec3	FIX delete of links between objects	2019-07-19 18:10:45 +02:00
Regis Houssin	cbda42d146	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-07-19 09:37:34 +02:00
Laurent Destailleur	fc31a1182b	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-18 18:54:50 +02:00
Laurent Destailleur	58428cefc0	Fix phpcs	2019-07-18 18:53:51 +02:00
Laurent Destailleur	50480bf517	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/opensurvey/index.php	2019-07-18 18:23:24 +02:00
Laurent Destailleur	3cffd70ed3	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/compta/prelevement/create.php htdocs/core/class/commonobject.class.php htdocs/expedition/card.php htdocs/expedition/class/expedition.class.php htdocs/fourn/commande/dispatch.php htdocs/fourn/product/list.php htdocs/opensurvey/index.php htdocs/ticket/index.php htdocs/ticket/list.php	2019-07-18 18:09:37 +02:00
Laurent Destailleur	a20a121558	Merge pull request #11522 from atm-john/9.0_fix_action_list_contact_assigned FIX: socpeople assigned list in action com list	2019-07-18 17:20:41 +02:00
John Botella	b5d348356d	Fix socpeople assigned list in action com list	2019-07-17 16:49:41 +02:00
Marc de Lima Lucio	464bda996c	FIX: propal createFrom hook: undefined parameter attached	2019-07-16 13:59:00 +02:00
Laurent Destailleur	0a7d70829f	Translation of some comments	2019-07-05 21:37:25 +02:00
Laurent Destailleur	2fee41f712	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-04 12:27:00 +02:00
Laurent Destailleur	8e3620fce1	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/compta/facture/invoicetemplate_list.php	2019-07-04 12:26:17 +02:00
Laurent Destailleur	ee0a65e7fa	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/comm/action/card.php	2019-07-04 12:22:40 +02:00
Ferran Marcet	433835860c	FIX: When saving an action it didn't save the label based on the type of event if the label is empty and the type is customized	2019-07-03 13:12:41 +02:00
Laurent Destailleur	adb3062a9f	Work on nblignes -> nblines	2019-06-29 16:38:14 +02:00
ptibogxiv	7f11077f1e	Update propal.class.php	2019-06-25 18:16:11 +02:00
ptibogxiv	df0d540ffb	Update propal.class.php	2019-06-25 15:47:16 +02:00
Laurent Destailleur	fa476b4994	Properties ->libelle_incoterms were renamed into ->label_incoterms	2019-06-25 13:00:02 +02:00
Laurent Destailleur	5675e7c50e	Clean code of deprecated method	2019-06-22 18:19:40 +02:00
Laurent Destailleur	403d41ec30	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-06-22 11:55:33 +02:00
Laurent Destailleur	18348fea93	Fix sort on date on agenda list	2019-06-22 11:34:16 +02:00
Laurent Destailleur	a264a4766a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-06-20 03:45:04 +02:00
Laurent Destailleur	e99cf13ccf	Merge pull request #11225 from ATM-Nicolas/new_propal_list_column NEW Add hidden option PROPOSAL_SHOW_INVOICED_AMOUNT (not reliable if one invoice is done on several order or several proposal)	2019-06-20 03:27:45 +02:00
Nicolas ZABOURI	2e4db8c83c	Merge remote-tracking branch 'Dolibarr/10.0' into MissingHook	2019-06-19 08:39:05 +02:00
ICstage	820c420ae5	FIX Missing hooks	2019-06-18 14:07:52 +02:00
Frédéric FRANCE	f1d64ad164	Update peruser.php	2019-06-17 23:02:54 +02:00
Laurent Destailleur	a74eaaff4d	Fix sort of linked elements	2019-06-17 15:54:54 +02:00
Regis Houssin	6597c9f60d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-06-17 06:45:08 +02:00
Laurent Destailleur	e8b139d1c6	Fix repeated logs and fetch	2019-06-13 22:48:31 +02:00
Laurent Destailleur	900e860f6d	Fix list of events for BOM module	2019-06-12 19:32:29 +02:00
Laurent Destailleur	2be5e9615d	Fix look and field v10	2019-06-12 19:03:22 +02:00
Laurent Destailleur	330842d67e	Update list.php	2019-06-12 13:14:44 +02:00
Laurent Destailleur	f6d8b46b40	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/comm/action/card.php htdocs/fichinter/card.php	2019-06-07 22:58:58 +02:00
Frédéric FRANCE	ad95b66842	Warning: A non-numeric value encountered	2019-06-06 10:12:01 +02:00
Laurent Destailleur	21a1e0d7b3	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/categories/index.php htdocs/comm/action/list.php htdocs/comm/action/rapport/index.php htdocs/compta/paiement.php htdocs/compta/sociales/document.php htdocs/compta/tva/document.php htdocs/core/actions_massactions.inc.php htdocs/core/class/commonobject.class.php htdocs/fourn/facture/paiement.php htdocs/loan/document.php htdocs/main.inc.php	2019-06-04 19:03:27 +02:00
Laurent Destailleur	ba68e3d7ff	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/website/class/website.class.php	2019-06-04 18:47:22 +02:00
Laurent Destailleur	36df2f1026	Fix css	2019-06-04 18:45:01 +02:00
Laurent Destailleur	7b3242693b	FIX default value for duration of validity can be set from generic feature.	2019-06-04 18:17:07 +02:00
Regis Houssin	fc83585574	FIX use setEntity() to move code in multicompany module	2019-06-03 11:37:04 +02:00
Regis Houssin	7b8b1a9052	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-06-03 11:04:28 +02:00
Laurent Destailleur	57cfb4b007	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/core/actions_massactions.inc.php htdocs/website/class/website.class.php	2019-06-02 12:36:07 +02:00
Maxime Kohlhaas	6dd01e86e9	Fix : avoid warning and uniformize var use	2019-05-31 15:53:23 +02:00
Frédéric FRANCE	48d15032af	Update linkedobjectblock.tpl.php	2019-05-29 11:28:07 +02:00
Laurent Destailleur	2218994958	FIX Duplicate encoding on error message	2019-05-29 09:51:45 +02:00
Laurent Destailleur	15de8a9497	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/mailing/card.php	2019-05-27 19:25:53 +02:00
Laurent Destailleur	1c6ddd25c4	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-05-27 19:23:54 +02:00
Laurent Destailleur	93c395fe10	FIX confirmation of mass email sending + option MAILING_NO_USING_PHPMAIL	2019-05-27 19:22:51 +02:00
Regis Houssin	4f2f23f522	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-05-22 08:45:31 +02:00
Laurent Destailleur	45e6c14594	Merge pull request #11226 from ATM-Nicolas/fix_icon_with_padding FIX : Padding on create project icon	2019-05-21 22:41:52 +02:00
Laurent Destailleur	a93cbd4320	FIX Look and feel v10	2019-05-21 21:47:25 +02:00
Laurent Destailleur	c3b9c08219	CSS	2019-05-21 21:36:48 +02:00
Laurent Destailleur	fdeb12a909	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/mailing/card.php	2019-05-21 21:18:40 +02:00
Laurent Destailleur	a7f5f3fb94	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-05-21 21:16:54 +02:00
Laurent Destailleur	dcf77520ea	FIX Error management when MAILING_NO_USING_PHPMAIL is set	2019-05-21 21:16:06 +02:00
Laurent Destailleur	22e897b1a1	Clean and prepare code to fix a SQL injection	2019-05-21 17:22:38 +02:00
Laurent Destailleur	eafc35b00f	Look and feel v10	2019-05-21 13:27:45 +02:00
Regis Houssin	2cf630c213	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-05-20 16:10:47 +02:00
ATM-Nicolas	5def839813	FIX : Padding on create project icon	2019-05-20 11:56:26 +02:00
ATM-Nicolas	d58603bd1e	Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_propal_list_column	2019-05-20 09:13:37 +02:00
ATM-Nicolas	6be48e6952	NEW : Amount HT invoiced column in propal list	2019-05-20 08:59:44 +02:00
Laurent Destailleur	5f23cf7e2a	CSS	2019-05-19 13:51:47 +02:00
Laurent Destailleur	c6ccb92a51	Fix table shown when there is no perm Fix edit admin status of another admin	2019-05-19 01:41:42 +02:00
florian HENRY	ebe37df9db	scrunitizer	2019-05-18 16:19:44 +02:00
florian HENRY	47ae988b57	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop	2019-05-18 16:18:22 +02:00
florian HENRY	12a8008107	scrunitizer	2019-05-18 16:18:14 +02:00
Laurent Destailleur	11fea03074	Merge pull request #11026 from atm-john/new_look_and_feel_title_button NEW : look and feel title button	2019-05-18 16:04:47 +02:00
Regis Houssin	b73df2698d	FIX better compatibility with Multicompany	2019-05-12 14:25:41 +02:00
Laurent Destailleur	3def11d5c9	Standardize translation	2019-05-10 19:32:46 +02:00
Laurent Destailleur	aaeb7dc9d6	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/holiday.php htdocs/comm/propal/list.php htdocs/commande/list.php htdocs/filefunc.inc.php htdocs/product/list.php	2019-05-10 17:45:33 +02:00
Laurent Destailleur	9de0e69456	FIX column project into list	2019-05-10 15:11:06 +02:00
Laurent Destailleur	22c548e80b	Fix sql	2019-05-10 14:46:43 +02:00
Laurent Destailleur	5625c94c44	Fix missing label on project tooltip	2019-05-10 14:40:15 +02:00
Laurent Destailleur	0e8184332e	Fix missing label on project tooltip	2019-05-10 14:39:05 +02:00
Laurent Destailleur	d8c1c24028	Fix syntax error	2019-05-09 19:46:10 +02:00
Laurent Destailleur	a5b1de4f6a	Fix tab that should not be visible	2019-05-09 17:52:55 +02:00
ATM-Nicolas	77d3f22163	NEW : Amount invoiced column in propal list	2019-05-07 14:39:16 +02:00
ATM-Nicolas	ab3ad77704	FIX : Sale representative column didn't increase nbfield variable on proposal list	2019-05-03 10:55:51 +02:00
Laurent Destailleur	4f9ea912ab	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/website.inc.php	2019-05-02 14:41:56 +02:00
Laurent Destailleur	79754eb326	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/comm/remx.php	2019-05-02 14:39:30 +02:00
Laurent Destailleur	90a1181dc5	Debug module Ticket	2019-05-01 20:41:03 +02:00
Frédéric FRANCE	d9a1c2b235	Fix do not delete all discount when splitting	2019-04-30 13:54:50 +02:00
Laurent Destailleur	ee5d50b905	css	2019-04-27 13:25:21 +02:00
Laurent Destailleur	091132de2f	Signatures of methods createFromClone() has been standardized. All methods requires the object User as first parameter.	2019-04-25 12:11:32 +02:00
Abbes Bahfir	dccc8b0be3	Fix:Same action in both cases	2019-04-24 08:48:36 +01:00
Laurent Destailleur	3b04d2fe9b	Fix warnings	2019-04-23 13:21:17 +02:00
Laurent Destailleur	7f4b09c482	Fix warnings	2019-04-23 13:20:44 +02:00
Laurent Destailleur	4d92d7731c	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/sendings.lib.php htdocs/langs/en_US/admin.lang htdocs/theme/eldy/style.css.php	2019-04-23 12:32:08 +02:00
Laurent Destailleur	84ec39f043	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-04-23 12:25:53 +02:00
Laurent Destailleur	bf7fcce1b2	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-04-23 12:24:25 +02:00
florian HENRY	f412ce6a9c	fix #11023	2019-04-17 10:49:39 +02:00
Laurent Destailleur	e6ffaeefe5	CSS	2019-04-17 10:39:30 +02:00
Laurent Destailleur	212b058f46	Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop	2019-04-17 01:18:46 +02:00
Laurent Destailleur	b5bf6830e9	Introduce method convertBackOfficeMediasLinksToPublicLinks so links to media added from filemanager in notes are visible by PDFs builder.	2019-04-17 01:13:59 +02:00
Laurent Destailleur	5c53044863	Merge pull request #11024 from ATM-Marc/FIX_7.0_sort_events FIX: actioncomm: sort events by date after external calendars and hook	2019-04-16 23:28:30 +02:00
Laurent Destailleur	c0defe3965	Update index.php	2019-04-16 23:27:45 +02:00
Marc de Lima Lucio	1669d497b4	FIX: actioncomm: sort events by date after external calendars and hook	2019-04-16 17:36:27 +02:00
ATM john	292d9c38a5	Appli function to links	2019-04-15 00:21:58 +02:00
ATM john	29b31bd7ab	New title button first step	2019-04-11 00:38:44 +02:00
Laurent Destailleur	d7f980fda0	NEW Add picto of deletion on mass action combo lists	2019-04-09 01:22:59 +02:00
Laurent Destailleur	7b01e76d2b	Fix doxygen	2019-04-08 16:04:15 +02:00
Frédéric FRANCE	4d43cd4927	Update card.php	2019-04-05 14:46:31 +02:00
Laurent Destailleur	1b2826f476	Look and feel v10	2019-03-29 13:26:26 +01:00
Laurent Destailleur	661a984b8e	Merge pull request #10880 from altatof/condpay allow empty value for payment conditions like in orders	2019-03-26 20:53:20 +01:00
Laurent Destailleur	a34f4c2806	Merge pull request #10909 from IonAgorria/fix-line-dates FIX: Disallow line start date after end date	2019-03-26 19:43:11 +01:00
Laurent Destailleur	f27f65e8bf	Responsive	2019-03-25 10:09:02 +01:00
Ion	7bfa49b29c	FIX: Disallow line start date > end date	2019-03-24 14:30:00 +01:00
Laurent Destailleur	28fede950f	Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION	2019-03-22 13:00:48 +01:00
Laurent Destailleur	a7181750c6	Merge pull request #10879 from altatof/noconcatdesc NEW : add constant NO_CONCAT_DESCRIPTION	2019-03-22 12:56:46 +01:00
Philippe GRAND	62d63e399e	translation	2019-03-22 09:41:22 +01:00
Laurent Destailleur	48a0c447b4	Fix test on draft status regression	2019-03-21 21:00:06 +01:00
Laurent Destailleur	930720decd	WIP Start to replace use of property ->brouillon	2019-03-21 18:13:51 +01:00
Laurent Destailleur	90df30e412	NEW Add trigget FICHINTER_UNVALIDATE Standardize code of setDraft.	2019-03-21 17:37:56 +01:00
Frédéric FRANCE	013e536f32	Update actioncomm.class.php	2019-03-19 12:49:54 +01:00
Laurent Destailleur	b10690ce88	Merge pull request #10874 from grandoc/translation translation	2019-03-19 11:14:40 +01:00
Christophe Battarel	bd542b6b22	allow empty value for payment conditions like in orders	2019-03-18 16:39:59 +01:00
Christophe Battarel	8b3fd2eacf	NEW : add constant NO_CONCAT_DESCRIPTION	2019-03-18 16:10:17 +01:00
Philippe GRAND	0f03b16313	translation	2019-03-18 12:46:32 +01:00
Philippe Grand	7942903548	Update actioncomm.class.php	2019-03-18 12:24:16 +01:00
Philippe GRAND	76a4792cd2	Merge remote-tracking branch 'upstream/develop' into new_branch_18_03_2019	2019-03-18 12:11:57 +01:00
Laurent Destailleur	de554750e4	Merge pull request #10802 from altatof/propindex Harmonize propal index pages	2019-03-18 10:56:10 +01:00
Laurent Destailleur	22d61cd44d	Update index.php	2019-03-18 10:55:44 +01:00
Laurent Destailleur	7adba419fc	Update index.php	2019-03-18 10:54:45 +01:00
Laurent Destailleur	d8c1a50291	Update index.php	2019-03-18 10:53:58 +01:00
Philippe GRAND	198cf4af2f	add comments	2019-03-18 10:06:22 +01:00
Laurent Destailleur	7cdfff7263	Fix syntax error	2019-03-15 20:42:49 +01:00
Laurent Destailleur	c0b6699b25	All methods set_draft() were renamed into setDraft()	2019-03-15 19:01:40 +01:00
Laurent Destailleur	0afbd70c2c	Merge pull request #10833 from grandoc/new_branch_14_03_2019 update with html5 compliant code	2019-03-14 18:04:06 +01:00
Laurent Destailleur	d4f2a16abf	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/admin/productaccount.php	2019-03-14 17:10:58 +01:00
Laurent Destailleur	cdf6e4b65a	Fix some PSR rules	2019-03-14 16:43:27 +01:00
John BOTELLA	31e588dbab	fix hookmanager global	2019-03-14 16:13:32 +01:00
John BOTELLA	8bc795c055	Fix missing hook for export agenda	2019-03-14 15:19:38 +01:00
Philippe GRAND	43b827aae7	update with html5 compliant code	2019-03-14 14:07:26 +01:00
Laurent Destailleur	e7cd8d690c	Remove warnings	2019-03-13 19:06:45 +01:00
Laurent Destailleur	eeafc3c630	Standardize translation of amount	2019-03-13 14:10:36 +01:00
Laurent Destailleur	98ca9bf17a	Reduce quantity of string to translates	2019-03-12 19:44:59 +01:00
Joan Louis	17647de4cc	Fix extrafields calls from cards for Dolibarr 8 See #10803	2019-03-12 11:24:54 +01:00
Christophe Battarel	2726cc335d	replace align by css align	2019-03-12 10:24:11 +01:00
Joan Louis	f326c75be7	Update call to extrafields from cards	2019-03-11 21:34:16 +01:00
Laurent Destailleur	e913f1919f	Merge pull request #10803 from joanlouis/fix-extrafields-calls-from-cards Update call to extrafields from cards	2019-03-11 21:14:53 +01:00
Laurent Destailleur	abdc2aa21a	Fix phpcs	2019-03-11 21:03:23 +01:00
Laurent Destailleur	3559d600e2	Merge pull request #10770 from atm-john/theme_badge_status Add badge status css part1	2019-03-11 20:49:31 +01:00
Laurent Destailleur	052d29d946	Fix phpcs	2019-03-11 20:45:28 +01:00
Laurent Destailleur	6daa262779	Files for variables of themes were renamed from graph-color.php into theme_vars.inc.php to match naming convention of extension .inc.php for files to be included.	2019-03-11 20:32:25 +01:00
John BOTELLA	57c6c60118	Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status	2019-03-11 14:44:35 +01:00
Joan Louis	ee5753819e	Update call to extrafields from cards	2019-03-11 14:22:04 +01:00
Christophe Battarel	be612a1f6e	harmonize propal index pages	2019-03-11 12:58:03 +01:00
John BOTELLA	97544e0aea	add new dolGetStatus to LibStatut in common invoice class	2019-03-07 15:24:11 +01:00
Laurent Destailleur	a40a08bada	Merge pull request #10753 from OPEN-DSI/fix-comm-action-contactid Fix default contact id for update and clone actions in event card	2019-03-07 13:12:22 +01:00
John BOTELLA	5ea5d51247	Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status	2019-03-07 09:41:03 +01:00
Lionel VESSILLER	b56cd11f02	Fix default contact id for update and clone actions in event card	2019-03-06 12:00:55 +01:00
Frédéric FRANCE	2745f98644	PSR2.Classes.PropertyDeclaration.VarUsed	2019-03-05 22:10:46 +01:00
Frédéric FRANCE	0c2a77cb53	Merge remote-tracking branch 'upstream/develop' into patch-2	2019-03-05 18:14:15 +01:00
John BOTELLA	72d96d2ac3	prepare badges	2019-03-05 17:13:20 +01:00
Laurent Destailleur	b851911708	Dolibarize module ticket	2019-03-05 12:18:46 +01:00
Frédéric FRANCE	f283782445	change visibility	2019-03-04 19:57:46 +01:00
Laurent Destailleur	66d8b8e7a1	Fix phpcs	2019-03-02 21:04:44 +01:00
Laurent Destailleur	8fce6e5e31	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/card.php htdocs/core/modules/mailings/xinputfile.modules.php htdocs/fourn/facture/card.php	2019-03-02 19:13:37 +01:00
Laurent Destailleur	40e923ec85	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/core/modules/modAgenda.class.php	2019-03-02 19:07:14 +01:00
Laurent Destailleur	4f9981063f	Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing	2019-03-02 18:26:50 +01:00
Laurent Destailleur	56d921ea52	CSS	2019-03-02 12:57:07 +01:00
Frédéric FRANCE	014f69850e	add visibility	2019-03-01 23:08:57 +01:00
Laurent Destailleur	855aaaffd8	Better fix for type of discount	2019-02-28 11:44:10 +01:00
florian HENRY	4ebf4780c2	fix relative discount for prospect and supplier	2019-02-28 09:09:06 +01:00
Frédéric FRANCE	9b165f6b3f	add visibility	2019-02-27 20:45:07 +01:00
Laurent Destailleur	2448d1deaa	fk_projet -> fk_project	2019-02-27 15:32:18 +01:00
Laurent Destailleur	3ec2338c2d	Look and feel v10	2019-02-26 19:37:32 +01:00
Frédéric FRANCE	894123fb06	PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket	2019-02-24 20:06:55 +01:00
Regis Houssin	36a7303049	FIX No space found after comma in function call	2019-02-19 10:28:17 +01:00
Laurent Destailleur	e4698fb6a5	Merge	2019-02-18 19:14:25 +01:00
Laurent Destailleur	75b875ae55	Fix origin currency not visible in absolute discount view	2019-02-18 17:38:15 +01:00
Laurent Destailleur	7a79637b88	Merge pull request #10616 from frederic34/patch-27 Update pertype.php	2019-02-15 15:31:03 +01:00
Frédéric FRANCE	c7cec4be34	Update peruser.php	2019-02-14 21:45:40 +01:00
Frédéric FRANCE	b65532c5d8	Update pertype.php	2019-02-14 21:43:46 +01:00
Frédéric FRANCE	7886b5900c	Update card.php	2019-02-14 20:40:03 +01:00
Laurent Destailleur	a7af1b1765	Remove deprecated code	2019-02-14 16:29:13 +01:00
ptibogxiv	1771ea8eaa	Update api_proposals.class.php	2019-02-14 00:27:53 +01:00
ptibogxiv	56a0a20bb3	Fix delete contact	2019-02-14 00:27:29 +01:00
Laurent Destailleur	b9467c10bf	Merge pull request #10561 from eoxia-jimmy/develop NEW: API Proposal, Orders, Invoices: Add contact details	2019-02-13 16:39:57 +01:00
Laurent Destailleur	c2ab85aaf8	Update api_proposals.class.php	2019-02-13 16:39:17 +01:00
Frédéric FRANCE	95212e9cc1	Update ical.class.php	2019-02-13 00:44:34 +01:00
Frédéric FRANCE	3de192364b	Update ical.class.php	2019-02-13 00:12:20 +01:00
Jimmy L	a172ea00a4	Rest API: Proposal, Orders, Invoices: Add contact details	2019-02-12 17:54:59 +01:00
Laurent Destailleur	e054b080a5	Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing	2019-02-12 13:33:39 +01:00
klemens	beb2791dde	spelling fixes	2019-02-10 12:59:09 +01:00
Frédéric FRANCE	1e43f8e54a	PEAR FunctionCallSignature	2019-02-10 10:45:49 +01:00
Laurent Destailleur	0e42e8824b	Merge branch 'develop' into new_branch_04_02_2019	2019-02-08 09:42:18 +01:00
Laurent Destailleur	af92303319	Merge pull request #10487 from frederic34/psr2squizwhite psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent	2019-02-08 09:30:25 +01:00
Laurent Destailleur	88fb491441	Fix note output	2019-02-06 00:40:07 +01:00
Laurent Destailleur	58e6cfd635	Fix popup content	2019-02-06 00:36:11 +01:00
Philippe GRAND	577aef54e1	update with html5 compliant code	2019-02-04 10:37:51 +01:00
Philippe GRAND	1154f9a048	update with html5 compliant code	2019-02-04 10:35:53 +01:00
Philippe GRAND	eb25d12a1b	update with html5 compliant code	2019-02-04 10:32:33 +01:00
Philippe GRAND	7c8d84aa03	update with html5 compliant code	2019-02-04 10:27:26 +01:00
Frédéric FRANCE	970392adb8	Merge remote-tracking branch 'upstream/develop' into psr2squizwhite	2019-02-03 22:41:57 +01:00
Laurent Destailleur	57f81217ee	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/localtax/index.php htdocs/compta/tva/index.php	2019-02-03 21:14:44 +01:00
Laurent Destailleur	efe5cd3dd8	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-02-03 21:13:06 +01:00
Laurent Destailleur	72f78ecf3b	FIX #10460 compatibility with MariaDB 10.4	2019-02-03 20:02:05 +01:00
Laurent Destailleur	a6dde3d6bd	Merge branch 'develop' into nospaceaftercomma	2019-02-03 19:27:16 +01:00
Laurent Destailleur	9f7dfe2921	Merge pull request #10481 from frederic34/psr2forloop psr2 Squiz.ControlStructures.ForEachLoopDeclaration	2019-02-03 19:11:07 +01:00
Laurent Destailleur	e309261140	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-03 18:19:58 +01:00
Frédéric FRANCE	80a12fcd1c	psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent	2019-02-03 14:29:45 +01:00
Frédéric FRANCE	03701fa091	psr2	2019-02-02 18:25:01 +01:00
Laurent Destailleur	ebe30f7a0e	FIX error report not returned	2019-02-01 19:19:23 +01:00
Frédéric FRANCE	f5b2cf75f2	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-02-01 18:31:44 +01:00
Philippe GRAND	1501ce2c9f	update with html5 compliant code	2019-01-31 13:34:32 +01:00
Laurent Destailleur	648eea3a70	Merge branch 'develop' into nospaceaftercomma	2019-01-30 16:00:11 +01:00
Laurent Destailleur	869159c09f	Fix regression in look and feel (if empty, we do not sho value)	2019-01-30 15:31:39 +01:00
Laurent Destailleur	1a292839ca	Fix regression in look and feel (if empty, we do not sho value)	2019-01-30 15:31:18 +01:00
Laurent Destailleur	17c3337c9b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-01-30 15:25:43 +01:00
Regis Houssin	39b696af02	FIX multicompany compatibility	2019-01-29 12:01:40 +01:00
Alexandre SPANGARO	cc88c4f8ff	Move my email to the new one	2019-01-28 21:39:22 +01:00
Frédéric FRANCE	ff39491f15	wip	2019-01-27 23:31:37 +01:00
Frédéric FRANCE	b10558bacd	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00
Laurent Destailleur	4f9f0fd7b5	Merge branch 'develop' into elseif	2019-01-27 17:54:06 +01:00
Frédéric FRANCE	f0cdf300d1	Squiz.Functions.FunctionDeclarationArgumentSpacing	2019-01-27 15:20:16 +01:00
Frédéric FRANCE	7ee086b402	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
Frédéric FRANCE	6e91b3cefc	PSR2 usage of else if is discouraged	2019-01-27 10:49:34 +01:00
Laurent Destailleur	f96d730943	Merge pull request #10391 from grandoc/new_branch_22_01_2019 update with html5 compliant code	2019-01-26 14:09:15 +01:00
Laurent Destailleur	adb7ec7015	Merge pull request #10399 from grandoc/new_branch_23_01_2019 update with html5 compliant code	2019-01-26 14:02:26 +01:00
Laurent Destailleur	e42fe4022a	Uniformize lenght of small list	2019-01-25 15:22:36 +01:00
Philippe GRAND	6625dac8d7	update with html5 compliant code	2019-01-23 17:28:02 +01:00
Philippe GRAND	34b6f5705e	update with html5 compliant code	2019-01-22 14:09:14 +01:00
Philippe GRAND	4668052f95	update with html5 compliant code	2019-01-22 14:04:33 +01:00
Laurent Destailleur	844643c37d	Merge pull request #10375 from grandoc/new_branch_19_01_2019 update with html5 compliant code	2019-01-20 19:48:32 +01:00
Laurent Destailleur	300889f53a	# WARNING: head commit changed in the meantime Fix	2019-01-19 13:22:38 +01:00
Laurent Destailleur	55c90b0578	Fix #10359 cloning of proposal	2019-01-19 13:17:07 +01:00
Laurent Destailleur	2bbaae88d6	Fix standardize 'createfromclone' param when cloning	2019-01-19 12:46:38 +01:00
Philippe GRAND	66e4bc4502	update with html5 compliant code	2019-01-19 12:27:26 +01:00
Laurent Destailleur	5130019003	css	2019-01-17 19:27:26 +01:00
Philippe GRAND	bd929c2d1e	update with html5 compliant code	2019-01-17 14:24:41 +01:00
atm-quentin	013c078c8b	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice	2019-01-16 10:52:46 +01:00
Marc de Lima Lucio	1cfd52e7e2	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_actionlist_desc	2019-01-09 12:08:55 +01:00
Marc de Lima Lucio	de7dfd3423	NEW: actioncomm list: add description column (hidden by default)	2019-01-09 11:54:03 +01:00
Laurent Destailleur	d929d93376	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-08 14:19:35 +01:00
Laurent Destailleur	acc665a9f1	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/core/class/html.form.class.php	2019-01-08 14:16:23 +01:00
Laurent Destailleur	1ee0d42408	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-01-08 14:08:22 +01:00
Marc de Lima Lucio	68802c659e	FIX: action list: add printFieldListSelect and printFieldListWhere hooks	2019-01-08 11:41:58 +01:00
ldestailleur	bc00fb177a	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-02 19:42:15 +01:00
ldestailleur	3af418349a	FIX Can't empty the payment mode	2018-12-29 07:54:30 +01:00
ldestailleur	c0eef25b31	FIX Can set payment mode to empty on thirdparty page	2018-12-28 23:14:36 +01:00
ldestailleur	8ad06463e0	FIX Can set payment mode to empty on thirdparty page	2018-12-28 23:06:04 +01:00
Laurent Destailleur	a445e7597d	FIX Popup when having notes of events	2018-12-27 06:37:17 +01:00
Laurent Destailleur	fadc9983dc	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-12-27 06:18:03 +01:00
Laurent Destailleur	cd53e22d64	FIX Edit description of event	2018-12-27 06:16:54 +01:00
Laurent Destailleur	f55db6dd84	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: dev/resources/dbmodel/dolibarr_schema.mwb	2018-12-15 14:09:16 +01:00
Laurent Destailleur	e069da69ba	Revert "Fix screen size fall" This reverts commit `abb6b41f91`.	2018-12-15 12:35:37 +01:00
John BOTELLA	4fa10296f4	Fix screen size fall	2018-12-15 12:34:41 +01:00
Laurent Destailleur	dbe5d285e8	Merge pull request #9965 from atm-john/fix_responsive FIX screen size fall	2018-12-15 12:33:35 +01:00
Laurent Destailleur	b511a056f4	Fix phpcs	2018-12-15 11:48:21 +01:00
Laurent Destailleur	baf9b6f309	Fix regression (bad name of function)	2018-12-14 19:21:19 +01:00
Laurent Destailleur	38ddfd9a62	Merge pull request #10152 from defrance/patch-134 refactoring list.php with dol_sql_datefilter	2018-12-14 19:06:29 +01:00
Laurent Destailleur	3571eaee3d	Merge branch 'develop' into NEW_change_order_concat_desc	2018-12-14 17:44:08 +01:00
Laurent Destailleur	2011afe6fb	Merge branch 'develop' into actionrefused	2018-12-14 15:48:24 +01:00
Laurent Destailleur	83efdee7d3	Merge branch 'develop' into new_mass_generate	2018-12-14 15:44:46 +01:00
Laurent Destailleur	611ccc4a9a	Merge branch 'develop' into fieldlabel	2018-12-14 15:42:01 +01:00
Laurent Destailleur	233e160489	Merge pull request #9874 from atm-john/New_import_lines_from_linked_element_step2 NEW Extend import option to Order's card and Propal's card	2018-12-14 15:29:27 +01:00
Laurent Destailleur	5dabefe227	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2018-12-13 20:49:55 +01:00
Laurent Destailleur	f97b561af0	Merge branch 'develop' into qual_rename_facnumber	2018-12-13 20:24:12 +01:00
Laurent Destailleur	210c937725	Merge pull request #10213 from inoveaconseil/patch-5 NEW: Add note in tooltips	2018-12-13 20:06:13 +01:00
Laurent Destailleur	4a61c1b6ed	FIX lang not loaded	2018-12-11 13:25:09 +01:00
Laurent Destailleur	5ec9a1ca7f	Remove deprecated parameter	2018-12-11 10:15:13 +01:00
Laurent Destailleur	434cf2e046	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-12-11 09:58:14 +01:00
Laurent Destailleur	a107d16338	Revert "clean and update code" This reverts commit `68de0ba93b`.	2018-12-11 09:52:00 +01:00
Laurent Destailleur	b47e7b2267	Work on new unsubscribe process	2018-12-11 09:49:46 +01:00
Inovea Conseil	9bfcabc8c9	NEW: Add note in tooltips	2018-12-10 16:09:56 +01:00
Laurent Destailleur	138640fc63	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/commande/class/commande.class.php htdocs/contrat/class/contrat.class.php htdocs/expensereport/class/expensereport.class.php htdocs/fourn/class/fournisseur.commande.class.php	2018-12-04 14:58:11 +01:00
Laurent Destailleur	8e333c3feb	Standardize code	2018-12-04 14:54:58 +01:00
Laurent Destailleur	d80baaea69	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/commande/class/commande.class.php htdocs/contrat/class/contrat.class.php htdocs/expensereport/class/expensereport.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/class/fournisseur.facture.class.php	2018-12-04 14:29:47 +01:00
Ferran Marcet	7247b14bd9	FIX Lines are not inserted correctly if VAT have code	2018-12-03 12:28:17 +01:00
Ferran Marcet	8312d57d16	FIX Lines are not inserted correctly if VAT have code	2018-12-03 11:58:39 +01:00
Maxime Kohlhaas	2e496ea83a	QUAL rename facnumber by ref	2018-12-02 17:33:44 +01:00
BENKE Charlene	21b55f3a83	refactoring dol_sql_datefilter	2018-12-01 23:30:58 +01:00
Laurent Destailleur	6d84036f66	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/action/index.php htdocs/contact/list.php htdocs/core/class/html.form.class.php htdocs/expensereport/card.php htdocs/install/doctemplates/shipment/template_shipment.odt htdocs/public/payment/newpayment.php	2018-12-01 19:23:06 +01:00
florian HENRY	7a182c7880	fix #10069	2018-11-30 23:25:44 +01:00
Inovea Conseil	ad7117be60	FIX mass action closed proposal	2018-11-30 15:05:28 +01:00
BENKE Charlene	10bf7bdc95	Duplicate declaration of $object Already present line 126	2018-11-29 10:29:04 +01:00
Laurent Destailleur	3b66a2bf9c	Fix missing email in popup	2018-11-28 14:20:55 +01:00
Laurent Destailleur	0367795488	Fix auto jump on record if only 1 record in a search	2018-11-27 11:09:47 +01:00
Laurent Destailleur	f0e4c262a3	Merge pull request #10067 from ATM-Thibault/NEW_global_search_go_direct_on_card FIX Support of option MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE was not complete	2018-11-24 11:13:49 +01:00
Laurent Destailleur	5bd9c14929	Update demo data for 8.0 and 9.0	2018-11-23 14:05:45 +01:00
Thibault Descamps	c2e5a29246	NEW redirect if only one result on global search on card	2018-11-22 11:36:30 +01:00
Thibault Descamps	1cc130e5f6	NEW : conf to change concat desc order	2018-11-21 09:57:44 +01:00
Frédéric FRANCE	8f17ae8df5	GETPOSTISSET has only one parameter	2018-11-19 20:28:55 +01:00
Laurent Destailleur	39621ec686	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/commonobject.class.php	2018-11-19 20:07:51 +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	2f87ee6640	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-19 15:56:38 +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
Laurent Destailleur	5f93315097	Clean code	2018-11-19 15:14:46 +01:00
Laurent Destailleur	0886928a64	FIX Link between action and project must use field not the link table	2018-11-19 14:38:30 +01:00
Laurent Destailleur	1e1ccd4c88	Fix pagination in action/event list	2018-11-19 14:25:34 +01:00
florian HENRY	dc2f1e9812	fix list agenda extrafield visibility	2018-11-19 11:25:48 +01:00
atm-quentin	c18f486179	set facture to invoice AND check invoicenumber conf	2018-11-16 11:20:03 +01:00
atm-quentin	a8ab666d62	remplacement en masse des $conf->entity par des getEntity('facture')	2018-11-16 11:17:18 +01:00
Frédéric FRANCE	ce6b7adaa0	Merge remote-tracking branch 'upstream/develop' into actionrefused	2018-11-15 22:15:45 +01:00
Frédéric FRANCE	12dcda7e02	Merge remote-tracking branch 'upstream/develop' into fieldlabel	2018-11-15 22:01:36 +01:00
Regis Houssin	0592e8a31c	FIX config is override by multicompany module	2018-11-14 16:44:10 +01:00
Frédéric FRANCE	731d19a29b	add tooltip to butActionRefused	2018-11-13 21:40:17 +01:00
Regis Houssin	04edcaa89c	FIX compatibility between proposal sharing and proposalnumber sharing	2018-11-13 20:20:46 +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
Laurent Destailleur	84983140b6	Merge pull request #9896 from hregis/develop_email FIX change my deprecated email	2018-11-11 17:35:35 +01:00
Laurent Destailleur	de259e9db6	Code comment	2018-11-11 14:36:35 +01:00
Frédéric FRANCE	09efde4901	Merge remote-tracking branch 'upstream/develop' into fieldlabel	2018-11-09 18:13:59 +01:00
Regis Houssin	89389baeac	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email	2018-11-09 15:37:29 +01:00
Laurent Destailleur	3e844db74f	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fichinter/stats/index.php	2018-11-08 20:19:28 +01:00
Laurent Destailleur	be788e6167	FIX responsive	2018-11-08 19:57:31 +01:00
Laurent Destailleur	46db246273	Look and feel v9: Autofocus on create forms	2018-11-07 13:04:43 +01:00
Laurent Destailleur	66ffcf287a	Fix filter on extrafields	2018-11-07 12:49:17 +01:00
John BOTELLA	abb6b41f91	Fix screen size fall	2018-11-07 11:25:13 +01:00
Laurent Destailleur	4a25317f10	Fix security on GETPOST('action'). Param must be sanitized.	2018-11-05 20:29:07 +01:00
Laurent Destailleur	c0f4ec5a3e	FIX sanitize param $action	2018-11-05 17:53:31 +01:00
Laurent Destailleur	68ec172798	Fix setup to enable reminder b email	2018-11-03 12:37:52 +01:00
Frédéric FRANCE	fe5056add8	remove fieldlabel and add fieldeditkey	2018-10-27 18:07:05 +02:00
Regis Houssin	569d59d251	FIX change my deprecated email	2018-10-27 14:43:12 +02:00
Laurent Destailleur	852b069785	Fix reponsive in stats pages	2018-10-26 15:46:17 +02:00
atm-john	759b2b6ccf	Extend import option to Order's card and Propal's card	2018-10-25 21:39:22 +02:00
Frédéric FRANCE	86d854f3f4	Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose	2018-10-24 23:04:26 +02:00
Laurent Destailleur	01adaf253c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/bank/class/account.class.php htdocs/product/list.php	2018-10-24 03:35:44 +02:00
Laurent Destailleur	23a9416c19	Fix deprecated field	2018-10-23 23:51:27 +02:00
Laurent Destailleur	c8aa884462	Fix search all	2018-10-23 17:16:46 +02:00
Laurent Destailleur	9959ba3662	Merge pull request #9761 from frederic34/patch-20 Update actioncomm.class.php	2018-10-16 20:29:15 +02:00
Laurent Destailleur	2c1e8d6535	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/bookkeeping/balance.php htdocs/expedition/class/expeditionbatch.class.php htdocs/public/payment/newpayment.php htdocs/stripe/config.php	2018-10-16 18:47:11 +02:00
Frédéric FRANCE	cab9c81ce2	Update actioncomm.class.php	2018-10-15 21:53:54 +02:00
Laurent Destailleur	743d4d7c01	NEW add option PROPOSAL_AUTO_ADD_AUTHOR_AS_CONTACT	2018-10-15 16:40:40 +02:00
Maxime Kohlhaas	d4d921b1cc	Add massaction generate on main lists	2018-10-14 16:27:59 +02:00
Laurent Destailleur	532e05c42e	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: ChangeLog htdocs/filefunc.inc.php	2018-10-13 14:29:51 +02:00
Laurent Destailleur	c15505bc13	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-10-13 14:27:50 +02:00
Marc de Lima Lucio	afd9b4ea1a	FIX: propal pdf: missing parenthesis for customs code	2018-10-12 18:19:17 +02:00
Laurent Destailleur	1d04ce2185	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/functions.lib.php	2018-10-09 17:07:32 +02:00
Laurent Destailleur	01c32525df	Merge	2018-10-09 17:06:08 +02:00
Laurent Destailleur	0938ac4afa	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/user/list.php	2018-10-09 14:54:18 +02:00
Laurent Destailleur	3c8b365c3e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-09 14:53:39 +02:00
Laurent Destailleur	4d959bbea7	Fix consistency of label of proposal status	2018-10-09 14:06:45 +02:00
Laurent Destailleur	bc4ddce314	Merge pull request #9713 from frederic34/patch-9 Update index.php	2018-10-09 12:43:32 +02:00
Frédéric FRANCE	b615d03b0b	Update index.php	2018-10-09 12:17:51 +02:00
Philippe GRAND	af0bcb2631	Standardize code	2018-10-09 09:40:00 +02:00
Philippe GRAND	ac214a7258	Standardize code	2018-10-09 08:53:08 +02:00
Laurent Destailleur	91038af84d	FIX properties on proposal must not be modified if error	2018-10-08 18:15:46 +02:00
Laurent Destailleur	c930218dd2	FIX Missing transaction around action	2018-10-08 17:40:17 +02:00
Philippe GRAND	da560289e3	Standardize code	2018-10-05 15:48:38 +02:00
atm-ph	bfaf25ca2a	Fix wrong value for module part and return access denied	2018-10-04 16:55:16 +02:00
Alexey Pyltsyn	49de7a5881	Replace multiple load calls with loadLangs method	2018-10-01 09:22:23 +03:00
Laurent Destailleur	e2f450aa8c	Fix regession losing description. Rename updateligne into updateline.	2018-09-28 16:15:17 +02:00
Laurent Destailleur	26d20d0b76	Merge pull request #8729 from atm-quentin/NEW_rights_ignoring_min_price NEW Advanced permission to ignore price min	2018-09-27 09:57:49 +02:00
Laurent Destailleur	d9ccc7624b	Standardize code	2018-09-23 16:09:25 +02:00
Laurent Destailleur	6c814b32bd	Standardize cod	2018-09-23 15:58:33 +02:00
Laurent Destailleur	5bd538fb2c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog htdocs/core/modules/modStripe.class.php htdocs/filefunc.inc.php htdocs/projet/element.php	2018-09-20 23:43:34 +02:00
Laurent Destailleur	eb80c5c338	Fix translation not loaded and test on multicompany	2018-09-20 19:45:13 +02:00
John BOTELLA	83d3e5ec39	NEW : can add project's task to agenda on create event card	2018-09-20 10:17:43 +02:00
Laurent Destailleur	a546ef7f2d	FIX default day	2018-09-19 20:01:25 +02:00
Laurent Destailleur	92aa6929de	Fix go back on agenda view on correct page	2018-09-19 17:03:13 +02:00
Laurent Destailleur	824b572bd0	FIX Amount when using mutlicurrency on PDF Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/core/modules/propale/doc/pdf_azur.modules.php htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php	2018-09-19 15:03:24 +02:00
Frédéric FRANCE	1d43c6bc3a	call to deprecated add_object_linked was present two times	2018-09-19 10:57:59 +02:00
Laurent Destailleur	03928a914d	Merge pull request #9537 from frederic34/patch-20 reduce complexity of actioncomm reminder class	2018-09-18 15:08:46 +02:00
Frédéric FRANCE	beb7a0609c	reduce complexity of actioncomm reminder class	2018-09-16 19:06:21 +02:00
Frédéric FRANCE	7b37c41cfb	reduce complexity of actioncomm class	2018-09-16 19:04:43 +02:00
Laurent Destailleur	ab0f842db6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-16 12:55:44 +02:00
Laurent Destailleur	74a9c680df	FIX "Other ..." link so the "Back to" link works.	2018-09-16 12:27:56 +02:00
Laurent Destailleur	4efab446d0	Merge pull request #9508 from frederic34/patch-15 reduce complexity of libstatut propal.class.php	2018-09-15 17:24:59 +02:00
Laurent Destailleur	80fb1e0657	NEW Each user can set its prefered default calendar	2018-09-14 11:23:15 +02:00
Frédéric FRANCE	bcc9a3d259	reduce complexity of libstatut propal.class.php	2018-09-13 21:45:46 +02:00
Frédéric FRANCE	987fdbe73c	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-12 21:29:41 +02:00
Frédéric FRANCE	3e71f4e6b0	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-12 18:36:49 +02:00
Frédéric FRANCE	998b67fa98	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-12 18:32:15 +02:00
Laurent Destailleur	6291f18179	Merge pull request #9440 from frederic34/patch-5 Upper Lower Casing	2018-09-12 18:24:02 +02:00
Laurent Destailleur	fcabe67e4b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-12 13:30:28 +02:00
Frédéric FRANCE	f02b2f0239	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-09 13:35:58 +02:00
Frédéric FRANCE	fa895b2c2d	replace select_date	2018-09-09 11:30:40 +02:00
Frédéric FRANCE	a558c3bdac	replace select_date	2018-09-09 11:25:59 +02:00
Frédéric FRANCE	8249756726	replace select_date	2018-09-09 10:40:00 +02:00
Frédéric FRANCE	14bc8ed18d	Update multiprix.php	2018-09-08 23:19:11 +02:00
Frédéric FRANCE	2b62c4ca8f	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-08 10:50:27 +02:00
Philippe GRAND	97c740f510	Merge branch 'develop' of github.com:grandoc/dolibarr into develop	2018-09-06 19:28:10 +02:00
Laurent Destailleur	ff05997f0a	FIX Several fixes on the management of minimal amount for orders	2018-09-06 17:37:02 +02:00
Frédéric FRANCE	4e619dd0ed	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-05 18:51:21 +02:00
Frédéric FRANCE	aa74d2ac38	Update api_agendaevents.class.php	2018-09-04 23:53:37 +02:00
Laurent Destailleur	ab8155f170	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/commande/class/commande.class.php htdocs/compta/facture/card.php htdocs/filefunc.inc.php	2018-09-04 21:35:43 +02:00
Frédéric FRANCE	65b74ad30f	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-04 20:48:35 +02:00
Philippe Grand	c32c67ca57	Merge branch 'develop' into develop	2018-09-04 16:58:59 +02:00
Philippe GRAND	707f8b7312	fix merge	2018-09-04 14:49:56 +02:00
Laurent Destailleur	3d50c454c1	Code comment	2018-09-03 17:05:44 +02:00
Philippe GRAND	7a0c19485e	fix merge	2018-09-03 09:34:08 +02:00
Frédéric FRANCE	35232b753a	move phpcs:ignore	2018-09-02 20:37:12 +02:00
Frédéric FRANCE	03a5aba8a2	move phpcs:ignore	2018-09-02 18:49:23 +02:00
Frédéric FRANCE	e13a8ec572	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-02 18:19:45 +02:00
Frédéric FRANCE	4ea582ad4a	move phpcs:ignore	2018-09-02 11:12:07 +02:00
Philippe GRAND	3de16a145e	Standardize and update code	2018-09-02 11:08:41 +02:00
Frédéric FRANCE	b60f7db60a	move phpcs:ignore	2018-09-02 10:43:34 +02:00
Frédéric FRANCE	47879d44bc	move phpcs:ignore	2018-09-02 09:57:19 +02:00
Frédéric FRANCE	e98b8e5e25	move phpcs:ignore	2018-09-02 09:27:59 +02:00
Frédéric FRANCE	71977514d7	Update actioncommreminder.class.php	2018-09-02 09:06:51 +02:00
Frédéric FRANCE	3e723af018	start changing phpcs:ignore	2018-09-01 23:46:13 +02:00
Philippe GRAND	ae2df6be11	Standardize and Update code	2018-09-01 23:04:46 +02:00
Philippe GRAND	5d273960dc	fix conflict	2018-09-01 22:40:38 +02:00
Laurent Destailleur	c8912d6a4f	Merge pull request #9242 from frederic34/camelCaps mark non camelCaps function	2018-09-01 15:37:56 +02:00
Philippe GRAND	f77dd2ebc7	Standardize and update code	2018-09-01 15:13:59 +02:00
Philippe GRAND	c013f9cf3d	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2018-09-01 15:13:04 +02:00
Laurent Destailleur	c2548b8b39	Merge pull request #9298 from ksar-ksar/Upd_hook_formConfirm NEW hook formConfirm always called if hooked	2018-09-01 14:50:08 +02:00
Frédéric FRANCE	10200374ef	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-09-01 14:06:23 +02:00
Frédéric FRANCE	57fb3dc2f4	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-09-01 13:52:51 +02:00
Philippe GRAND	7354e485b0	precise label comment	2018-09-01 13:22:08 +02:00
Philippe GRAND	d8e6492e93	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2018-09-01 13:07:30 +02:00
Laurent Destailleur	5604f3b0c3	Merge pull request #9376 from frederic34/functionCommentMissing function Comment Missing	2018-09-01 12:59:32 +02:00
Philippe GRAND	1944ef0dc3	conflict resolution	2018-09-01 12:38:22 +02:00
Laurent Destailleur	b863b5176d	Merge pull request #9322 from grandoc/new_branch_29_08_2018 New branch 29 08 2018	2018-09-01 12:11:01 +02:00
Laurent Destailleur	482ddd548a	Merge pull request #9332 from frederic34/functionClosingBrace PSR2 FunctionClosingBrace	2018-09-01 12:06:08 +02:00
Frédéric FRANCE	9454f897ef	doxygen fix	2018-09-01 09:40:50 +02:00
Philippe GRAND	9e880d3e72	Standardize and update code	2018-08-31 17:55:31 +02:00
Laurent Destailleur	7b1a705be4	Clean duplicate code	2018-08-31 13:50:58 +02:00
Philippe Grand	b3c84ac3bc	Merge branch 'develop' into new_branch_29_08_2018	2018-08-30 12:09:40 +02:00
ksar-ksar	49d3bea192	Remove the test After discussion with Frederic, the best solution is to remove the test	2018-08-30 11:27:48 +02:00
Frédéric FRANCE	5100b8b7b0	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-30 10:42:47 +02:00
Frédéric FRANCE	6aee680a4f	PSR2 ClassDeclaration	2018-08-29 22:06:05 +02:00
Frédéric FRANCE	b03f4004ea	PSR2 FunctionClosingBrace	2018-08-29 21:25:22 +02:00
Laurent Destailleur	489e766cbf	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/ticket/class/ticket.class.php	2018-08-29 20:24:01 +02:00
Laurent Destailleur	3ebfb23407	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: .travis.yml htdocs/fourn/class/fournisseur.facture.class.php htdocs/product/fournisseurs.php htdocs/ticket/class/ticket.class.php	2018-08-29 20:22:50 +02:00
Laurent Destailleur	8b291b2053	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: README.md	2018-08-29 19:55:10 +02:00
Laurent Destailleur	0c11007e34	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: README.md htdocs/comm/propal/card.php	2018-08-29 18:53:39 +02:00
Frédéric FRANCE	cbdc669ba9	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-29 18:45:36 +02:00
Frédéric FRANCE	0e512cbc36	Merge remote-tracking branch 'upstream/develop' into trimtrailing2	2018-08-29 15:47:55 +02:00
Laurent Destailleur	ee204e2e64	Fix regression in php style	2018-08-29 15:37:35 +02:00
Frédéric FRANCE	7b2bfb28c2	Merge remote-tracking branch 'upstream/develop' into trimtrailing2	2018-08-29 12:48:12 +02:00
Philippe Grand	0ab593fdb1	Merge branch 'develop' into new_branch_29_08_2018	2018-08-29 12:47:01 +02:00
Laurent Destailleur	b648a28893	Fix regression	2018-08-29 11:57:43 +02:00
Frédéric FRANCE	846778657f	fix syntax error	2018-08-29 11:44:26 +02:00
Philippe GRAND	5b0425706c	try to fix space errors	2018-08-29 11:39:38 +02:00
Philippe GRAND	84a9ca3f68	fix : Parse error: ./htdocs/comm/mailing/cibles.php:644	2018-08-29 10:40:30 +02:00
gauthier	61a57e619f	FIX : $fk_account is always empty, must be $soc->fk_account	2018-08-28 16:54:04 +02:00
Frédéric FRANCE	fe4260a014	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-28 09:34:53 +02:00
Frédéric FRANCE	1182f29864	trimtrailing	2018-08-28 08:33:02 +02:00
Laurent Destailleur	2349f99eb9	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-08-28 02:58:51 +02:00
Laurent Destailleur	50d50c2e10	Merge pull request #9307 from ATM-Marc/FIX_6.0_thirdparty_info NEW On customer/supplier card, add simple tooltip to amount boxes	2018-08-28 02:48:05 +02:00
Laurent Destailleur	9c6ce4b29d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-28 02:36:15 +02:00
Laurent Destailleur	9a14611d55	Merge pull request #8996 from grandoc/new_branch_20_06_2018 clean and update code	2018-08-28 02:35:59 +02:00
Laurent Destailleur	2db84a679e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/modulebuilder/index.php	2018-08-28 02:35:45 +02:00
Laurent Destailleur	7219bac0b2	Merge pull request #9168 from frederic34/trimtrailing Trimtrailing	2018-08-28 02:30:02 +02:00
Laurent Destailleur	32ef9695a7	Merge pull request #9282 from frederic34/patch-19 Update card.php	2018-08-28 02:28:35 +02:00
Laurent Destailleur	7462a1ae1d	Update card.php	2018-08-28 02:27:56 +02:00
Laurent Destailleur	2306f8a7c2	Merge pull request #9265 from grandoc/new_branch_18_08_2018 Typo	2018-08-28 02:25:24 +02:00
Laurent Destailleur	0a7ce338f9	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/class/commondocgenerator.class.php	2018-08-28 02:23:34 +02:00
Laurent Destailleur	d90eed3098	Merge pull request #9291 from frederic34/patch-23 typo	2018-08-28 01:55:44 +02:00
Laurent Destailleur	534eadb7a2	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-08-28 01:35:43 +02:00
Marc de Lima Lucio	d09f9b2543	FIX: customer/supplier card: add simple tooltip to amount boxes	2018-08-27 18:19:42 +02:00
atm-ph	d9beb3f882	Fix tms missing in fetch propal	2018-08-27 10:19:07 +02:00
ksar-ksar	a844855ade	Update hook formConfirm The hook should be called when the $formconfirm is not empty	2018-08-24 16:40:26 +02:00
Frédéric FRANCE	85ae8f3901	Update card.php	2018-08-24 09:29:17 +02:00
Philippe GRAND	2fa82edd39	Standardize and update code	2018-08-23 17:07:27 +02:00
Frédéric FRANCE	343e6ce8b3	typo	2018-08-23 14:34:27 +02:00
Philippe Grand	f98d2078e2	Merge branch 'develop' into new_branch_20_06_2018	2018-08-23 10:41:34 +02:00
Philippe Grand	9b2e754b46	Update advtargetemailing.class.php	2018-08-22 22:41:22 +02:00
Philippe Grand	eeaa257f11	Update cactioncomm.class.php	2018-08-22 22:39:51 +02:00
Philippe Grand	c626dcb710	Update actioncomm.class.php	2018-08-22 22:38:00 +02:00
Philippe GRAND	449ef9c464	Update and standardize code	2018-08-22 18:12:44 +02:00
Frédéric FRANCE	0334409d18	Update card.php	2018-08-22 13:43:30 +02:00
Philippe GRAND	6542dcf0bd	Update and standardize code	2018-08-22 12:04:50 +02:00
Philippe GRAND	e0462b975b	Update and standardize code	2018-08-22 11:48:26 +02:00
Philippe GRAND	95349365ba	Update and standardize code	2018-08-22 11:39:37 +02:00
Philippe GRAND	0ffad50974	Update and standardize code	2018-08-22 11:24:31 +02:00
Philippe GRAND	29f15b4ae6	Update and standardize code	2018-08-22 10:51:55 +02:00
Frédéric FRANCE	6b6daf178f	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-21 20:57:58 +02:00
Frédéric FRANCE	0fbccce9a7	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-21 19:59:07 +02:00
Laurent Destailleur	db3c17668e	Fix coding style	2018-08-21 19:08:11 +02:00
Frédéric FRANCE	aba69b94b2	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-21 14:03:02 +02:00
Laurent Destailleur	0799970804	Merge pull request #9248 from frederic34/FunctionDeclaration function declaration	2018-08-21 13:41:56 +02:00
Laurent Destailleur	85eed6cf80	Merge branch 'develop' into trimtrailing	2018-08-21 13:40:04 +02:00
Laurent Destailleur	289f194641	Merge pull request #9058 from defrance/patch-123 New : Add total price on dashboard	2018-08-21 13:33:33 +02:00
Laurent Destailleur	5e09d5160f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-21 13:17:20 +02:00
Laurent Destailleur	0f1e5a78c6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-21 13:17:11 +02:00
Philippe Grand	ccdae4c597	Update html.formadvtargetemailing.class.php	2018-08-18 19:15:25 +02:00
Philippe GRAND	c8c8af55a0	Typo	2018-08-18 15:56:23 +02:00
Philippe GRAND	da951e61f2	Update and standardize code	2018-08-17 22:29:21 +02:00
Philippe GRAND	c48211ad70	Update and standardize code	2018-08-17 19:31:22 +02:00
Frédéric FRANCE	71d3af8b07	Update propal.class.php	2018-08-17 13:44:07 +02:00
Laurent Destailleur	4e02b134da	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2018-08-16 14:50:04 +02:00
Laurent Destailleur	2719c4eb43	Fix escape	2018-08-16 01:01:38 +02:00
Laurent Destailleur	4b7889b295	Fix left join broken	2018-08-16 01:00:38 +02:00
Frédéric FRANCE	54a078149a	function declaration	2018-08-15 17:34:35 +02:00
Laurent Destailleur	5a1a6ac095	Fix error message	2018-08-15 14:42:03 +02:00
Frédéric FRANCE	7bb781eea8	function declaration	2018-08-15 14:28:34 +02:00
Frédéric FRANCE	850ac34020	mark non camelCaps function	2018-08-13 17:26:32 +02:00
Frédéric FRANCE	82e8efe792	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-12 20:14:14 +02:00
Laurent Destailleur	9fc5d39d07	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-12 20:09:36 +02:00
Laurent Destailleur	dc8c4402ee	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-12 20:09:22 +02:00
Laurent Destailleur	0a1c6e7194	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/comm/propal/list.php htdocs/compta/facture/list.php htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php	2018-08-12 20:08:20 +02:00
Frédéric FRANCE	6113b536a0	remove superfluous spaces	2018-08-12 19:59:39 +02:00
Laurent Destailleur	30b4d88428	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/compta/facture/list.php htdocs/product/reassort.php htdocs/societe/list.php	2018-08-12 19:23:45 +02:00
Laurent Destailleur	61a5be6e2a	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2018-08-12 19:19:21 +02:00
Laurent Destailleur	b81b6b651f	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2018-08-12 19:17:26 +02:00
Frédéric FRANCE	6f74ecceaf	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-12 18:21:59 +02:00
Laurent Destailleur	3d4d42462c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-08-12 16:30:21 +02:00
Laurent Destailleur	12e21b4886	FIX update extrafields	2018-08-12 16:29:26 +02:00
Laurent Destailleur	9b50bc2197	Fix css	2018-08-09 19:29:48 +02:00
Laurent Destailleur	61d7629ab1	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/propal/list.php	2018-08-08 17:44:22 +02:00
Juanjo Menent	ca7666793b	Merge pull request #9213 from fmarcet/develop New: Sales representative column on Propal List	2018-08-08 11:11:20 +02:00
Frédéric FRANCE	9025c452ef	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-07 16:40:03 +02:00
Philippe GRAND	68de0ba93b	clean and update code	2018-08-07 10:56:59 +02:00
Ferran Marcet	c74ffade7d	New: Sales representative column on Propal List	2018-08-07 10:05:50 +02:00
Philippe GRAND	948647f3f9	comment translation	2018-08-04 14:17:51 +02:00
Laurent Destailleur	b01f07efda	Merge branch 'develop' into FIX_project_overview	2018-08-02 18:43:55 +02:00
Juanjo Menent	b8efe3b239	Merge pull request #9172 from grandoc/new_branch_28_07_2018 standardize	2018-08-02 11:27:02 +02:00
Juanjo Menent	37a9a2df56	Merge pull request #9167 from frederic34/include Include and co are statements	2018-08-02 11:03:44 +02:00
Philippe GRAND	d1f100b0c9	standardize	2018-07-29 17:17:29 +02:00
Philippe GRAND	de70bf983e	standardize	2018-07-29 13:40:35 +02:00
Laurent Destailleur	7af42c66cc	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/comm/propal/list.php	2018-07-27 12:54:45 +02:00
Frédéric FRANCE	b90d125fda	trim trailing	2018-07-26 20:19:52 +02:00
Frédéric FRANCE	a0a5d33641	test include	2018-07-26 17:30:53 +02:00
Frédéric FRANCE	2dd907a8e1	extrafield totalizable	2018-07-26 09:41:44 +02:00
Laurent Destailleur	e024ea9c05	Merge pull request #9146 from grandoc/new_branch_24_07_2018 Clean and update code	2018-07-24 21:41:12 +02:00
Philippe	d7f58d0087	FIX search on ref project on propal list	2018-07-24 20:28:49 +02:00
Laurent Destailleur	dc2fec8f57	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-24 19:37:04 +02:00
Laurent Destailleur	d871b8964f	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-07-24 19:23:40 +02:00
Laurent Destailleur	20f178fdfe	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/comm/action/index.php htdocs/core/lib/functions.lib.php	2018-07-24 19:22:00 +02:00
Philippe GRAND	2a6f050e32	Clean and update code	2018-07-24 18:28:56 +02:00
Philippe GRAND	442ffb95ba	clean and update code	2018-07-23 17:57:11 +02:00
Laurent Destailleur	19bb8a5091	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/en_US/accountancy.lang	2018-07-18 14:12:28 +02:00
Laurent Destailleur	4beca8d989	Fix restore look and feel	2018-07-18 13:00:38 +02:00
Philippe Grand	e913d854d0	Fix PR	2018-07-16 11:00:39 +02:00
Laurent Destailleur	387abf2da8	Merge pull request #9057 from inoveaconseil/checkRightOnLink ADD Check right on link	2018-07-16 09:31:21 +02:00
Laurent Destailleur	d968a61445	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-15 20:17:17 +02:00
Laurent Destailleur	f3b7bc53bd	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/tpl/extrafields_list_print_fields.tpl.php	2018-07-15 20:16:08 +02:00
gauthier	80ff7fa86f	FIX : case when we valid form with keyboard	2018-07-11 15:18:30 +02:00
gauthier	103c7e6d06	FIX : page must always be 0 when we search (to avoid case : when we're on page 3 and we're looking for a precise thirdparty, we stay on page 3 and nothing's displaied)	2018-07-11 09:51:36 +02:00
Laurent Destailleur	c0d6aee040	Update propal.class.php	2018-07-10 11:10:01 +02:00
Laurent Destailleur	ed3023f7d9	Update propal.class.php	2018-07-10 11:09:08 +02:00
Laurent Destailleur	dc7fcc009b	Update propal.class.php	2018-07-10 10:56:45 +02:00
Marc de Lima Lucio	2ba7c07574	FIX: propal: correctly preset project when creating with origin/originid	2018-07-09 17:34:31 +02:00
John BOTELLA	1daba56bbc	Fix count(): Parameter must be an array or an object that implements Countable	2018-07-09 10:05:53 +02:00
BENKE Charlene	bfe7cd0d9f	Update propal.class.php	2018-07-05 12:11:20 +02:00
Inovea Conseil	30cff2bb36	ADD check user's rights	2018-07-05 11:52:41 +02:00
Laurent Destailleur	12c43d7722	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-03 12:33:17 +02:00
Laurent Destailleur	4e7f9b1b4d	Merge pull request #9038 from hregis/8.0_multicompany Fix: possibility to overload permissions (multicompany sharing)	2018-07-02 16:12:40 +02:00
Laurent Destailleur	7c5aa148d9	Fix fetch	2018-07-02 15:26:01 +02:00
Regis Houssin	26495fb698	Fix: !!!! Dont't use entity if you use rowid in fetch or others !!!!	2018-07-01 18:49:37 +02:00
Regis Houssin	05c666c18b	Fix: use numbering model corresponding to the entity of the object	2018-07-01 17:06:19 +02:00
Regis Houssin	df55bee8ae	Fix: missing "$disableremove" global	2018-07-01 15:33:10 +02:00
Regis Houssin	c0c8a70dd5	Fix: permissions	2018-07-01 12:21:51 +02:00
Regis Houssin	d699667722	Fix: possibility to overload permissions (multicompany sharing)	2018-07-01 11:06:47 +02:00
Laurent Destailleur	982a1ffbaf	NEW Automatic position of scroll when creating an extrafield	2018-06-30 14:22:05 +02:00
Regis Houssin	4925624ed9	Fix: avoid NULL value when "subprice" is 0	2018-06-30 10:38:30 +02:00
Laurent Destailleur	8693775fc5	Fix phpunit	2018-06-24 18:15:49 +02:00
Laurent Destailleur	459fe7189d	Fix phpunit	2018-06-24 17:55:03 +02:00
Laurent Destailleur	af9d2c3b5a	Merge pull request #9008 from grandoc/new_branch_22_06_2018 clean and update code	2018-06-24 13:47:26 +02:00
Laurent Destailleur	5819333b80	Css	2018-06-24 11:30:44 +02:00
Philippe Grand	21ca374c27	Update cibles.php Fixes	2018-06-24 10:57:53 +02:00
Philippe Grand	b528368a8b	Update cibles.php	2018-06-24 10:56:06 +02:00
Laurent Destailleur	5829014218	Merge branch 'develop' into NEW_advance_targer_filter_everywhere	2018-06-24 10:24:26 +02:00
Laurent Destailleur	27a27e02a1	Fix css	2018-06-22 22:53:53 +02:00

... 22 23 24 25 26 ...

7668 Commits