17660 Commits

Author	SHA1	Message	Date
Laurent Destailleur	a7af1b1765	Remove deprecated code	2019-02-14 16:29:13 +01:00
Laurent Destailleur	e6e18ff616	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/menus/edit.php htdocs/product/stock/card.php htdocs/product/stock/info.php htdocs/product/stock/movement_list.php	2019-02-14 15:33:17 +01:00
Laurent Destailleur	89050da856	Merge	2019-02-14 15:27:31 +01:00
Laurent Destailleur	d2ee00d4bb	Update security.lib.php ... Avoid regression on test of restrictArea	2019-02-14 15:21:01 +01:00
Laurent Destailleur	42f754cbc0	Merge pull request #10596 from frederic34/patch-33 ... Update functionsnumtoword.lib.php	2019-02-14 13:33:03 +01:00
Laurent Destailleur	afc612c2cb	Merge pull request #10592 from frederic34/patch-30 ... Update mod_expensereport_sand.php	2019-02-14 13:32:00 +01:00
Laurent Destailleur	418bab3214	Merge pull request #10591 from frederic34/patch-29 ... Update mod_payment_ant.php	2019-02-14 13:31:51 +01:00
Laurent Destailleur	a655481adb	Merge pull request #10590 from frederic34/patch-28 ... Update mod_ticket_universal.php	2019-02-14 13:31:33 +01:00
Laurent Destailleur	cd9bd26267	Merge pull request #10589 from frederic34/patch-27 ... Update mod_facture_mercure.php	2019-02-14 13:31:15 +01:00
Laurent Destailleur	b69a416960	Merge pull request #10588 from frederic34/patch-24 ... Update mod_commande_fournisseur_orchidee.php	2019-02-14 13:29:15 +01:00
Laurent Destailleur	7e4a4c2ae6	Merge pull request #10587 from frederic34/patch-23 ... Update mod_holiday_immaculate.php	2019-02-14 13:28:56 +01:00
Laurent Destailleur	c45ed24342	Merge pull request #10586 from frederic34/patch-22 ... Update modules_holiday.php	2019-02-14 13:28:30 +01:00
Laurent Destailleur	67c8ab47ea	Merge branch 'develop' into patch-21	2019-02-14 13:27:46 +01:00
Laurent Destailleur	6b00bb1a6f	Merge pull request #10583 from frederic34/patch-18 ... Update company.lib.php	2019-02-14 13:26:21 +01:00
Laurent Destailleur	518d42e309	Merge pull request #10572 from aspangaro/10.0_subledger ... NEW: Add employee/user to subledger account list	2019-02-14 13:24:59 +01:00
Laurent Destailleur	943f975806	Merge pull request #10580 from frederic34/patch-2 ... update doc in barcode.lib.php	2019-02-14 13:23:28 +01:00
Laurent Destailleur	c59313a3cb	Merge pull request #10574 from aspangaro/10.0_menu ... FIX: Accountancy journal label menu on Auguria	2019-02-14 13:22:49 +01:00
Laurent Destailleur	3050366372	Fix table of units already exists. Merge duplicate c_measuring_units ... with c_units.	2019-02-14 13:02:44 +01:00
Regis Houssin	359318392f	FIX missing entity filter in function "build_filterField()" (export)	2019-02-14 10:47:07 +01:00
Regis Houssin	aa4c5ae839	FIX missing access security checking with multicompany	2019-02-14 10:12:15 +01:00
Frédéric FRANCE	0594061ef4	Update functionsnumtoword.lib.php	2019-02-14 00:03:10 +01:00
Frédéric FRANCE	6276845956	Update mod_expensereport_sand.php	2019-02-13 23:48:44 +01:00
Frédéric FRANCE	1e52ef19a5	Update mod_payment_ant.php	2019-02-13 23:45:28 +01:00
Frédéric FRANCE	423a69ffad	Update mod_ticket_universal.php	2019-02-13 23:44:06 +01:00
Frédéric FRANCE	210fb2eac1	Update mod_facture_mercure.php	2019-02-13 23:41:47 +01:00
Frédéric FRANCE	5c50ea8afe	Update mod_commande_fournisseur_orchidee.php ... The property db does not exist on mod_commande_fournisseur_orchidee	2019-02-13 23:39:02 +01:00
Frédéric FRANCE	9370c8b3f6	Update mod_holiday_immaculate.php	2019-02-13 23:36:16 +01:00
Frédéric FRANCE	e0843e6130	Update modules_holiday.php	2019-02-13 23:35:44 +01:00
Laurent Destailleur	a689f8dc3f	Code comment	2019-02-13 23:34:28 +01:00
Frédéric FRANCE	b18927a6c1	Update cunits.class.php	2019-02-13 23:13:48 +01:00
Frédéric FRANCE	154ba78ee7	Update company.lib.php	2019-02-13 22:43:12 +01:00
Frédéric FRANCE	b9d37c276d	update doc in barcode.lib.php	2019-02-13 22:23:14 +01:00
Laurent Destailleur	2311912d8a	Merge branch 'develop' into dev_importproduct_measuringunit	2019-02-13 16:35:46 +01:00
Laurent Destailleur	f60940a141	Merge pull request #10560 from Toumaniere/9.0 ... Fix #10551 : MailmanSpip & Adherent : add and remove mailman list	2019-02-13 16:31:32 +01:00
Laurent Destailleur	69313cbf0d	Merge pull request #10567 from frederic34/patch-18 ... Update images.lib.php	2019-02-13 16:25:32 +01:00
Laurent Destailleur	903ba57e09	Merge pull request #10565 from frederic34/patch-2 ... fix doc in tax.lib.php	2019-02-13 16:25:12 +01:00
Laurent Destailleur	534eac1a54	Merge pull request #10566 from frederic34/patch-17 ... Update rssparser.class.php	2019-02-13 16:24:45 +01:00
Timoté Fallais	9a28c12781	reform MEMBER_VALIDATE and MEMBER_MODIFY code correctly	2019-02-13 14:57:37 +01:00
Timoté Fallais	a115b1da7f	Fix MailmanSpip bad adherent type after update	2019-02-13 14:45:51 +01:00
Alexandre SPANGARO	849299cdb6	FIX: Accountancy journal label menu on Auguria	2019-02-13 11:52:31 +01:00
Laurent Destailleur	ced386fdca	Fix phpcs	2019-02-13 11:32:00 +01:00
florian HENRY	de87321c15	fix travcis	2019-02-13 10:28:08 +01:00
Alexandre SPANGARO	4c8ee6950b	NEW: Add employee/user to subledger account list ... With ACCOUNTANCY_COMBO_FOR_AUX	2019-02-13 09:41:44 +01:00
florian HENRY	e2d13c0e1f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... dev_importproduct_measuringunit Conflicts: htdocs/contact/consumption.php htdocs/webservices/server_productorservice.php	2019-02-13 09:23:52 +01:00
florian HENRY	5c059c897d	fix travis (mosty for dev no conerne by my changes)	2019-02-13 09:21:14 +01:00
florian HENRY	d88475c61a	Merge branch 'develop' of local repository into dev_importproduct_measuringunit	2019-02-13 08:59:18 +01:00
Frédéric FRANCE	e4b73e8273	Update images.lib.php	2019-02-12 23:39:59 +01:00
Frédéric FRANCE	fa31f95356	Update rssparser.class.php	2019-02-12 23:31:21 +01:00
Frédéric FRANCE	2aae952760	fix doc in tax.lib.php	2019-02-12 23:25:26 +01:00
Laurent Destailleur	5fceee3048	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/install/mysql/migration/8.0.0-9.0.0.sql	2019-02-12 19:02:19 +01:00