1858 Commits

Author	SHA1	Message	Date
Laurent Destailleur	005b1b12c4	Work on sort of permission per family+module	2019-10-17 19:33:06 +02:00
Laurent Destailleur	87ec1de78e	Start to work on solution to sort permissions by module	2019-10-17 18:43:07 +02:00
Laurent Destailleur	e94d47daf7	Work on MRP module	2019-10-15 19:57:23 +02:00
Frédéric FRANCE	2351750d2b	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-14 19:02:46 +02:00
Laurent Destailleur	7973b03201	NEW Add estimated duration on the BOM module	2019-10-14 11:38:36 +02:00
Frédéric FRANCE	367ef4acaf	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-11 16:44:25 +02:00
Laurent Destailleur	de107fb02e	NEW Can set a squarred icon on your company setup	2019-10-11 11:27:05 +02:00
Frédéric FRANCE	02b706f9c0	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-09 13:40:46 +02:00
Laurent Destailleur	29384d9a71	Merge branch 'develop' into patch-187	2019-10-09 13:02:47 +02:00
Laurent Destailleur	dcc4fa6a64	Merge branch 'develop' into patch-255	2019-10-08 19:37:42 +02:00
Frédéric FRANCE	f253315c8d	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-08 18:30:58 +02:00
ptibogxiv	552a9498be	Update llx_product.sql	2019-10-08 16:11:50 +02:00
Laurent Destailleur	d55b7689bb	Merge pull request #11920 from ptibogxiv/patch-264 ... NEW translation for member type	2019-10-08 09:00:49 +02:00
Frédéric FRANCE	b78187c1eb	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-08 00:07:27 +02:00
Laurent Destailleur	e02794248e	Merge branch 'develop' into patch-264	2019-10-07 13:25:16 +02:00
Frédéric FRANCE	aca9d92db8	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-01 22:03:33 +02:00
florian HENRY	d48f0fa791	resolve conflixt	2019-10-01 18:07:59 +02:00
Frédéric FRANCE	9755d15f52	work on migration script	2019-10-01 17:51:44 +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	b87610adcc	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-09-30 19:34:35 +02:00
Laurent Destailleur	22f07fe54d	Merge branch 'develop' into patch-234	2019-09-30 18:09:05 +02:00
Frédéric FRANCE	258424416e	Merge remote-tracking branch 'upstream/develop' into zapier	2019-09-30 07:49:52 +02:00
ptibogxiv	d0b06a1eab	Update llx_facture.sql	2019-09-29 15:39:59 +02:00
Frédéric FRANCE	cea3669ffa	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-09-28 00:35:14 +02:00
florian HENRY	885d958e63	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault	2019-09-27 20:12:09 +02:00
Laurent Destailleur	07b555b965	Merge branch 'develop' into patch-255	2019-09-27 15:23:15 +02:00
Laurent Destailleur	6858dce344	Rename table for categorie of warehouses	2019-09-27 13:28:28 +02:00
Laurent Destailleur	a79c4608d6	Merge pull request #11934 from atm-quentin/NEW_stock_categories ... NEW Categories/Tags are also available on warehouses	2019-09-27 12:41:28 +02:00
Frédéric FRANCE	03086026b8	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-09-27 08:06:13 +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	7b3e64d67f	NEW Support of Extrafields on Leave requests.	2019-09-24 12:01:18 +02:00
Alexandre SPANGARO	02dbc11f98	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
Laurent Destailleur	64fc735340	Fix length of fields to card saved with setupintent	2019-09-23 18:12:58 +02:00
atm-quentin	c09f2d8c4e	NEW stock categories	2019-09-19 16:21:03 +02:00
ptibogxiv	4c59f6bffa	Update llx_adherent_type_lang.sql	2019-09-17 14:03:55 +02:00
ptibogxiv	430ffae8ad	Delete llx_adherent_type_lang.php	2019-09-17 14:03:22 +02:00
ptibogxiv	afb055c8a6	Create llx_adherent_type_lang.sql	2019-09-17 14:03:09 +02:00
ptibogxiv	50be1a634c	Create llx_adherent_type_lang.php	2019-09-17 14:02:19 +02:00
Frédéric FRANCE	904d0ecaee	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-09-14 18:42:31 +02:00
Frédéric FRANCE	1e652a41af	Merge remote-tracking branch 'upstream/develop' into zapier	2019-09-14 18:41:51 +02:00
Laurent Destailleur	54f0532073	Work on #4432	2019-09-14 16:51:57 +02:00
Frédéric FRANCE	c9c7d60fc0	Merge remote-tracking branch 'upstream/develop' into zapier	2019-09-14 16:37:10 +02:00
Frédéric FRANCE	bed959bb38	add entity	2019-09-12 21:17:52 +02:00
Frédéric FRANCE	3e11476810	add socialnetworks dictionary	2019-09-11 23:09:20 +02:00
Frédéric FRANCE	3fddef0c9e	add socialnetworks dictionary	2019-09-11 22:27:09 +02:00
ptibogxiv	651fbde64d	Merge branch 'develop' into patch-187	2019-09-10 20:46:54 +02:00
florian HENRY	63a83a0fa5	resolve conflict	2019-09-09 11:35:37 +02:00
Laurent Destailleur	8381b93e80	Fix init of public holidays	2019-09-09 11:06:54 +02:00
Laurent Destailleur	15eaa5cbd8	NEW Public holidays are now in a table (no more hard coded per country)	2019-09-09 10:27:56 +02:00