643 Commits

Author	SHA1	Message	Date
Laurent Destailleur	6c8d302dd9	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/prelevement/list.php htdocs/compta/prelevement/rejets.php htdocs/fourn/commande/index.php	2020-05-07 12:03:49 +02:00
Laurent Destailleur	2afd38e2f6	FIX Combo list of available users to filter on the list of leaves.	2020-05-04 21:59:31 +02:00
Laurent Destailleur	16e46c672c	Clean code	2020-04-20 15:06:27 +02:00
Laurent Destailleur	2bf36bff6d	Fix restore dir at good place	2020-04-13 04:19:25 +02:00
Laurent Destailleur	3740d59848	Look and feel v12	2020-04-13 04:14:28 +02:00
Laurent Destailleur	92b6b1a042	Look and feel v12	2020-04-12 18:13:43 +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
Frédéric FRANCE	fc34b5a4cb	compress png with zopflipng	2020-04-06 19:03:48 +02:00
Laurent Destailleur	33c5db9cc3	Prepare code for the new pagination possibility	2020-03-13 13:07:11 +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
atm-quentin	9446138951	FIX ecm_files didnt match cause document ref contained "/"	2020-03-03 12:07:18 +01:00
Laurent Destailleur	1875b6a49b	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/company.lib.php htdocs/core/lib/security2.lib.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php htdocs/core/modules/expedition/doc/pdf_espadon.modules.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/core/modules/facture/doc/pdf_sponge.modules.php htdocs/core/modules/livraison/doc/pdf_typhon.modules.php htdocs/core/modules/propale/doc/pdf_cyan.modules.php htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php	2020-02-05 14:53:47 +01:00
Laurent Destailleur	1fe9783760	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/holiday/class/holiday.class.php htdocs/product/index.php	2020-02-05 14:38:19 +01:00
Laurent Destailleur	a36cf1f86b	Fix phpunit	2020-02-05 14:08:13 +01:00
Laurent Destailleur	334c69841a	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2020-02-05 13:41:30 +01:00
Laurent Destailleur	9100b8a548	FIX SQL request and phpunit	2020-02-05 13:41:10 +01:00
Laurent Destailleur	c101c3dd55	Update holiday.class.php	2020-02-05 13:27:22 +01:00
Laurent Destailleur	d35994e5db	Update holiday.class.php	2020-02-05 13:25:51 +01:00
Regis Houssin	e74e63941d	FIX use "usergroup" instead "user"	2020-02-03 11:55:55 +01:00
Regis Houssin	bc3a210d12	FIX compatibility with multicompany (avoid duplicate data)	2020-02-03 11:46:18 +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
AdrianDominik	5fb15ff0f8	FIX: add traslate from remains holidays	2020-01-16 14:01:41 +01:00
Laurent Destailleur	3bd95c205d	Tooltip to understand the new dictionary of holidays	2020-01-15 14:54:17 +01:00
Laurent Destailleur	141ca20269	Trans	2020-01-15 14:44:53 +01:00
Laurent Destailleur	f44b85f557	Fix $_SESSION['newtoken'] must be newToken()	2019-12-18 23:12:31 +01:00
Laurent Destailleur	92070fa491	Fix name of variable $trigger_name into $triggersendname	2019-12-02 09:38:16 +01:00
Laurent Destailleur	b06c281178	Fix error with postgresql	2019-11-26 12:39:31 +01:00
Laurent Destailleur	d34f487c65	Decode subject by emailcollector	2019-11-24 21:30:00 +01:00
Laurent Destailleur	19fb6bfd17	FIX Use PROV as temporary ID for leaves	2019-11-24 18:25:55 +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	171b94fc5c	Merge pull request #12429 from Dolibarr/scrutinizer-patch-5 ... Scrutinizer Auto-Fixes	2019-11-14 08:50:24 +01: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
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
Laurent Destailleur	b5e47e05f4	Merge pull request #12348 from frederic34/patch-11 ... add info for tooltip	2019-11-07 11:28:41 +01:00
Frédéric FRANCE	361e8eb822	add info for tooltip	2019-11-05 21:44:32 +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
Laurent Destailleur	1aef1c60dd	Merge pull request #11867 from frederic34/socialnetworks ... NEW add socialnetworks dictionary	2019-11-04 21:10:22 +01:00
Laurent Destailleur	11500fb8d9	FIX confusion between permto... and permisstionto...	2019-11-04 15:33:49 +01:00
Frédéric FRANCE	872f58f261	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-11-03 21:48:24 +01:00
Laurent Destailleur	25e64b0610	Merge branch 'develop' into socid	2019-11-02 12:01:06 +01:00
Laurent Destailleur	537f678268	Merge pull request #12285 from frederic34/patch-13 ... Update define_holiday.php	2019-11-02 11:51:38 +01:00
Laurent Destailleur	68691ddd8a	Merge pull request #12265 from grandoc/new_branch_30_10_2019 ... add comment	2019-11-02 11:49:28 +01:00
Frédéric FRANCE	7bd88f33a0	Update define_holiday.php	2019-11-01 22:22:07 +01:00
Frédéric FRANCE	dbed10a701	Merge remote-tracking branch 'upstream/develop' into socid	2019-11-01 21:39:20 +01:00
Laurent Destailleur	b19593bb8e	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/holiday/card.php	2019-11-01 21:30:19 +01:00
Laurent Destailleur	cf2ee892ee	FIX security check. A user can see holiday with link without permissions	2019-11-01 21:27:19 +01:00
Laurent Destailleur	2d9135b6ad	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/expedition/card.php htdocs/holiday/list.php	2019-11-01 21:06:06 +01:00