4837 Commits

Author	SHA1	Message	Date
Laurent Destailleur	50044ed21e	FIX #6499	2017-03-10 12:45:56 +01:00
arnaud	a796a321cc	Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects ... Conflicts: htdocs/core/class/html.formfile.class.php htdocs/product/admin/product.php htdocs/product/card.php	2017-03-10 12:16:55 +01:00
arnaud	1d31603ad2	Merge branch '3.9' of github.com:Dolibarr/dolibarr into 3.9_dalibo	2017-03-10 11:46:59 +01:00
Laurent Destailleur	46eedeafe8	Fix message shown to many times	2017-03-10 11:30:46 +01:00
Laurent Destailleur	8389db18bf	Fix solution for comaptibility	2017-03-10 10:07:09 +01:00
Laurent Destailleur	d241adc201	NEW Use autocompletion on the "Add widget list".	2017-03-09 13:22:43 +01:00
arnaud	4a7e3fb387	NEW odt usergroup	2017-03-08 11:34:21 +01:00
Laurent Destailleur	8ac1aab45a	Uniformize look and feels	2017-03-07 18:34:57 +01:00
florian HENRY	fc63008485	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_replace_extrefield_checkboxByMultiSelect	2017-03-06 15:35:29 +01:00
Laurent Destailleur	4e4045d18a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-05 22:12:08 +01:00
Laurent Destailleur	5f79b2d0c6	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/account.php htdocs/accountancy/admin/categories.php htdocs/expensereport/class/expensereport.class.php htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2017-03-05 22:11:35 +01:00
Laurent Destailleur	52a4863ed8	Merge pull request #6480 from dolibarr95/patch-2 ... Add label tag	2017-03-05 21:40:31 +01:00
Laurent Destailleur	5fa6592d6e	Fix bad conf used	2017-03-04 20:10:50 +01:00
Laurent Destailleur	379e0083ab	Fix bad help	2017-03-03 18:00:53 +01:00
Laurent Destailleur	6c91cb4f90	Fix it was not possible to create/edit a new chart of account	2017-03-03 17:59:49 +01:00
Laurent Destailleur	28ad50e059	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/tpl/objectline_create.tpl.php htdocs/langs/de_DE/bills.lang htdocs/langs/fr_FR/bills.lang htdocs/langs/fr_FR/main.lang htdocs/langs/fr_FR/suppliers.lang	2017-03-03 14:31:35 +01:00
Laurent Destailleur	85518c6a54	FIX #6479	2017-03-03 14:04:40 +01:00
Laurent Destailleur	07c828d38f	Introduce method loadLangs to save code lines	2017-03-03 13:27:51 +01:00
arnaud	cff9fa0e6b	FIX user odt	2017-03-03 12:01:58 +01:00
arnaud	abeba95de9	New USER odt	2017-03-02 15:13:42 +01:00
dolibarr95	d3a80795ce	Add label tag ... Add a label html tag for the input radio extrafield tag.	2017-03-02 11:40:43 +01:00
Laurent Destailleur	d202003e29	Fix translation	2017-03-01 18:12:06 +01:00
Laurent Destailleur	8487f0fc96	Fix missing setup of new option	2017-03-01 11:18:11 +01:00
Laurent Destailleur	3c54cb5ba9	Fix avoid trigger during migration	2017-02-28 20:55:14 +01:00
Laurent Destailleur	9648f20a2e	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-28 12:08:41 +01:00
Laurent Destailleur	59d2943d8d	Fix context must be provided to triggers using ->context no a dedicated ... property.	2017-02-28 12:07:05 +01:00
Laurent Destailleur	0f22beb774	Upgrade to ckeditor 4.6.2.	2017-02-28 10:49:58 +01:00
Laurent Destailleur	74e8fb9c19	NEW Can set number of dump to keep with job "local database backup"	2017-02-27 02:04:25 +01:00
Laurent Destailleur	43f3e46aac	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-27 01:23:48 +01:00
Laurent Destailleur	4f24613de0	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/expensereport/class/expensereport.class.php	2017-02-27 01:19:03 +01:00
Laurent Destailleur	92acbbd8a8	Fix parameters	2017-02-27 00:22:11 +01:00
Ion	320da17c78	Add object extrafields to mail form	2017-02-26 03:42:42 +01:00
Laurent Destailleur	1ef899dacc	Prepare database to follow supplier discounts	2017-02-24 15:22:32 +01:00
Laurent Destailleur	baa1f3ed2b	Clean doc about changes in external libraries	2017-02-24 14:35:20 +01:00
Laurent Destailleur	fb88eaf2a4	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php	2017-02-23 02:55:50 +01:00
Laurent Destailleur	92d9eb3c5d	Several fix for a better management of #6424	2017-02-22 17:46:54 +01:00
Laurent Destailleur	24c2675705	Merge pull request #6424 from atm-florian/dev_can_send_to_multiple_email ... NEW : Can send email to multiple destinaries from mail form	2017-02-22 14:39:35 +01:00
Laurent Destailleur	ba03b17354	Fix css	2017-02-22 14:30:39 +01:00
Laurent Destailleur	a0fb53d5b1	Merge branch 'develop' into NEW_pdf_supplier_payment	2017-02-22 14:20:47 +01:00
Laurent Destailleur	cbe855370b	Merge pull request #6451 from laudeco/feature/list_user_by_firstname ... FIX - use MAIN_FIRSTNAME_NAME_POSITION for select users	2017-02-22 14:17:00 +01:00
Laurent Destailleur	3f3b82ed64	Merge pull request #6454 from atm-florian/dev_fix_unittrad ... fix unit trad	2017-02-22 14:16:28 +01:00
Laurent Destailleur	1681445427	Remove useless line	2017-02-22 00:08:25 +01:00
florian HENRY	c8de648924	fix unit trad	2017-02-21 19:07:57 +01:00
Laurent Destailleur	eef3824f8c	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/categories.php htdocs/admin/dict.php htdocs/langs/de_DE/bills.lang htdocs/langs/en_US/main.lang htdocs/langs/fr_FR/bills.lang	2017-02-21 10:34:52 +01:00
De Coninck Laurent	33d1d78329	FIX - use MAIN_FIRSTNAME_NAME_POSITION for select users	2017-02-21 09:22:50 +01:00
Alexis ALGOUD	4a97864d23	change for tms	2017-02-20 15:54:02 +01:00
Alexis ALGOUD	07d6bbf835	change for tms	2017-02-20 15:53:43 +01:00
Laurent Destailleur	a8129ce46e	Fix transaction/sql error	2017-02-20 11:49:27 +01:00
Laurent Destailleur	89d10ae5aa	Fix the accounting account groups must be editable by book keeper, not ... admin user.	2017-02-20 11:21:38 +01:00
Laurent Destailleur	2dbae7b808	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-17 17:14:00 +01:00