8223 Commits

Author	SHA1	Message	Date
Laurent Destailleur	5afed31265	Merge pull request #4305 from marcosgdf/bug-4036 ... FIX #4036 Direct printing module without any driver configured, shows an unformatted error message	2015-12-27 17:37:29 +01:00
Marcos García de La Fuente	c40c695d20	FIX #4036 Direct printing module without any driver configured, shows an unformatted error message	2015-12-27 14:58:33 +01:00
Marcos García de La Fuente	686348a0d6	FIX #4287 SQL error when accessing an unexisting proposal	2015-12-25 11:47:48 +01:00
Laurent Destailleur	7e03aaee23	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-12-21 12:25:47 +01:00
Laurent Destailleur	96b6f0d8fb	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: composer.json htdocs/product/ajax/products.php htdocs/product/class/product.class.php	2015-12-21 12:24:24 +01:00
Laurent Destailleur	9334cf8fd1	FIX #4243 sql injection	2015-12-19 18:03:08 +01:00
Laurent Destailleur	dd3f5a32d3	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: .travis.yml composer.json htdocs/accountancy/admin/card.php	2015-12-18 21:20:12 +01:00
Laurent Destailleur	ebf68ecbe0	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: .travis.yml htdocs/contrat/class/contrat.class.php htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php htdocs/core/modules/project/pdf/pdf_baleine.modules.php	2015-12-18 21:03:57 +01:00
Laurent Destailleur	eaacfabdf6	Merge pull request #4261 from hregis/3.8_bug ... Fix: Disable "main.inc.php" hooks with ajax return	2015-12-18 17:32:45 +01:00
Laurent Destailleur	452feca64a	Merge pull request #4249 from GPCsolutions/3.8-4242 ... FIX #4242 Allow disabling dashes in documents	2015-12-18 17:06:51 +01:00
Regis Houssin	70354def7c	Fix: Disable "main.inc.php" hooks with ajax return	2015-12-18 13:27:51 +01:00
Laurent Destailleur	cdc408a84c	Fix: button "now" was not working on date using no javascript	2015-12-17 17:16:26 +01:00
Raphaël Doursenaud	7e98cfd5b6	FIX #4242 Allow disabling dashes in documents ... 3.8 specific fix for new documents	2015-12-17 10:33:17 +01:00
Raphaël Doursenaud	02e053acc6	FIX #4242 Allow disabling dashes in documents ... 3.7 specific fix since document files have moved	2015-12-17 10:26:27 +01:00
Raphaël Doursenaud	e6ec797af8	FIX #4242 Allow disabling dashes in documents	2015-12-17 10:21:44 +01:00
Laurent Destailleur	3e3dbf850f	Fix: bad case for function	2015-12-15 09:44:17 +01:00
Laurent Destailleur	a462cd232d	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-12-13 16:09:09 +01:00
Laurent Destailleur	4a88c9ea9f	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/product/class/product.class.php	2015-12-13 15:53:57 +01:00
Raphaël Doursenaud	c0862762a5	Fix #3930 Removed executable bit ... These files doesn't contain executable code and may pose a security threat.	2015-12-09 13:28:36 +01:00
Raphaël Doursenaud	3f9efc537b	FIX #3953 Don't round supplier price ... The price is already rounded when inserted on the product page. It's also rounded at display. There's no need to round it here. Rounding it leads to serious calculation errors.	2015-12-07 14:35:04 +01:00
Laurent Destailleur	7d7a978ba0	Merge pull request #4145 from FHenry/3.8 ... FIX : Contract date inconsistency between /comm/card.php and #4089	2015-12-04 10:25:50 +01:00
Laurent Destailleur	12702ee128	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/core/lib/report.lib.php htdocs/product/stock/class/mouvementstock.class.php	2015-12-03 12:59:13 +01:00
Florian HENRY	3dec67ffdf	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-12-03 12:58:39 +01:00
Laurent Destailleur	7105fabb79	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/langs/en_US/users.lang htdocs/product/stock/class/mouvementstock.class.php	2015-12-03 12:51:49 +01:00
Florian HENRY	10a925f7b4	FIX: WHERE 1=1	2015-12-03 11:52:41 +01:00
Laurent Destailleur	7bad058f47	Merge pull request #4114 from fappels/3.8_fix_round_buyprice ... FIX #3953 rounding of buying price	2015-12-03 11:48:09 +01:00
Florian HENRY	281eaf2987	FIX : Use "WHERE true" instead of "WHERE 1" #4132	2015-12-03 10:27:23 +01:00
Florian HENRY	bd632cf2b0	FIX : Use "WHERE true" instead of "WHERE 1" #4132	2015-12-02 12:12:26 +01:00
fappels	4a0ea97772	FIX #3953 rounding of buying price ... fix javascript for rounding of buying price	2015-11-29 15:34:43 +01:00
phf	cbcb79b1eb	FIX jquery select of project generate js error on change event	2015-11-27 16:58:28 +01:00
aspangaro	9a2259c681	Correct button 'Export' and 'Write bookkeeping' on finance journal	2015-11-26 06:19:24 +01:00
Laurent Destailleur	a6d8f943df	Fix several bugs into leave requets module	2015-11-26 02:12:37 +01:00
Laurent Destailleur	f353464bce	Prepare code to fix #4095	2015-11-26 00:47:17 +01:00
Raphaël Doursenaud	973e42d10f	FIX #4097 Public holiday calculation ... The last day was ommitted and never parsed. If this day was a saturday, sunday or public holiday day, it was not computed.	2015-11-25 19:34:11 +01:00
Laurent Destailleur	7bde781206	Merge pull request #4061 from marcosgdf/bug-3231 ... FIX #3231 [Members] Public subscription page displays GeoIP error	2015-11-21 17:58:29 +01:00
Laurent Destailleur	dc6496fdf3	Merge pull request #4054 from marcosgdf/bug-3508 ... FIX #3508 Useless tooltip in 3.8 boxes	2015-11-21 17:49:09 +01:00
Laurent Destailleur	54b6ff02c0	Merge pull request #4048 from FHenry/3.8 ... FIX Missing fields managed by update_customer_modtime in 3.8	2015-11-21 17:46:02 +01:00
Marcos García de La Fuente	a456d21249	FIX #3231 [Members] Public subscription page displays GeoIP error	2015-11-21 13:25:09 +01:00
Laurent Destailleur	758b8e1f7e	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/core/boxes/box_project.php	2015-11-21 12:32:03 +01:00
Laurent Destailleur	c04743aa84	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-11-21 12:23:51 +01:00
Marcos García de La Fuente	4bf6cf4e65	FIX #3508 Useless tooltip in 3.8 boxes	2015-11-21 11:24:18 +01:00
Florian HENRY	c0d29d2a15	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-11-21 10:10:42 +01:00
Laurent Destailleur	45d6635bf6	Merge pull request #4025 from ndrosis/3.8 ... FIX utf-8 characters in the mask mercure does not break counter	2015-11-21 00:26:38 +01:00
Drosis Nikos	ee4eb13fff	Update functions2.lib.php	2015-11-20 19:05:00 +02:00
arnaud	07226d32ec	FIX NB task and percent progress in box project	2015-11-20 16:11:48 +01:00
arnaud	4233d24f4b	FIX export with category contact extrafields	2015-11-19 18:01:58 +01:00
Florian HENRY	80f19de223	fix && vs and	2015-11-19 16:32:25 +01:00
arnaud	85a58f666a	FIX product link in project box	2015-11-18 17:22:53 +01:00
fmarcet	0cbf8ca1dd	FIX #3726 When upload file, don't test if PRODUCT_USE_OLD_PATH_FOR_PHOTO ... variable is empty or not	2015-11-18 13:59:25 +01:00
Nikos Drosis	5082b1cc66	Fix for utf-8 characters in the mask mercure	2015-11-17 20:22:27 +02:00