1780 Commits

Author	SHA1	Message	Date
Laurent Destailleur	dcc4fa6a64	Merge branch 'develop' into patch-255	2019-10-08 19:37:42 +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
Laurent Destailleur	e02794248e	Merge branch 'develop' into patch-264	2019-10-07 13:25:16 +02:00
florian HENRY	d48f0fa791	resolve conflixt	2019-10-01 18:07:59 +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	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
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	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	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
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
florian HENRY	bdb297a380	resolve conflict	2019-09-09 10:15:44 +02:00
Frédéric FRANCE	4054ebaf27	wip	2019-09-07 15:12:07 +02:00
Laurent Destailleur	ca71f02d41	Merge branch 'develop' into develop_pdf	2019-09-06 23:30:12 +02:00
Laurent Destailleur	e1ee70fd8f	Start to implement date selection of supplier proposals	2019-09-06 12:45:27 +02:00
ptibogxiv	e55c7bc378	Update llx_facture.sql	2019-09-06 11:22:22 +02:00
florian HENRY	dff7be59c8	mostlyDone	2019-09-06 09:22:53 +02:00
Laurent Destailleur	37a32af7b0	NEW Add dictionary to store public holidays.	2019-09-05 20:19:13 +02:00
Regis Houssin	ecaa2df0b8	FIX change "rowid" type in llx_accounting_account (bigint instead int)	2019-09-05 10:37:09 +02:00
Laurent Destailleur	7aaf3ac629	Typo	2019-09-04 15:41:09 +02:00
florian HENRY	405c92640c	on going	2019-09-02 14:47:32 +02:00
florian HENRY	b535bc0cb9	start dev	2019-09-02 11:27:04 +02:00
Laurent Destailleur	04057cd83e	Prepare reengeneering of project usage	2019-09-01 02:02:38 +02:00
Laurent Destailleur	d668b79738	NEW Add column tms into the table of targets for emailing	2019-08-28 18:14:46 +02:00
ptibogxiv	869e497a48	NEW : Platforme compliance with Stripe Connect	2019-08-21 16:41:36 +02:00
atm-greg	f8ad8d72c0	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_fk_projet_on_stock_movement	2019-08-12 15:16:43 +02:00
atm-greg	acdf13d769	add fk_projet on stock movements	2019-08-12 15:08:15 +02:00
Frédéric FRANCE	28100f67ac	Update llx_c_price_expression.sql	2019-08-07 13:25:14 +02:00
Laurent Destailleur	a7390e7e47	Merge pull request #11396 from ATM-Consulting/New_retained_warranty_develop ... NEW Management of retained warranty on situation invoices	2019-07-30 21:53:09 +02:00
Laurent Destailleur	f5afc50067	Merge branch '11.0_salaries' of https://github.com/aspangaro/dolibarr into aspangaro-11.0_salaries	2019-07-22 18:47:35 +02:00
Laurent Destailleur	5d1a50bcb4	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-20 14:03:18 +02:00
Laurent Destailleur	ac8a776113	FIX Column 'paid' missing in expense report	2019-07-20 14:02:53 +02:00
Alexandre SPANGARO	9ab0734415	NEW Extrafields on salaries	2019-07-19 23:08:24 +02:00
Alexandre SPANGARO	21bd46fc15	Merge remote-tracking branch 'upstream/develop' into 11.0_salaries	2019-07-17 14:09:46 +02:00