9016 Commits

Author	SHA1	Message	Date
Alexandre SPANGARO	504e1e1ec8	Step 3: Work on card	2017-03-19 07:26:15 +01:00
Laurent Destailleur	967f3f579d	Fix translation	2017-03-18 20:07:37 +01:00
Laurent Destailleur	597fb11d08	Fix error management in duplicate trigger	2017-03-18 11:36:48 +01:00
Laurent Destailleur	deb91ad7c1	FIX Data lost during merge of thirdparties	2017-03-15 13:30:30 +01:00
Laurent Destailleur	7f8c4d7d0f	Fix CSS	2017-03-14 14:33:25 +01:00
Laurent Destailleur	ec7d48931e	Merge duplicate menus/page on projects	2017-03-14 13:49:04 +01:00
Alexandre SPANGARO	c6c07bf9f4	New : Add project to social contributions	2017-03-12 14:32:49 +01:00
Laurent Destailleur	d1fe6a408c	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-11 12:41:47 +01:00
Laurent Destailleur	9d63697d2a	Fix missing translation	2017-03-11 12:04:01 +01:00
Laurent Destailleur	9cbc5387ef	Fix text	2017-03-11 11:41:02 +01:00
Laurent Destailleur	0ff4f7e694	Fix translation	2017-03-11 03:10:57 +01:00
Laurent Destailleur	4bf0e31299	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.form.class.php htdocs/langs/en_US/loan.lang htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2017-03-11 02:40:42 +01:00
Laurent Destailleur	c0b3219c72	Missing translation	2017-03-11 00:33:04 +01:00
Laurent Destailleur	c72e7c1057	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/files.lib.php	2017-03-10 14:54:35 +01:00
Laurent Destailleur	fda84995e8	If manage zero is set, we must NOT set length. So we can here make a ... shortcut to avoid useless code.	2017-03-10 11:50:57 +01:00
Laurent Destailleur	6cd53cb471	Merge pull request #6482 from aspangaro/5.0-27 ... Fix : Language & revert a description of the function	2017-03-10 11:12:42 +01:00
Laurent Destailleur	c962daabac	NEW add property to show warnings when activating modules	2017-03-09 15:16:16 +01:00
Laurent Destailleur	d241adc201	NEW Use autocompletion on the "Add widget list".	2017-03-09 13:22:43 +01:00
Alexandre SPANGARO	6ce8aa7d6f	Merge remote-tracking branch 'uptream/develop' into 6.0-stripe	2017-03-07 22:08:23 +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	f67c967d0b	FIX The vat rate line used when adding a predefined product was wrong if ... there is several vat line with same rate.	2017-03-04 22:27:44 +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	0a0797e797	Rename menu entry	2017-03-03 13:36:38 +01:00
Laurent Destailleur	807eb56807	Add BHD currency	2017-03-03 13:15:20 +01:00
Alexandre SPANGARO	19ce0b0d89	Fix : Language & revert a description of the function	2017-03-03 06:22:12 +01:00
Laurent Destailleur	d202003e29	Fix translation	2017-03-01 18:12:06 +01:00
Alexandre SPANGARO	05e50e1027	Merge remote-tracking branch 'uptream/develop' into 6.0-stripe	2017-02-28 05:52:43 +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
Laurent Destailleur	bf591f5f91	Work on module website	2017-02-24 21:13:40 +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	a0fb53d5b1	Merge branch 'develop' into NEW_pdf_supplier_payment	2017-02-22 14:20:47 +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
Alexandre SPANGARO	942b58efaf	New : Integration of Stripe	2017-02-22 06:33:52 +01:00
Laurent Destailleur	d5bb208957	Clean admin menu entries	2017-02-22 02:19:50 +01:00
Laurent Destailleur	fc6fb61476	Minor fix in typo	2017-02-22 02:19:05 +01:00
florian HENRY	c8de648924	fix unit trad	2017-02-21 19:07:57 +01:00
Laurent Destailleur	ebe625aa16	Fix debug direct debit module	2017-02-21 13:16:28 +01:00
Laurent Destailleur	7ab600781d	NEW Move login information on home page into a widget	2017-02-21 11:57:52 +01:00
Laurent Destailleur	992f292a05	Translation	2017-02-21 10:59:49 +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
Laurent Destailleur	6c40110613	Sync transifex	2017-02-21 10:26:11 +01:00
Laurent Destailleur	68ded1b4c3	Fix language	2017-02-20 19:30:34 +01:00
Laurent Destailleur	3e2c0d26f2	Fix MVC	2017-02-20 11:59:58 +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	501f118f92	Fix style	2017-02-19 22:53:29 +01:00
Laurent Destailleur	fd111cb1c6	NEW tooltip can be on hover or on click with textwithpicto function.	2017-02-17 17:11:14 +01:00