16404 Commits

Author	SHA1	Message	Date
John BOTELLA	57c6c60118	Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status	2019-03-11 14:44:35 +01:00
John BOTELLA	5d7118340b	Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu	2019-03-11 14:40:19 +01:00
Laurent Destailleur	7e547f3f16	Fix type of parameter	2019-03-11 12:07:28 +01:00
Laurent Destailleur	fac329e637	Clean code	2019-03-11 01:01:15 +01:00
Laurent Destailleur	935fe7c22a	Debug and enhance modulebuilder.	2019-03-10 19:33:28 +01:00
Laurent Destailleur	d659543ac0	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-03-09 19:00:57 +01:00
Laurent Destailleur	fa4467fb5f	FIX Tooltip on click was ko on smartphone	2019-03-09 18:37:07 +01:00
Laurent Destailleur	b710e28ffa	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/admin/adherent.php htdocs/admin/barcode.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/langs/en_US/admin.lang	2019-03-09 01:20:13 +01:00
Laurent Destailleur	c6d7987b57	FIX method db->active does not exists	2019-03-09 01:06:07 +01:00
Laurent Destailleur	73b359c124	Fix class visibility	2019-03-09 00:54:10 +01:00
Laurent Destailleur	e38427a41f	Fix var not initialized	2019-03-08 19:56:21 +01:00
Laurent Destailleur	fb5757a633	Merge pull request #10775 from frederic34/fourn-html5 ... replace html by html5 in fourn	2019-03-08 19:36:11 +01:00
Laurent Destailleur	86f4e81a6e	Merge pull request #10773 from frederic34/patch-2 ... Update stats.class.php	2019-03-08 19:33:40 +01:00
Laurent Destailleur	9c97b2af30	Merge pull request #10769 from altatof/expe ... NEW : add product extrafields to shipping export	2019-03-08 19:33:09 +01:00
John BOTELLA	ccebb8d1a7	Fix travis errors	2019-03-08 14:40:22 +01:00
Laurent Destailleur	1a96a7a88f	FIX More complete auto setup of barcode module ... Add tooltip help on member setup module	2019-03-08 11:31:12 +01:00
Laurent Destailleur	ebc2289292	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-03-07 20:53:16 +01:00
Laurent Destailleur	0798f7b719	NEW Can upload files from the edit page of expense report	2019-03-07 20:53:03 +01:00
Frédéric FRANCE	d96cc53f97	replace html by html5 in fourn	2019-03-07 20:46:38 +01:00
Frédéric FRANCE	1917adb980	Update stats.class.php ... The property _lastfetchdate is declared private in Stats and cannot be accessed from this context.	2019-03-07 17:35:02 +01:00
Laurent Destailleur	4ecc1dac56	Merge pull request #10756 from altatof/fp2 ... NEW : add constant DISPLAY_DISCOUNTED_SUPPLIER_PRICE	2019-03-07 17:29:10 +01:00
John BOTELLA	a0b14b9105	Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status	2019-03-07 15:53:41 +01:00
John BOTELLA	74c8754092	fix travis	2019-03-07 15:49:16 +01:00
John BOTELLA	97544e0aea	add new dolGetStatus to LibStatut in common invoice class	2019-03-07 15:24:11 +01:00
Christophe Battarel	d414e3eb48	add product extrafields	2019-03-07 15:00:48 +01:00
Laurent Destailleur	8d0a8d8263	Merge pull request #10758 from altatof/lf ... NEW : add constant MAIN_DEFAULT_LANGUAGE_FILTER	2019-03-07 14:18:26 +01:00
Laurent Destailleur	975afd014d	Merge pull request #10763 from frederic34/patch-6 ... Update eldy.lib.php	2019-03-07 14:15:53 +01:00
Laurent Destailleur	ddc52b7199	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/tpl/objectline_create.tpl.php htdocs/exports/export.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/fourn/facture/card.php	2019-03-07 14:13:38 +01:00
Laurent Destailleur	02b8bc94e7	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-07 14:06:31 +01:00
Laurent Destailleur	e96f84a3d6	Merge pull request #10765 from altatof/sd8 ... FIX : supplier discount was not retrieved when choosing a product	2019-03-07 13:26:44 +01:00
Laurent Destailleur	0349f9bfaa	Update objectline_create.tpl.php	2019-03-07 13:26:25 +01:00
Laurent Destailleur	3757fa83fd	Merge pull request #10760 from altatof/db ... Avoid doing empty queries	2019-03-07 13:04:46 +01:00
Laurent Destailleur	daaa4ca0c2	Merge pull request #10749 from frederic34/PSR2.Classes.PropertyDeclaration.VarUsed ... PSR2.Classes.PropertyDeclaration.VarUsed	2019-03-07 12:49:13 +01:00
Laurent Destailleur	8ffab05f67	Merge pull request #10759 from altatof/ml ... NEW : sort list of models alphabetically	2019-03-07 12:47:50 +01:00
Laurent Destailleur	b4bdbda9f5	Update mysqli.class.php	2019-03-07 12:36:57 +01:00
Laurent Destailleur	fc87090669	Merge pull request #10764 from frederic34/patch-7 ... New format type 5 for email	2019-03-07 12:33:24 +01:00
Laurent Destailleur	d6cf493880	Merge pull request #10768 from altatof/export ... FIX avoid timeout for big export	2019-03-07 12:31:51 +01:00
Christophe Battarel	a6bb1cf5f6	avoid timeout	2019-03-07 11:27:06 +01:00
Laurent Destailleur	a426c8e9bf	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/system/filecheck.php htdocs/compta/facture/class/facture.class.php htdocs/filefunc.inc.php htdocs/install/upgrade2.php htdocs/product/class/product.class.php	2019-03-07 11:16:24 +01:00
John BOTELLA	5ea5d51247	Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status	2019-03-07 09:41:03 +01:00
John BOTELLA	89157234b7	Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu	2019-03-07 09:33:11 +01:00
Christophe Battarel	96b8da0d62	fix supllier discount	2019-03-06 22:04:01 +01:00
Frédéric FRANCE	d39b600ff4	Update CMailFile.class.php	2019-03-06 20:29:58 +01:00
Frédéric FRANCE	9e6a5a0b81	Update eldy.lib.php	2019-03-06 18:49:03 +01:00
Christophe Battarel	414bac6fb4	avoid logging empty query	2019-03-06 17:56:43 +01:00
Christophe Battarel	8f8fe0648e	fix bad copy paste	2019-03-06 17:24:50 +01:00
Christophe Battarel	4382a26c87	sort list of models alphabetically	2019-03-06 17:21:44 +01:00
Christophe Battarel	ceab55f26b	NEW : add constant MAIN_DEFAULT_LANGUAGE_FILTER	2019-03-06 17:07:51 +01:00
Frédéric FRANCE	c2070190f2	phpcs fix	2019-03-06 16:51:35 +01:00
Christophe Battarel	4e533b2a91	better constant test	2019-03-06 16:41:28 +01:00