1077 Commits

Author	SHA1	Message	Date
Frédéric FRANCE	22bc3b879b	new box replace	2021-03-02 22:21:34 +01:00
Frédéric FRANCE	d68de8617b	new box replace	2021-03-02 22:00:09 +01:00
Frédéric FRANCE	742c12f9d6	rename new boxes	2021-03-02 20:58:21 +01:00
Frédéric FRANCE	6cf8a46095	Merge remote-tracking branch 'upstream/develop' into boxindex	2021-03-02 20:41:01 +01:00
Frédéric FRANCE	a4e25359e7	add missing rule	2021-03-01 20:37:16 +01:00
Frédéric FRANCE	8c45137b37	Merge remote-tracking branch 'upstream/develop' into boxindex	2021-03-01 12:55:45 +01:00
Alexandre SPANGARO	7a3dfda8ee	Merge remote-tracking branch 'upstream/develop' into 14a22	2021-02-28 21:30:25 +01:00
Laurent Destailleur	886cbc61c8	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/card.php htdocs/core/boxes/box_factures_fourn.php htdocs/core/boxes/box_factures_fourn_imp.php htdocs/core/boxes/box_ficheinter.php htdocs/core/boxes/box_members.php htdocs/core/boxes/box_propales.php htdocs/core/class/commonobject.class.php htdocs/core/class/html.formmail.class.php htdocs/core/lib/functions.lib.php htdocs/fourn/class/fournisseur.facture.class.php	2021-02-28 13:37:45 +01:00
Alexandre SPANGARO	ca7958f273	Merge remote-tracking branch 'upstream/develop' into 14a22	2021-02-28 07:32:23 +01:00
Laurent Destailleur	753b1d1e11	FIX status on tooltip on widgets	2021-02-27 19:43:56 +01:00
Laurent Destailleur	4cf2d2317f	FIX Status in popup of member in widget	2021-02-27 19:16:14 +01:00
Laurent Destailleur	7dace2f459	Show 3 years in graph of widget by default.	2021-02-27 18:38:32 +01:00
Frédéric FRANCE	554e449e40	code syntax core directory	2021-02-23 22:03:23 +01:00
Alexandre SPANGARO	d9e03e1373	Merge remote-tracking branch 'upstream/develop' into 14a22	2021-02-22 14:10:38 +01:00
Frédéric FRANCE	84a5f69834	fix propal sqls	2021-02-22 13:14:13 +01:00
Frédéric FRANCE	58f301389c	fix box activity	2021-02-22 12:08:22 +01:00
Alexandre SPANGARO	22c936ba19	Merge remote-tracking branch 'upstream/develop' into 14a22	2021-02-22 11:28:36 +01:00
Alexandre SPANGARO	ae4fc565e1	Widget & commonobject	2021-02-22 05:38:31 +01:00
Alexandre SPANGARO	ddea3f8a92	Code enhanced - Standardize field name #14697	2021-02-21 21:47:26 +01:00
Laurent Destailleur	e3419df36e	Merge branch 'develop' into 14a20	2021-02-21 20:28:06 +01:00
Frédéric FRANCE	997dee67af	fix propal box	2021-02-20 17:42:51 +01:00
Alexandre SPANGARO	3dcfe40e71	Code enhanced - Standardize field name #14697	2021-02-20 08:00:27 +01:00
Laurent Destailleur	026259ebd7	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/list.php htdocs/core/class/html.form.class.php htdocs/core/lib/ajax.lib.php htdocs/core/tpl/objectline_create.tpl.php htdocs/product/fournisseurs.php	2021-02-15 13:12:27 +01:00
Laurent Destailleur	4c3a96da08	FIX #16150	2021-02-10 02:57:08 +01:00
Laurent Destailleur	5966e63120	Fix css	2021-02-08 20:01:10 +01:00
Laurent Destailleur	925d81d1b3	Merge pull request #16002 from Hystepik/develop#1 ... New update of funnel of prospection	2021-02-08 18:05:48 +01:00
Frédéric FRANCE	dbe5c23ed5	Update box_produits_alerte_stock.php	2021-02-07 19:45:18 +01:00
Frédéric FRANCE	58a39a263b	Update box_produits.php	2021-02-07 19:44:09 +01:00
Frédéric FRANCE	ebe7e1464a	fix html	2021-02-07 19:38:46 +01:00
Laurent Destailleur	f301635681	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.formmail.class.php	2021-02-03 21:02:32 +01:00
Laurent Destailleur	348fd0fcb5	FIX #16160	2021-02-03 19:36:10 +01:00
Laurent Destailleur	4d029194d3	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/ajax.lib.php htdocs/margin/agentMargins.php htdocs/margin/customerMargins.php	2021-02-02 13:22:23 +01:00
Laurent Destailleur	1fd2f12673	Fix responsive	2021-02-02 11:16:25 +01:00
Laurent Destailleur	3b9bd3cc40	Fix responsive	2021-02-02 11:15:16 +01:00
Laurent Destailleur	218a76ee63	FIX SQL Error with postgres or mysql strict mode	2021-02-02 11:06:58 +01:00
Laurent Destailleur	a4c0459c1e	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/user/list.php	2021-01-27 21:09:01 +01:00
Frédéric FRANCE	22522f5aa2	fix include	2021-01-25 17:06:25 +01:00
Frédéric FRANCE	e8c4db2188	Merge remote-tracking branch 'upstream/develop' into boxindex	2021-01-19 11:36:59 +01:00
lmarcouiller	afab5a977a	dolgrap.class.php with frederic34 advices 2	2021-01-19 09:43:06 +01:00
lmarcouiller	fd888be5e5	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1	2021-01-19 09:05:08 +01:00
Laurent Destailleur	f95bf56c15	Fix translation	2021-01-18 15:24:50 +01:00
lmarcouiller	383281e5f3	New update of funnel of prospection	2021-01-18 11:32:02 +01:00
Frédéric FRANCE	83b7e3c678	fix unknown variable	2021-01-18 08:01:18 +01:00
Frédéric FRANCE	c8d1410e33	Merge remote-tracking branch 'upstream/develop' into boxindex	2021-01-16 21:06:12 +01:00
Laurent Destailleur	a4109d3fd0	Merge pull request #15600 from Hystepik/develop#2 ... Close #15384 : New widget stat database	2021-01-16 18:42:50 +01:00
Frédéric FRANCE	216da52972	Merge remote-tracking branch 'upstream/develop' into patch-8	2021-01-16 14:00:05 +01:00
Frédéric FRANCE	871f762546	Merge remote-tracking branch 'upstream/develop' into boxindex	2021-01-16 13:58:27 +01:00
Laurent Destailleur	c7c74e8ed1	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/fourn/facture/card.php	2021-01-15 19:53:46 +01:00
Laurent Destailleur	ea266c1f2d	Fix missing alias	2021-01-15 17:59:08 +01:00
Frédéric FRANCE	225c68d5e6	Update box_members.php	2021-01-13 22:00:40 +01:00
Laurent Destailleur	7f04307adf	Merge branch 'develop' into develop#2	2021-01-13 17:40:21 +01:00
Frédéric FRANCE	e2c57584b7	Merge remote-tracking branch 'upstream/develop' into boxindex	2021-01-12 23:47:24 +01:00
Laurent Destailleur	f411b29b28	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/bookkeeping/listbysubaccount.php htdocs/langs/en_US/main.lang htdocs/langs/fr_FR/accountancy.lang	2021-01-09 02:34:43 +01:00
Laurent Destailleur	b3461161ec	Add option MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH	2021-01-09 02:28:50 +01:00
Laurent Destailleur	2794327e10	Update box_birthdays.php	2021-01-07 12:50:14 +01:00
Lars Wallenborn	1880e51d1c	[FIX] sort order in birthday box ... The current sort order is by date and not by day of month. This yields the following unexpected results: Given * Person A, born on 1980-01-10 * Person B, born on 1970-01-30 I expect Person A to be listed first because their birthday is before that of Person B _in January_. But without this fix, Person B would show up first because 1970 is before 1980.	2021-01-07 12:50:07 +01:00
Laurent Destailleur	a498f8dfe1	Fix sort by day	2021-01-07 12:49:54 +01:00
Laurent Destailleur	094ea841db	Fix sort by day	2021-01-07 12:49:19 +01:00
Laurent Destailleur	ddc3f35be1	Update box_birthdays.php	2021-01-07 12:47:16 +01:00
Lars Wallenborn	f578164b42	[FIX] sort order in birthday box ... The current sort order is by date and not by day of month. This yields the following unexpected results: Given * Person A, born on 1980-01-10 * Person B, born on 1970-01-30 I expect Person A to be listed first because their birthday is before that of Person B _in January_. But without this fix, Person B would show up first because 1970 is before 1980.	2021-01-07 11:43:11 +01:00
Frédéric FRANCE	1e8362575a	Merge remote-tracking branch 'upstream/develop' into boxindex	2021-01-06 21:05:59 +01:00
Laurent Destailleur	b553dbb9d2	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-06 20:23:07 +01:00
Laurent Destailleur	3d96c5a454	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/admin/dict.php htdocs/bom/tpl/objectline_create.tpl.php htdocs/bom/tpl/objectline_edit.tpl.php htdocs/bom/tpl/objectline_view.tpl.php htdocs/core/boxes/box_shipments.php htdocs/societe/class/societe.class.php	2021-01-06 20:20:37 +01:00
Laurent Destailleur	17306bc715	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/boxes/box_shipments.php	2021-01-06 20:12:09 +01:00
Laurent Destailleur	7372a18283	Update box_shipments.php	2021-01-06 19:56:49 +01:00
ATM john	50b5226d10	FIX #15465 External user sees last 5 shipments to other customers in the dashboard	2021-01-06 12:40:38 +01:00
Regis Houssin	f80a476bc5	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0	2021-01-06 11:37:56 +01:00
lmarcouiller	6aa2241617	Merge remote-tracking branch 'doligithub/develop' into develop#2	2021-01-05 18:07:34 +01:00
Laurent Destailleur	ed25b252b9	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-05 11:30:14 +01:00
Laurent Destailleur	40645ea24d	Fix load lang	2021-01-05 10:39:53 +01:00
Frédéric FRANCE	7291bf34f0	boxes	2021-01-02 22:29:23 +01:00
Frédéric FRANCE	dc6c1b8d3b	boxes	2021-01-02 22:12:19 +01:00
Frédéric FRANCE	bd762bc58f	boxes	2021-01-02 21:50:58 +01:00
Frédéric FRANCE	8f3e6df3e1	transform into box	2021-01-02 21:03:04 +01:00
Regis Houssin	7c5248d105	FIX and the world turn again	2020-12-30 11:27:03 +01:00
Regis Houssin	acabb045fb	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0	2020-12-29 17:12:18 +01:00
Laurent Destailleur	057945f693	Fix bad var	2020-12-29 17:04:39 +01:00
Regis Houssin	6e0832fb38	FIX WIP avoid warning with php 8.0	2020-12-29 15:59:39 +01:00
Frédéric FRANCE	08bad6fc30	remove warnings	2020-12-28 20:54:29 +01:00
Laurent Destailleur	a0440fbe88	Removed warnings	2020-12-24 03:06:52 +01:00
Laurent Destailleur	4bc0b46556	css	2020-12-21 17:33:57 +01:00
Laurent Destailleur	6937ab75fa	Fix test	2020-12-21 02:31:19 +01:00
Laurent Destailleur	0a19f3cf5b	css	2020-12-21 02:27:05 +01:00
Laurent Destailleur	5dc6f5b89f	Prepare 13.0	2020-12-21 01:33:06 +01:00
Laurent Destailleur	812fd22629	Merge branch 'develop' into develop#2	2020-12-15 14:09:29 +01:00
Laurent Destailleur	1624b8636f	Show timeone	2020-12-15 10:43:19 +01:00
Laurent Destailleur	d3ba87b09a	Better gantt	2020-12-15 02:32:56 +01:00
Laurent Destailleur	2d343ab016	Fix	2020-12-14 20:01:17 +01:00
Laurent Destailleur	9595504b56	Fix graph	2020-12-14 19:57:59 +01:00
Laurent Destailleur	b452852b30	Fix phpcs	2020-12-12 16:35:30 +01:00
Laurent Destailleur	a3d302d91c	Debug v13	2020-12-12 13:58:21 +01:00
Laurent Destailleur	0968c68cf9	Enhance widget	2020-12-12 12:45:43 +01:00
Laurent Destailleur	33bb1919f0	Merge branch 'develop' into develop#3	2020-12-12 12:23:33 +01:00
Laurent Destailleur	9100e1410e	Fix translation, add comments and clean code, fix also a small ... regression on colors for graph with lines	2020-12-11 17:59:18 +01:00
Laurent Destailleur	91ddcf6446	Merge pull request #15724 from Hystepik/develop#1 ... Close #15383 : New format for funnel of prospection	2020-12-11 16:31:46 +01:00
lmarcouiller	dea75e6158	Close #15729 : fix error on box name and format	2020-12-11 15:55:17 +01:00
lmarcouiller	54228ad256	Close #15729 : fix bug with nb jobs	2020-12-11 15:49:47 +01:00
lmarcouiller	a5cf177025	Close #15729 : first push	2020-12-11 15:22:29 +01:00
Laurent Destailleur	4ec598d571	Debug v11	2020-12-11 02:12:39 +01:00
Laurent Destailleur	693a7590ef	Fix boxes	2020-12-10 17:09:25 +01:00
lmarcouiller	716bb433e8	ajout pictogramme graph dans info box head	2020-12-10 15:50:18 +01:00
stickler-ci	0a2f656137	Fixing style errors.	2020-12-10 12:19:43 +00:00
lmarcouiller	4f6923442a	fix merge and sql synthax	2020-12-10 13:19:10 +01:00
Hystepik	a57b01e9ba	Update box_funnel_of_prospection.php	2020-12-10 11:12:33 +01:00
stickler-ci	492715811c	Fixing style errors.	2020-12-10 10:10:12 +00:00
Hystepik	14358f022d	Merge branch 'develop' into develop#1	2020-12-10 11:09:42 +01:00
Frédéric FRANCE	a256bfeb46	fix warnings	2020-12-09 17:50:21 +01:00
lmarcouiller	83286d99be	funnel horizontal bar	2020-12-09 13:31:14 +01:00
Stephane Lesage	3161f35971	Fix boxes third-parties information	2020-12-08 14:08:32 +01:00
lmarcouiller	401d61dd91	resolve auto import by IDE	2020-12-08 09:05:31 +01:00
Hystepik	3d674abfae	Merge branch 'develop' into develop#2	2020-12-08 09:01:20 +01:00
Laurent Destailleur	f21a4e8aed	Merge branch 'develop' into develop#3	2020-12-07 22:46:36 +01:00
Hystepik	2ac98d06f5	Merge branch 'develop' into develop#3	2020-12-07 09:03:59 +01:00
Frédéric FRANCE	325951877b	fix missing fields in box	2020-12-05 08:58:20 +01:00
Frédéric FRANCE	e9a12b5324	fix missing fields in box	2020-12-05 08:56:17 +01:00
Frédéric FRANCE	e3037c7e1a	doxygen	2020-12-03 17:33:22 +01:00
Laurent Destailleur	bfe4eb7309	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/emailcollector_card.php htdocs/core/modules/modProduct.class.php	2020-12-03 11:26:53 +01:00
Laurent Destailleur	af4f473c93	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/boxes/box_produits.php	2020-12-03 11:22:34 +01:00
Laurent Destailleur	0ad6ee209a	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-12-03 11:21:08 +01:00
lmarcouiller	28ac976438	Show won on graph	2020-12-03 11:14:58 +01:00
Hystepik	4830f4a3b4	Merge branch 'develop' into develop#2	2020-12-03 11:05:00 +01:00
lmarcouiller	e08f6aeb2b	Fix #15383	2020-12-03 11:00:29 +01:00
Hystepik	ecb5a3b028	Merge branch 'develop' into develop#3	2020-12-03 10:12:19 +01:00
lmarcouiller	032116b235	changes to not diplay won and lost and add on migration	2020-12-03 10:11:16 +01:00
Laurent Destailleur	ea1c55cf1e	Fix widgets that has disappeared	2020-12-02 15:16:20 +01:00
Laurent Destailleur	409b73fe2c	FIX #15582	2020-12-02 15:16:04 +01:00
lmarcouiller	c7a31b2458	new widget funnel of prospection	2020-12-02 14:42:56 +01:00
Laurent Destailleur	c8274f13eb	Merge pull request #15582 from Hystepik/develop ... Close #15307 New Widget : Encours dépassé	2020-12-02 14:01:50 +01:00
stickler-ci	5c3c3d7608	Fixing style errors.	2020-12-01 15:05:11 +00:00
lmarcouiller	95bc0ff54d	update dolibarr_state_board bug fix	2020-12-01 15:59:55 +01:00
lmarcouiller	6b5125fed0	dev widget state_board, add in user class and clean index	2020-12-01 14:50:12 +01:00
Scrutinizer Auto-Fixer	6df4954b20	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-12-01 01:41:19 +00:00
lmarcouiller	ff30021d35	Close #15307 Encours dpassé with eldy suggestions	2020-11-30 16:50:12 +01:00
lmarcouiller	cee1b3cee4	Close : Encours dépassé #15307	2020-11-30 14:52:27 +01:00
lmarcouiller	595bb893be	Close : Encours dépassé #15307	2020-11-30 14:01:56 +01:00
lmarcouiller	6e9a3c05f4	Close : Encours dépassé #15307	2020-11-30 13:52:02 +01:00
lmarcouiller	00dca7ff9b	NEW : Encours dépassé #15307	2020-11-30 13:01:45 +01:00
Laurent Destailleur	574919de52	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: .travis.yml htdocs/accountancy/bookkeeping/balance.php htdocs/adherents/class/subscription.class.php htdocs/compta/bank/categ.php htdocs/compta/facture/class/facture.class.php htdocs/core/boxes/box_task.php htdocs/core/class/commondocgenerator.class.php htdocs/core/class/interfaces.class.php htdocs/core/lib/project.lib.php htdocs/core/modules/modCategorie.class.php htdocs/expensereport/class/expensereport.class.php htdocs/fichinter/class/fichinterrec.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/install/repair.php htdocs/main.inc.php htdocs/product/price.php htdocs/projet/tasks/time.php htdocs/reception/card.php	2020-11-27 15:45:12 +01:00
Laurent Destailleur	9ce6d87b83	Clean code	2020-11-27 15:04:58 +01:00
Laurent Destailleur	ac3c129735	Clean code	2020-11-27 14:24:15 +01:00
Frédéric FRANCE	69ea0ea791	Update box_produits.php	2020-11-23 23:44:15 +01:00
Frédéric FRANCE	c7d886c918	fix status on tooltip in box last product	2020-11-23 23:25:09 +01:00
Laurent Destailleur	6c42535eb2	Maxi debug v13	2020-11-16 12:20:18 +01:00
Laurent Destailleur	cbe9fec51d	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/boxes/box_supplier_orders_awaiting_reception.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/ticket/list.php	2020-11-15 17:29:19 +01:00
Mikaël MARTIN	0c37d31e04	Update box_supplier_orders_awaiting_reception.php	2020-11-14 13:01:36 +01:00
Frédéric FRANCE	cce6afbeea	fix member status in box	2020-11-13 22:22:51 +01:00
Laurent Destailleur	90884d8085	Fix compatibility with date_delivery	2020-11-11 18:08:40 +01:00
Laurent Destailleur	47b3b30aaa	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/card.php htdocs/fourn/product/list.php htdocs/product/fournisseurs.php htdocs/societe/card.php	2020-11-10 11:10:35 +01:00
Laurent Destailleur	73df033000	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/core/boxes/box_birthdays.php	2020-11-10 11:05:53 +01:00
atm-lena	047785b273	FIX - Don't display inactive users in birthday box and soc card	2020-11-06 11:58:36 +01:00
Scrutinizer Auto-Fixer	ab25e047c0	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-31 17:51:30 +00:00
Scrutinizer Auto-Fixer	7f52920716	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-31 13:32:18 +00:00
Laurent Destailleur	aafac6f989	Fix box of events	2020-10-30 18:58:40 +01:00
Laurent Destailleur	45477aba0d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2020-10-29 13:10:50 +01:00
Laurent Destailleur	c187b41714	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-10-29 13:10:39 +01:00
Laurent Destailleur	ee4a827627	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/compta/bank/various_payment/card.php htdocs/compta/bank/various_payment/list.php htdocs/core/db/DoliDB.class.php	2020-10-29 13:10:10 +01:00
Scrutinizer Auto-Fixer	208740c9c4	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-28 16:49:52 +00:00
Frédéric FRANCE	6fc4b1b839	add small photo in box members	2020-10-27 08:17:12 +01:00
Frédéric FRANCE	da4f3fab14	dol_print_date called with a bad value	2020-10-27 08:10:19 +01:00
Laurent Destailleur	efce53abd1	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/boxes/box_services_contracts.php htdocs/expensereport/class/expensereport.class.php	2020-10-26 18:17:23 +01:00
Laurent Destailleur	9dfc08d2bd	Fix bad var name	2020-10-25 21:11:05 +01:00
Laurent Destailleur	cd4d738a56	Merge branch 'translateModLivraison2ModDelivery' of ... https://github.com/orebd/dolibarr into develop # Conflicts: # htdocs/install/mysql/migration/12.0.0-13.0.0.sql	2020-10-25 16:01:18 +01:00
Maxime Kohlhaas	7080c8491d	Fix var name in contract box	2020-10-24 19:46:57 +02:00
Regis Houssin	c0981128ff	FIX wrong object name	2020-10-19 17:10:38 +02:00
Laurent Destailleur	a1913995df	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/boxes/box_services_contracts.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/expensereport/class/expensereport.class.php	2020-10-15 21:05:00 +02:00
Laurent Destailleur	e7992131ec	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/boxes/box_services_contracts.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php	2020-10-15 21:00:49 +02:00
Laurent Destailleur	6277422115	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/contrat/class/contrat.class.php htdocs/core/boxes/box_services_contracts.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/expensereport/class/expensereport.class.php	2020-10-15 20:38:32 +02:00
Laurent Destailleur	3d68ab4059	Update box_services_contracts.php	2020-10-15 20:28:27 +02:00
Alfredo Altamirano	4a3ffbb6d4	FIX #14927 Change ContratLigne property type to product_type ... This bug is produced because the ContratLigne class gives a property type instead of a product_type	2020-10-14 22:17:50 -05:00
Alexandre SPANGARO	8876457b54	Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport	2020-10-10 06:47:05 +02:00
Laurent Destailleur	28e462e507	Debug a box with sql and performance errors	2020-10-09 16:49:23 +02:00
Alexandre SPANGARO	ca7ad35342	Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport	2020-10-09 06:39:42 +02:00
Aurélien	b6283c1a5d	Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery	2020-10-08 16:19:10 +02:00
Scrutinizer Auto-Fixer	1512521d91	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-07 13:01:28 +00:00
AurelienBinard	39d538befc	Merge branch 'develop' into translateModLivraison2ModDelivery	2020-10-06 16:20:25 +02:00
Laurent Destailleur	254d9edbb9	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-10-06 13:18:58 +02:00
Aurélien	5571a166c6	change variable #14697	2020-10-06 11:37:55 +02:00
Laurent Destailleur	63415e9728	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/boxes/box_commandes.php htdocs/core/boxes/box_propales.php htdocs/core/boxes/box_shipments.php htdocs/core/boxes/box_supplier_orders.php htdocs/core/boxes/box_supplier_orders_awaiting_reception.php htdocs/core/tpl/objectline_edit.tpl.php	2020-10-04 23:27:52 +02:00
ptibogxiv	4aafe72bf2	Fix multicompany in activity box	2020-10-04 14:19:53 +02:00
Laurent Destailleur	f217959740	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-10-03 14:51:30 +02:00
Laurent Destailleur	ca0dcb4db0	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/core/boxes/box_propales.php htdocs/core/boxes/box_supplier_orders.php	2020-10-03 14:51:18 +02:00
Laurent Destailleur	9e48920e1d	Merge pull request #14902 from ptibogxiv/patch-368 ... Fix multicompany in order box	2020-10-03 14:15:11 +02:00
Laurent Destailleur	08afb586f8	Merge pull request #14903 from ptibogxiv/patch-369 ... Fix multicompany in propal box	2020-10-03 14:13:29 +02:00
Laurent Destailleur	71ab4c4a70	Merge pull request #14905 from ptibogxiv/patch-371 ... Fix multicompany in supplier order awaiting box	2020-10-03 14:12:57 +02:00
ptibogxiv	af2bd76500	Fix multicompany in shipment box	2020-10-03 14:06:33 +02:00
ptibogxiv	69660d1a9d	Update box_supplier_orders.php	2020-10-03 14:02:59 +02:00
ptibogxiv	331db5e367	Fix multicompany in supplier order awaiting box	2020-10-03 14:01:46 +02:00
ptibogxiv	26a2fea8c7	Fix multicompany in supplier order box	2020-10-03 14:00:23 +02:00
ptibogxiv	e9c101349b	Fix multicompany in propal box	2020-10-03 13:57:37 +02:00
ptibogxiv	3840d6c0a7	Fix entity in ordre box	2020-10-03 13:52:52 +02:00
Laurent Destailleur	1a535dc77b	Clean code	2020-10-02 19:00:15 +02:00
Laurent Destailleur	ed2dd3f55f	Clean code	2020-09-24 22:02:10 +02:00
Laurent Destailleur	54c0f742b1	Fix escape	2020-09-19 21:19:04 +02:00
Laurent Destailleur	d75e1e5771	Fix #yogosha4525	2020-09-18 16:10:11 +02:00
Laurent Destailleur	eae5410ced	Protect md file	2020-09-17 16:57:39 +02:00
Laurent Destailleur	1bdd4cae9b	Merge pull request #14699 from atm-adrien/NEW_add_widget_empty_tasks ... New add widget empty tasks	2020-09-12 01:18:50 +02:00
Laurent Destailleur	ead320642e	Fix removed some non used sql requests on widgets	2020-09-12 00:58:06 +02:00
Laurent Destailleur	753396ec20	Look and feel v13	2020-09-11 12:19:40 +02:00
Laurent Destailleur	7cd437b2d7	CSS	2020-09-11 12:16:54 +02:00
stickler-ci	0fc24366e1	Fixing style errors.	2020-09-10 09:28:05 +00:00
Adrien Raze	419b2b71a9	FIX : modif requete SQL, prise en compte user connecté pour saisie des temps	2020-09-10 11:16:52 +02:00
Adrien Raze	acfae190c3	FIX : suppression lien nbTâche	2020-09-10 11:15:56 +02:00
Adrien Raze	5a30165947	FIX : correction redirection pour nbTache	2020-09-10 11:15:12 +02:00
Adrien Raze	343b39e31f	FIX : lien cliquable tiers	2020-09-10 11:14:27 +02:00
Adrien Raze	281b52db75	lien cliquable nbTache vers liste tache filtrée	2020-09-10 11:13:46 +02:00
Adrien Raze	76d5ce18ca	Titres + lien cliquable client + traductions	2020-09-10 11:12:04 +02:00
Adrien Raze	c9833c501d	SQL + insertion champs dans box	2020-09-10 11:10:06 +02:00
Adrien Raze	912999a6b6	Creation box	2020-09-10 11:09:49 +02:00
Laurent Destailleur	bd65e5612f	Fix duplicate id	2020-08-17 20:06:01 +02:00
Laurent Destailleur	c63d54631c	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/categories/class/categorie.class.php	2020-08-17 19:59:17 +02:00
Alexandre SPANGARO	27c36713d3	Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport	2020-08-16 22:10:02 +02:00
Ferran Marcet	10df9777b5	FIX: Visualization rights correction on last modified contacts box	2020-08-10 09:53:20 +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
Alexandre SPANGARO	59ee22537d	Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport	2020-07-06 03:24:27 +02:00
florian HENRY	03ae31eced	remove warning when date end contract line empty	2020-07-04 16:37:50 +02:00
florian HENRY	335a767f22	remove warning when date end contract line empty	2020-07-04 16:37:11 +02:00
Laurent Destailleur	2f5dbdc8a3	Fix bad property	2020-06-25 11:54:37 +02:00
Laurent Destailleur	bbb8c9418e	Fix bad property	2020-06-25 11:51:46 +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	1ce5b78a6b	Fix error message not reported	2020-06-22 01:02:17 +02:00
Laurent Destailleur	7d3c176727	Prepare convertion of field "montant" into "amount"	2020-06-17 12:45:56 +02:00
Laurent Destailleur	40816c02ce	Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword	2020-05-25 22:40:59 +02:00
Laurent Destailleur	384e1e31ad	Fix Popup	2020-05-25 11:30:57 +02:00
Laurent Destailleur	a44f0d24eb	Fix Popup	2020-05-25 11:06:16 +02:00
Laurent Destailleur	65708ec360	Fix responsive	2020-05-24 15:07:57 +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	68512e0281	Look and feel v12	2020-05-14 14:56:15 +02:00
Laurent Destailleur	acc7c371cb	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/contact/vcard.php htdocs/core/boxes/box_birthdays.php htdocs/core/boxes/box_birthdays_members.php htdocs/core/lib/date.lib.php	2020-04-20 16:10:19 +02:00
Maxime Kohlhaas	817e16d652	Fix birthdays boxes and filter on month	2020-04-18 20:01:18 +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	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
Laurent Destailleur	6a60678186	Look and feel v12	2020-04-09 16:36:39 +02:00
Laurent Destailleur	5819aadf75	Clean html code (replace table into table with div)	2020-04-09 13:40:26 +02:00
Laurent Destailleur	4f8b3e0646	Fix name of cookie	2020-04-06 10:02:11 +02: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
altairis	6618205e6f	fix missing class declaration	2020-03-12 15:05:32 +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
Laurent Destailleur	fc05e8d768	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/bookmarks/bookmarks.lib.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/langs/en_US/other.lang	2020-03-11 18:03:15 +01:00
Laurent Destailleur	4903287204	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/core/boxes/box_commandes.php htdocs/fourn/class/fournisseur.commande.class.php	2020-03-11 17:04:28 +01:00
Laurent Destailleur	13ffc186b7	Merge pull request #13324 from atm-florianm/FIX_10.0_status_column_empty_in_invoices_box_when_using_MAIN_STATUS_USES_CSS ... FIX 10.0 - status missing from last customer invoices box when using MAIN_STATUS_USES_CSS	2020-03-11 16:41:24 +01:00
Laurent Destailleur	8808b7df87	Merge pull request #13325 from atm-florianm/FIX_10.0_load_langs_in_box_commandes ... FIX 10.0 - missing translations for "orders" homepage "orders" box	2020-03-11 16:39:43 +01:00
Florian Mortgat	ce01cf278d	FIX 10.0 - translations for "orders" not loaded in the homepage box	2020-03-11 11:45:57 +01:00
Florian Mortgat	6d1f62c1d9	FIX 10.0 - status missing from last customer invoices box when using MAIN_STATUS_USES_CSS	2020-03-11 11:03:19 +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	ad9d0a3472	Fix graph of product distribution when too much record	2020-03-06 12:45:02 +01:00
Laurent Destailleur	5ff4b638a5	FIX empty of series in graph of product distribution	2020-03-06 12:00:40 +01:00
Laurent Destailleur	8e9d4e408f	FIX empty of series in graph of product distribution	2020-03-06 11:59:06 +01:00