60959 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Neil Orley	4cd89abffc	Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into 6.0-api	2017-09-22 11:58:37 +02:00
Laurent Destailleur	d68abf8237	Merge pull request #7453 from atm-florian/6.0 ... fix ressource list	2017-09-21 11:36:26 +02:00
florian HENRY	03ffbe55ce	fix ressource list	2017-09-21 11:34:19 +02:00
Laurent Destailleur	a918fd1cf2	Merge pull request #7370 from Oeris/6.0-api ... NEW Implementation of a Luracast recommandation for the REST api server	2017-09-21 11:20:23 +02:00
Laurent Destailleur	21959aec8f	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 6.0.1	2017-09-20 17:42:09 +02:00
Laurent Destailleur	68c9d08909	Merge pull request #7438 from fappels/6.0_fix_extrafields_copy ... FIX extrafields copy situation invoice, shipment and receipt	2017-09-20 17:36:48 +02:00
tysauron	e61032a313	Bug get socid with old object sosciete	2017-09-20 17:35:11 +02:00
Laurent Destailleur	fc5c9ad2f2	Merge pull request #7436 from fappels/6.0_Fix_expedition_error_handling ... Fix batch required for lot product error message.	2017-09-20 17:33:05 +02:00
Laurent Destailleur	1daa0204aa	Merge pull request #7434 from atm-quentin/6.0 ... # Fix #for free line select unit was wrong	2017-09-20 17:32:08 +02:00
Laurent Destailleur	7706020805	Merge pull request #7446 from hregis/6.0_bug3 ... Fix: wrong supplier product price id	2017-09-20 17:31:10 +02:00
Regis Houssin	77fea1983c	Fix: wrong supplier product price id	2017-09-20 16:57:38 +02:00
Neil Orley	b62e08efc3	Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into 6.0-api	2017-09-20 15:40:38 +02:00
Laurent Destailleur	5e2cc05047	Prepare 6.0.1	2017-09-20 11:12:47 +02:00
Laurent Destailleur	052e025537	Better detection of log to include merge labels	2017-09-20 11:08:42 +02:00
Laurent Destailleur	6a0ef4b561	Fix info ot total in direct debit page	2017-09-19 19:29:00 +02:00
Laurent Destailleur	f87614e2d3	Fix missing translation	2017-09-19 19:12:54 +02:00
fappels	ddeca6cc06	fix oddeven revert	2017-09-19 18:52:27 +02:00
fappels	cec91ae837	Fix extrafield copy receipt	2017-09-19 18:44:49 +02:00
fappels	13d5471dd0	Fix extrafield copy shipment	2017-09-19 18:43:00 +02:00
fappels	8123562ded	Fix extrafield copy next situation invoice	2017-09-19 18:42:29 +02:00
Laurent Destailleur	14e1306b20	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-09-19 17:06:03 +02:00
Laurent Destailleur	f4ddce7274	FIX View of timespent for another user	2017-09-19 17:05:50 +02:00
Neil Orley	cc7aee6c3e	FIX Implementation of a Luracast recommandation for the REST api server (#7370)	2017-09-19 16:59:19 +02:00
Neil Orley	d5966f944f	FIX Implementation of a Luracast recommandation for the REST api server (#7370)	2017-09-19 16:58:09 +02:00
Neil Orley	caf4ca7451	FIX Implementation of a Luracast recommandation for the REST api server (#7370)	2017-09-19 16:56:27 +02:00
Neil Orley	949eef82f0	Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into 6.0-api	2017-09-19 16:50:55 +02:00
atm-quentin	815d0aff90	FIX for free line select unit was wrong	2017-09-19 15:10:18 +02:00
Laurent Destailleur	848bc0779a	Merge pull request #7430 from atm-florian/6.0 ... fix : rest API URL	2017-09-19 12:19:31 +02:00
florian HENRY	7375afca3e	fix : rest API URL	2017-09-19 09:03:25 +02:00
Laurent Destailleur	978702d04b	Fix false deprecated warning	2017-09-19 01:41:57 +02:00
Laurent Destailleur	f936b17d68	FIX Protection to avoid to apply credit note discount > remain to pay	2017-09-19 00:24:52 +02:00
Laurent Destailleur	9838199de1	FIX Sign of amount in origin currency on credit note created from lines	2017-09-18 23:53:17 +02:00
Laurent Destailleur	70b11f18b5	FIX #7367	2017-09-18 16:06:58 +02:00
Laurent Destailleur	c11ff4a18c	FIX #7368	2017-09-18 15:55:25 +02:00
Laurent Destailleur	aba907d1a8	FIX #7420	2017-09-18 15:49:21 +02:00
Laurent Destailleur	0c01c7ceba	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-09-18 15:48:18 +02:00
Laurent Destailleur	6ac1b6e82e	Fix template	2017-09-18 15:48:04 +02:00
Laurent Destailleur	0536d6cbed	FIX #7330	2017-09-18 15:46:17 +02:00
Laurent Destailleur	8536d0f6e9	Merge pull request #7421 from atm-florian/6.0 ... fix : little fix	2017-09-18 15:08:02 +02:00
florian HENRY	31721165b5	Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0	2017-09-18 11:36:45 +02:00
Laurent Destailleur	eaee8ee586	Fix box activity again	2017-09-17 21:30:27 +02:00
Laurent Destailleur	f76b675e09	Fix box activity again	2017-09-17 21:30:15 +02:00
Laurent Destailleur	99149b5cfe	Fix box activity again	2017-09-17 21:30:11 +02:00
Laurent Destailleur	196c5c1267	Missing translation	2017-09-17 20:51:06 +02:00
Laurent Destailleur	2c3428a1bf	Fix css	2017-09-17 20:48:09 +02:00
Laurent Destailleur	94368accc1	Fix activity box	2017-09-17 20:37:18 +02:00
Laurent Destailleur	ee774f1bf9	FIX Calculation in the activity box	2017-09-17 20:20:48 +02:00
Laurent Destailleur	bb73da4c5e	Cherry pick	2017-09-17 20:20:27 +02:00
Laurent Destailleur	39acb46139	Fix multicompany	2017-09-17 19:44:59 +02:00
Laurent Destailleur	9e29ea8011	FIX Must use pdf format page as default for merging PDF.	2017-09-16 18:32:43 +02:00