lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
52,506 Commits 43 Branches 150 Tags 886 MiB
b1401d6566
Commit Graph

52506 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juanjo Menent
b1401d6566 Merge remote-tracking branch 'upstream/3.9' into 3.9 2016-08-31 01:50:04 +02:00
Laurent Destailleur
a9e5668ea4 Fix for jmobile 2016-08-28 16:31:22 +02:00
Laurent Destailleur
bc8e203019 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-08-28 01:58:43 +02:00
Laurent Destailleur
5d7414dcc3 Solve php regression failing travis 2016-08-28 01:58:11 +02:00
Juanjo Menent
874db10dbe Merge pull request #5648 from hregis/3.8_bug 
Fix: wrong "lastoutput" and "lastresult" if jobtype is "method" or "function"
 2016-08-25 13:43:06 +02:00
Juanjo Menent
c298bb62ba Merge pull request #5644 from grandoc/3.9 
fix : translation
 2016-08-25 13:38:18 +02:00
Regis Houssin
6b3cbc918d Fix: wrong "lastoutput" and "lastresult" if jobtype is "method" or 
"function"
 2016-08-22 20:49:14 +02:00
philippe grand
919b73b4c4 fix : translation 2016-08-19 16:29:54 +02:00
Laurent Destailleur
7e8b8e9462 Merge pull request #5638 from atm-florian/3.9_fix_5637 
FIX : PgSQL Module Ressource list crash #5637
 2016-08-17 16:34:40 +02:00
Laurent Destailleur
f9d707ff48 Merge pull request #5630 from atm-florian/3.9 
FIX : #5629 PgSQL Interger string stylish error
 2016-08-17 16:24:40 +02:00
florian HENRY
ddc480b6c9 other fix for PgSQL and style 2016-08-17 14:51:25 +02:00
florian HENRY
5c51cb0f29 FIX : PgSQL Module Ressource list crash #5637 2016-08-17 14:40:05 +02:00
florian HENRY
00443dae3a Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9 2016-08-17 14:30:15 +02:00
Laurent Destailleur
0cb7440647 Merge pull request #5635 from joseplluis/patch-3 
Fix Bug: delivery date value is not hide with global ORDER_DISABLE_DELIVE…
 2016-08-17 14:05:56 +02:00
florian HENRY
a1323756a9 FIX : in PgSQL no quote "word style" is permitted around column name 2016-08-17 10:23:23 +02:00
Josep Lluís
c385b86793 Bug: delivery date value is not hide with global ORDER_DISABLE_DELIVERY_DATE 
In title and in filter the delivery date column is well hidden. 
The error is only in column value,
 2016-08-16 23:12:02 +02:00
florian HENRY
3932a32399 FIX : #5629 PgSQL Interger string stylish error 2016-08-16 09:00:52 +02:00
Juanjo Menent
bf2955909a Merge pull request #5600 from atm-florian/FIX_5594 
Fix 5594
 2016-08-11 20:38:35 +02:00
florian HENRY
8718edc5fd Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into FIX_5594 2016-08-09 15:17:57 +02:00
florian HENRY
321814fae3 better fix for #5594 2016-08-09 15:17:19 +02:00
Laurent Destailleur
4a1fbffba3 Merge pull request #5595 from atm-florian/FIX_5594 
FIX #5594
 2016-08-09 13:28:07 +02:00
florian HENRY
90cb71f341 revert better fix 2016-08-08 13:54:51 +02:00
florian HENRY
15f187c466 better test 2016-08-08 13:54:03 +02:00
florian HENRY
94487cf411 FIX #5594 2016-08-08 13:43:44 +02:00
Laurent Destailleur
112b945e6b Merge pull request #5583 from atm-florian/3.9 
FIX : update limit stock on product stock
 2016-08-05 00:34:32 +02:00
Laurent Destailleur
16c7d51abc Merge pull request #5576 from atm-florian/3.9_fixPHPStrict 
FIX php Strict
 2016-08-05 00:26:47 +02:00
Juanjo Menent
1253b73879 Merge remote-tracking branch 'upstream/3.9' into 3.9 2016-08-04 17:24:43 +02:00
florian HENRY
5f415478ac FIX : update limit stock on product stock 2016-08-03 17:29:04 +02:00
Juanjo Menent
965011c8bc Merge pull request #5579 from atm-florian/3.8 
FIX : Weather icon is not calculated correctly
 2016-08-03 10:33:29 +02:00
Juanjo Menent
597f5dae15 Merge pull request #5551 from marcosgdf/bug-5549 
FIX #5549 getNomUrl tooltips show Order info even if user has no rights to read them
 2016-08-03 10:27:44 +02:00
Juanjo Menent
aadf52fe59 Merge remote-tracking branch 'upstream/3.9' into 3.9 2016-08-03 10:11:37 +02:00
florian HENRY
0d536bff54 Fix dashboard 2016-08-03 09:04:24 +02:00
florian HENRY
5144f21c6c FIX php Strict 2016-08-02 15:36:00 +02:00
Laurent Destailleur
7dec327995 FIX #5568 2016-08-01 15:43:40 +02:00
Laurent Destailleur
621a7d93fa Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-08-01 15:05:57 +02:00
Laurent Destailleur
58c18f438c Move changelog at correct place 2016-08-01 15:02:23 +02:00
Laurent Destailleur
803fe68061 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/filefunc.inc.php
 2016-08-01 15:01:14 +02:00
BENKE Charlie
9a0494bd64 Update bonprelevement.class.php 2016-08-01 14:11:58 +02:00
Laurent Destailleur
e998a4b8a5 Merge pull request #5572 from fmarcet/3.8 
Fix: Can't set PRODUIT_LIMIT_SIZE to value 0
 2016-08-01 13:40:11 +02:00
Ferran Marcet
fb2444c7a3 Fix: Can't set PRODUIT_LIMIT_SIZE to value 0 2016-08-01 10:20:10 +02:00
Laurent Destailleur
69247afd06 FIX #4447 2016-07-29 17:26:24 +02:00
Laurent Destailleur
9a4240c292 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-07-29 17:20:30 +02:00
Laurent Destailleur
45e38efdfa FIX #5473 2016-07-29 17:20:14 +02:00
Laurent Destailleur
b3cdb1f163 FIX tag for date rfc in odt substitution 2016-07-29 16:21:28 +02:00
Laurent Destailleur
27243069cb FIX #5535 bad dependency. 
Conflicts:
	htdocs/fourn/facture/list.php
 2016-07-29 15:19:04 +02:00
Marcos García de La Fuente
86c2ced714 Missing $user variable 2016-07-29 11:53:24 +02:00
Laurent Destailleur
537a51b367 Finally, better without the test 2016-07-29 11:19:16 +02:00
Juanjo Menent
4cadf0e5a3 Merge pull request #5563 from fmarcet/3.9 
FIX: Can't create withdrawal document
 2016-07-29 08:35:26 +02:00
Juanjo Menent
a40ea9387b Merge pull request #5562 from atm-florian/3.9 
FIX: incoterms do not output into crabe invoice PDF
 2016-07-29 08:34:01 +02:00
Juanjo Menent
e4f8b9a4b0 Merge pull request #5561 from olsesacl/#5544 
FIX #5544 Disabled Contact still appear in lists to send emails
 2016-07-29 08:33:29 +02:00