Commit Graph

45166 Commits

Author SHA1 Message Date
Laurent Destailleur
d5f221452e Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-07-11 11:34:28 +02:00
Laurent Destailleur
0367cee671 FIX We must take the last recent defined price when using price level 2016-07-11 11:34:11 +02:00
Marcos García de La Fuente
d01796a214 FIX #5470 User of expense report in bank transactions page is not correct 2016-07-09 14:31:41 +02:00
Laurent Destailleur
47d7ac8031 Fix the repair tool to correct corrupted stock for batch numbers 2016-07-08 23:11:55 +02:00
Laurent Destailleur
a48c79b68b Fix corrupted stock 2016-07-08 23:02:25 +02:00
Laurent Destailleur
0f23cef46c Fix warning of the repair tool. 2016-07-08 18:59:36 +02:00
Laurent Destailleur
a8f06d78b1 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/install/pgsql/functions/functions.sql
2016-07-06 14:53:05 +02:00
Laurent Destailleur
148f2e4c00 Merge pull request #5449 from fmarcet/3.8
Fix: Don't load extrafields on orderstoinvoice
2016-07-06 11:56:05 +02:00
fmarcet
50c5efc374 Fix: Don't load extrafields on orderstoinvoice 2016-07-05 16:41:46 +02:00
Maxime Kohlhaas
d658e2cf31 FIX task ODT company object not correctly retrieved 2016-07-05 16:04:18 +02:00
Laurent Destailleur
e9797538b3 Merge pull request #5432 from atm-florian/3.9
FIX #4926
2016-07-02 20:31:58 +02:00
Laurent Destailleur
6a903b17e6 Merge pull request #5440 from frederic34/patch-8
FIX Search on billed
2016-07-02 20:30:51 +02:00
Laurent Destailleur
29cbab1647 Merge pull request #5438 from atm-arnaud/FIX_product_blocstat_without_module_enabled
FIX product stats all bloc module without enabled test
2016-07-02 20:29:41 +02:00
Frédéric FRANCE
0639bafa6b Update list.php 2016-07-02 10:19:38 +02:00
arnaud
cf5de9d0c8 FIX form_confirm to delete payment on supplier invoice 2016-07-01 16:59:03 +02:00
arnaud
09b824d819 FIX product stats all bloc module without enbaled test 2016-07-01 16:44:05 +02:00
florian HENRY
2520ee921a llx_ecm_directories 2016-07-01 08:37:24 +02:00
florian HENRY
08fbc21bb1 llx_ecm_directories 2016-07-01 08:36:20 +02:00
florian HENRY
7118c8b39b Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9 2016-07-01 08:34:10 +02:00
florian HENRY
bfcc72b8d8 Merge branch '3.8' of https://github.com/Dolibarr/dolibarr.git into 3.8 2016-07-01 08:33:45 +02:00
Laurent Destailleur
f8b1d0d7ca Merge remote-tracking branch 'origin/3.8' into 3.9 2016-07-01 03:51:23 +02:00
Laurent Destailleur
07fd911770 Merge pull request #5401 from atm-alexis/FIX_3.8_bug_5383
# FIX #5383 bad object id on don delete
2016-07-01 03:42:59 +02:00
Laurent Destailleur
2c5e1c17fe Fix hard coded table prefix 2016-07-01 03:42:19 +02:00
Laurent Destailleur
74378e2c65 Merge pull request #5407 from atm-alexis/FIX_3.8_bug_5338
FIX #5338 use of not initialized var $aphour, $apmin, etc
2016-07-01 03:27:26 +02:00
Laurent Destailleur
625213580c Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/core/lib/pdf.lib.php
2016-07-01 03:17:20 +02:00
Laurent Destailleur
9e82a8b4e6 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-07-01 03:12:02 +02:00
Laurent Destailleur
102179028c FIX #5414 2016-07-01 03:11:41 +02:00
Laurent Destailleur
3645bd8f69 Merge pull request #5420 from atm-alexis/FIX_3.8_bug_5170
FIX #5170 tva sign with INVOICE_POSITIVE_CREDIT_NOTE option
2016-07-01 03:06:31 +02:00
Laurent Destailleur
1d0e14be62 Merge pull request #5423 from atm-alexis/FIX_3.9_bug_4964
FIX #4964 buyprice in customer from shipping
2016-07-01 02:52:15 +02:00
Laurent Destailleur
6066b711af Merge pull request #5427 from atm-geoffrey/FIX_project_select_on_event
Fix #4828
2016-07-01 02:47:43 +02:00
Laurent Destailleur
29e26c2342 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/core/lib/sendings.lib.php
2016-07-01 02:06:30 +02:00
Laurent Destailleur
c9300bae35 Merge pull request #5415 from fmarcet/3.8
Fix: Incorrect document link on supplier invoices's list
2016-06-30 22:31:18 +02:00
Laurent Destailleur
a439661ac7 Merge pull request #5421 from atm-arnaud/fix_5004
FIX #5004
2016-06-30 22:23:53 +02:00
Laurent Destailleur
5c11192c7c Merge pull request #5425 from atm-arnaud/fix_4749
FIX #4749
2016-06-30 22:20:18 +02:00
Laurent Destailleur
d4226a038e Merge pull request #5418 from atm-maxime/fix_time_spent_right
FIX #5319
2016-06-30 21:56:25 +02:00
Laurent Destailleur
3ddd56a326 Merge pull request #5410 from frederic34/patch-8
FIX Bad link on supplier orders area
2016-06-30 21:40:45 +02:00
Laurent Destailleur
f2bb51ad02 Merge pull request #5406 from atm-gauthier/3.8_fix_linked_receiving
FIX : receiving link never works
2016-06-30 21:38:29 +02:00
Laurent Destailleur
578a58527f Merge pull request #5430 from atm-arnaud/fix_4455
FIX #4455
2016-06-30 21:32:17 +02:00
Maxime Kohlhaas
d004f3a538 FIX #4448 $filebonprev is not used, $this->filename now 2016-06-30 17:03:56 +02:00
florian HENRY
855550e274 FIX 4926 2016-06-30 17:00:09 +02:00
florian HENRY
8097298c80 FIX #4756 2016-06-30 16:55:59 +02:00
arnaud
38dcb0de49 FIX #4455 2016-06-30 16:53:24 +02:00
Maxime Kohlhaas
aa67a29115 FIX #4383 $userid not defined 2016-06-30 16:40:38 +02:00
atm-geoffrey
75bb161930 FIX #4828 2016-06-30 16:20:53 +02:00
arnaud
0ffe106e2c FIX #4749 2016-06-30 16:03:48 +02:00
Alexis Algoud
02169478d0 FIX #4964 buyprice in customer from shipping
buyprice wasn't load in expedition::fetch_lines
2016-06-30 15:30:07 +02:00
arnaud
97fe75f198 FIX #5004 2016-06-30 14:57:23 +02:00
Alexis Algoud
22bc44620b FIX #5170 tva sign with INVOICE_POSITIVE_CREDIT_NOTE option 2016-06-30 14:27:58 +02:00
Maxime Kohlhaas
c73c1a577a Time spent can be saved with project read right 2016-06-30 14:24:03 +02:00
fmarcet
e4a2b5abb3 Fix: Incorrect document link on supplier invoices's list 2016-06-30 11:27:29 +02:00