53368 Commits

Author	SHA1	Message	Date
Laurent Destailleur	5b917c039e	Prepare 6.0.6	2018-01-26 11:08:08 +01:00
Laurent Destailleur	2c0eeaf8de	FIX #8093	2018-01-25 20:57:51 +01:00
Laurent Destailleur	1da7b154c1	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2018-01-24 11:48:31 +01:00
Laurent Destailleur	54fb59d8db	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/compta/paiement.php	2018-01-24 11:45:43 +01:00
Laurent Destailleur	e66b266432	Merge pull request #8090 from atm-arnaud/FIX_sepa_mail_encode ... FIX email sent was not in HTML	2018-01-24 11:17:16 +01:00
arnaud	c0481be8d8	FIX subject mail sepa	2018-01-23 17:01:03 +01:00
arnaud	19c616756a	FIX email sent was not in HTML	2018-01-23 12:14:22 +01:00
John	f2ae3ee41d	Fix get entity if multiple	2018-01-23 09:49:21 +01:00
atm-ph	054d98a2ba	Fix each total isn't aligned on payment card	2018-01-22 17:09:17 +01:00
Maxime Kohlhaas	4c0dc21ca0	Fix validate contrat was not using force_number parameter	2018-01-18 14:07:32 +01:00
Laurent Destailleur	bc7bd77cea	Fix permission to open supplier order	2018-01-17 15:54:27 +01:00
Laurent Destailleur	5d4eda68e0	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2018-01-16 19:53:02 +01:00
Laurent Destailleur	94b1d59f2b	Fix missing check on object entity	2018-01-16 19:52:14 +01:00
Laurent Destailleur	f307fecaf6	Merge pull request #8064 from atm-quentin/6.0 ... FIX missing hook invoice index	2018-01-16 12:15:06 +01:00
atm-quentin	6feacab4f5	FIX missing hook invoice index	2018-01-15 14:24:19 +01:00
Laurent Destailleur	4c8af0ff50	Fix name alias on list	2018-01-15 12:24:56 +01:00
Laurent Destailleur	b154357683	Merge pull request #7982 from simnandez/6.0 ... FIX: Bad name alias showing in name of third column	2018-01-15 12:22:40 +01:00
Laurent Destailleur	3b9aee7d4c	Update list.php	2018-01-15 12:22:21 +01:00
Laurent Destailleur	9f6118ed52	Code comments	2018-01-14 03:12:22 +01:00
Laurent Destailleur	c947502efa	Fix typo	2018-01-13 17:22:59 +01:00
Laurent Destailleur	764646634d	Merge pull request #8051 from atm-florian/6.0 ... fix: search translation into external module files also	2018-01-11 01:12:53 +01:00
Laurent Destailleur	0ae02d76a3	Merge pull request #8049 from fmarcet/6.0 ... Fix: Still using property ->client instead of ->thirdparty.	2018-01-11 01:03:47 +01:00
Laurent Destailleur	205e715b7f	Merge pull request #8046 from hregis/6.0_bug ... Fix: avoid Warning: A non-numeric value encountered	2018-01-11 00:53:07 +01:00
Laurent Destailleur	79562f8d5b	Merge pull request #8036 from atm-ph/fix_6.0_model_pdf_invoice_payment ... Fix wrong address used into PDF model of supplier payment	2018-01-11 00:37:37 +01:00
Laurent Destailleur	b5fe953a64	Merge pull request #8035 from pdermody/6.0 ... Fix #8034 - Surface and volume units are calculated incorrectly	2018-01-11 00:36:00 +01:00
florian HENRY	c8c550cd33	Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0	2018-01-10 20:49:48 +01:00
florian HENRY	0bd45dc64b	fix: search translation into external module files also	2018-01-10 20:34:32 +01:00
Ferran Marcet	d99535d9da	Fix: Still using property ->client instead of ->thirdparty.	2018-01-10 16:40:43 +01:00
Regis Houssin	0f51aa15d8	Fix: avoid Warning: A non-numeric value encountered	2018-01-10 10:52:30 +01:00
atm-ph	22d92c0540	Fix wrong address used into PDF model of supplier payment	2018-01-08 15:25:18 +01:00
Paul Dermody	a1ac285a25	Fixed automated computation of surface and volume to use correct units. It was failing for inches and feet.	2018-01-07 12:42:14 -06:00
sschwebel	7e8fda2d71	FIX #8029 Unable to make leave request in holyday module ... wrong variable name in card.php	2018-01-05 12:09:45 +01:00
Laurent Destailleur	301f509611	Merge pull request #8019 from atm-gauthier/6.0_fix_vat_mass_update ... FIX : $oldvatrateclean & $newvatrateclean must be set if preg_match === false	2018-01-04 21:03:20 +01:00
Laurent Destailleur	550fc37e62	Merge pull request #8017 from atm-florian/6.0 ... fix : linked object (new format of linked_object atribut on 6.0)	2018-01-04 21:02:31 +01:00
Laurent Destailleur	a14a3db2e9	Merge pull request #8013 from atm-john/FIX_invoice_filter_type ... fix filter for TYPE_SITUATION invoice	2018-01-04 20:59:32 +01:00
Laurent Destailleur	e4d37c3e23	Merge pull request #8012 from ATM-Nicolas/fix_product_best_price ... Fix product best price	2018-01-04 20:58:59 +01:00
Laurent Destailleur	b2feac9d90	CVE-2017-17971	2018-01-04 19:25:52 +01:00
Juanjo Menent	762ab74940	FIX: Cashdesk should not sell to inactive third parties	2018-01-04 18:09:25 +01:00
Juanjo Menent	9471495dca	Merge remote-tracking branch 'upstream/6.0' into 6.0	2018-01-04 18:05:55 +01:00
gauthier	58470e0913	FIX : $oldvatrateclean & $newvatrateclean must be set if preg_match === false	2018-01-04 12:01:21 +01:00
Laurent Destailleur	f6ff6610e4	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2018-01-03 20:13:56 +01:00
Laurent Destailleur	c7798d11ce	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2018-01-03 20:13:17 +01:00
florian HENRY	25390e5f73	fix : linked object (new format of linked_object atribut on 6.0)	2018-01-03 17:03:00 +01:00
ATM-Nicolas	2e6c036ad8	Merge branch '6.0' of github.com:Dolibarr/dolibarr into fix_product_best_price	2018-01-02 17:22:53 +01:00
ATM-Nicolas	61efda4cbd	FIX : product best price on product list	2018-01-02 17:21:04 +01:00
John	1331e8add7	fix filter for TYPE_SITUATION invoice	2018-01-02 17:19:42 +01:00
Laurent Destailleur	0abe19c30d	Merge pull request #7998 from hregis/6.0_bug ... Fix: avoid warning	2017-12-28 12:53:04 +01:00
Laurent Destailleur	bbcf70cf4e	Remove spaces	2017-12-28 09:48:41 +01:00
Laurent Destailleur	3ac413084f	Merge branch '6.0' into 6.0	2017-12-28 08:46:22 +01:00
Laurent Destailleur	3d4e6c9169	Merge pull request #7987 from atm-arnaud/FIX_trans_product_stats ... FIX stats trad for customerinvoice	2017-12-28 07:10:14 +01:00