3512 Commits

Author	SHA1	Message	Date
Laurent Destailleur	8f34de1036	NEW Can include tag {uuu} into some numbering masks to replace with user	2017-08-29 19:44:35 +02:00
Laurent Destailleur	560d975063	Code comment	2017-08-29 12:59:13 +02:00
Laurent Destailleur	9312005318	NEW Move accountancy features into a dedicated menu	2017-08-29 12:43:47 +02:00
Laurent Destailleur	a60cd49fb0	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/actions_sendmails.inc.php htdocs/core/class/CMailFile.class.php htdocs/filefunc.inc.php	2017-08-28 12:53:02 +02:00
Laurent Destailleur	1b1ce4fdf5	Code comment	2017-08-27 19:40:43 +02:00
Regis Houssin	526ccc870b	Fix: add compatibility with old modules	2017-08-27 13:53:08 +02:00
Regis Houssin	1ce1899a46	Fix: add comment	2017-08-27 13:42:46 +02:00
Regis Houssin	d800d10766	Fix: use resprint instead resarray	2017-08-27 13:19:57 +02:00
Laurent Destailleur	c573df4f0e	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/user/card.php	2017-08-26 22:33:56 +02:00
Laurent Destailleur	4052e15565	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/comm/action/card.php	2017-08-26 21:58:29 +02:00
Laurent Destailleur	03eb870576	Fix sql syntax error	2017-08-26 20:16:12 +02:00
Laurent Destailleur	254d92070f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-08-26 19:58:01 +02:00
Laurent Destailleur	c64a21f47b	Fix regression in cleaning sql	2017-08-26 19:57:22 +02:00
Laurent Destailleur	b3f77ed9f7	Merge pull request #7276 from atm-john/new_develop_extrafields_facture_rec ... NEW extrafield on facture_rec	2017-08-26 19:26:09 +02:00
Laurent Destailleur	d9a85e6d3b	FIX Install run_sql function accept -- into sql content.	2017-08-26 19:19:23 +02:00
Laurent Destailleur	ebe84b6ac5	Fix run sql with large data	2017-08-26 16:24:55 +02:00
Laurent Destailleur	f2a437fa89	Enhance modulebuilder	2017-08-26 15:22:13 +02:00
Laurent Destailleur	98f5fbab5d	Fix error on contact/address not linked on thirdparty	2017-08-25 13:50:45 +02:00
Laurent Destailleur	d8ead2693f	Fix field position	2017-08-24 17:59:20 +02:00
John	0653a5d177	Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_develop_extrafields_facture_rec	2017-08-24 14:35:01 +02:00
Laurent Destailleur	326d3df63f	FIX select of category ... FIX pb with extrafield list and key '0' Conflicts: htdocs/core/class/extrafields.class.php	2017-08-24 13:28:56 +02:00
Laurent Destailleur	7da6f93d7e	FIX select of category ... FIX pb with extrafield list and key '0'	2017-08-24 13:23:15 +02:00
Regis Houssin	982fca541d	Fix: (Agenda) Allowed if link to third party is empty	2017-08-24 08:33:40 +02:00
Laurent Destailleur	90afbcb034	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/bank.php htdocs/core/lib/functions.lib.php	2017-08-23 17:02:53 +02:00
Laurent Destailleur	f3ef6448d7	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/admin/supplier_payment.php htdocs/core/lib/ajax.lib.php htdocs/don/admin/donation.php htdocs/product/admin/product.php	2017-08-23 16:11:51 +02:00
Laurent Destailleur	4da49dfc2d	FIX #7239	2017-08-23 15:02:38 +02:00
Laurent Destailleur	e25a428118	Fix compatibility with Internet Explorer	2017-08-23 12:32:28 +02:00
Laurent Destailleur	aae24c26a3	Some fixes with smartphones	2017-08-22 20:20:34 +02:00
Laurent Destailleur	a2b41a30fc	Fix duplicate header in website module	2017-08-22 15:44:28 +02:00
Laurent Destailleur	ec56ff59d6	Fix invalid link after renaming a website key.	2017-08-22 15:32:45 +02:00
John	b18104788e	New extrafield on facture_rec	2017-08-22 15:22:41 +02:00
Laurent Destailleur	14cd150762	NEW Introduce experimental feature to search dolistore from application	2017-08-22 14:47:01 +02:00
Regis Houssin	e86d3d7905	Fix: Travis error "Missing parameter name"	2017-08-22 09:47:33 +02:00
Laurent Destailleur	583fc485a9	Work on website module	2017-08-21 03:13:44 +02:00
Laurent Destailleur	68c31c55c5	FIX delete dir when there is symlinks	2017-08-21 01:26:22 +02:00
Laurent Destailleur	eedf5e0a22	FIX delete dir when there is symlinks	2017-08-21 01:24:34 +02:00
Laurent Destailleur	ac3a270e17	FIX Do not delete files into sym links ... Conflicts: htdocs/core/lib/files.lib.php	2017-08-21 00:43:52 +02:00
Laurent Destailleur	b9511fd4c6	FIX Do not delete files into sym links	2017-08-21 00:40:32 +02:00
Laurent Destailleur	5c5c4046a1	Prepare setup for email reminder	2017-08-20 16:07:22 +02:00
Laurent Destailleur	260beed512	NEW Generated files are now indexed in database	2017-08-18 23:19:55 +02:00
Laurent Destailleur	097b660c41	Mutualize code	2017-08-18 16:25:00 +02:00
Laurent Destailleur	4d46b2ae58	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/propale/doc/pdf_azur.modules.php htdocs/filefunc.inc.php	2017-08-17 22:21:30 +02:00
Laurent Destailleur	744f0ab198	Merge remote-tracking branch 'origin/5.0' into 6.0	2017-08-17 22:03:26 +02:00
Juanjo Menent	3330f040ba	FIX: Bad tax calculation with expense report	2017-08-16 11:19:28 +02:00
Laurent Destailleur	d37d1a033a	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/compta/bank/bankentries.php htdocs/core/lib/admin.lib.php htdocs/install/mysql/migration/repair.sql	2017-08-11 19:56:17 +02:00
Laurent Destailleur	975fd0a6d3	Fix font size	2017-08-07 15:43:42 +02:00
Laurent Destailleur	66ffc9ca47	Debug modulebuilder	2017-08-05 11:44:27 +02:00
Laurent Destailleur	180b7d3c11	Debug modulebuilder	2017-08-05 11:35:42 +02:00
Laurent Destailleur	1c157c7c3d	Fix pb with mix collation. Add a way to fix this in repair.	2017-08-04 21:23:40 +02:00
Laurent Destailleur	402e6bf650	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/various_payment/card.php htdocs/compta/bank/various_payment/index.php htdocs/compta/paiement/list.php htdocs/core/modules/modCron.class.php	2017-08-04 15:39:00 +02:00