Laurent Destailleur
|
6de732d7f8
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/facture/mod_facture_mars.php
htdocs/core/modules/facture/mod_facture_terre.php
|
2019-02-01 16:07:18 +01:00 |
|
Laurent Destailleur
|
35f65a571c
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/modules/facture/mod_facture_mars.php
htdocs/core/modules/facture/mod_facture_terre.php
htdocs/fourn/commande/list.php
|
2019-02-01 16:05:43 +01:00 |
|
Laurent Destailleur
|
e366ab551c
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-02-01 16:01:26 +01:00 |
|
Laurent Destailleur
|
dee2a373c1
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
|
2019-02-01 16:01:18 +01:00 |
|
Laurent Destailleur
|
dbf7ae4c25
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2019-02-01 15:56:58 +01:00 |
|
Laurent Destailleur
|
452dfafd32
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2019-02-01 15:56:47 +01:00 |
|
Laurent Destailleur
|
bff2f33022
|
Merge pull request #10404 from atm-john/6.0_fix_supplier_order_line_fetch
Fix fetch test
|
2019-02-01 15:56:26 +01:00 |
|
Laurent Destailleur
|
dbab955cbd
|
Merge pull request #10471 from mapiolca/patch-9
#Fix : Error in Total Products/Services
|
2019-02-01 15:43:47 +01:00 |
|
Laurent Destailleur
|
f00271fee6
|
Merge pull request #10467 from atm-gauthier/7.0_fix_nextnumref
FIX : need an order by in case we found other invoice with same number but not same date
|
2019-02-01 15:38:16 +01:00 |
|
Laurent Destailleur
|
a08a0b4c1d
|
Merge pull request #10469 from atm-gauthier/7.0_fix_wrong_test_enabled
FIX : wrong test enabled
|
2019-02-01 15:34:55 +01:00 |
|
Laurent Destailleur
|
cc17aff405
|
Merge pull request #10472 from atm-florian/8.0
FIX : quick search for supplier orders
|
2019-02-01 15:31:57 +01:00 |
|
Laurent Destailleur
|
aa9feaec55
|
Update doc
|
2019-02-01 15:19:57 +01:00 |
|
Laurent Destailleur
|
eb3621839a
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/members.lang
htdocs/langs/fr_FR/members.lang
|
2019-02-01 15:14:19 +01:00 |
|
Laurent Destailleur
|
97c8bca5ee
|
Fix doc
|
2019-02-01 15:09:05 +01:00 |
|
Laurent Destailleur
|
95a6957035
|
Fix setup doc
|
2019-02-01 15:04:44 +01:00 |
|
Laurent Destailleur
|
ae81bbac93
|
Better var name
|
2019-02-01 13:49:07 +01:00 |
|
Laurent Destailleur
|
b14a16a119
|
Code comment
|
2019-02-01 13:48:09 +01:00 |
|
Laurent Destailleur
|
849b3b640b
|
Code comment
|
2019-02-01 13:41:23 +01:00 |
|
florian HENRY
|
f7bed44441
|
FIX : quick search for supplier orders
|
2019-01-31 21:39:02 +01:00 |
|
Laurent Destailleur
|
3e6aef472d
|
css
|
2019-01-31 20:53:59 +01:00 |
|
Laurent Destailleur
|
a0c0b377b2
|
css
|
2019-01-31 20:53:47 +01:00 |
|
Laurent Destailleur
|
c05628c746
|
Fix edit member module setup
|
2019-01-31 20:27:55 +01:00 |
|
Pierre Ardoin
|
2d6f5ca8ab
|
#Fix : Error in Total Products/Services
Its correct an error in the total of stat Products/Services total.
|
2019-01-31 20:22:56 +01:00 |
|
Laurent Destailleur
|
0a56069f67
|
Fix trans
|
2019-01-31 19:42:55 +01:00 |
|
Laurent Destailleur
|
189323ad58
|
Fix when using image into description
|
2019-01-31 18:12:34 +01:00 |
|
Laurent Destailleur
|
4254ad0d33
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-01-31 15:51:54 +01:00 |
|
Laurent Destailleur
|
14dea53700
|
FIX Missing field in import/export of users
|
2019-01-31 15:51:02 +01:00 |
|
Laurent Destailleur
|
fd67253e40
|
Clean package
|
2019-01-31 13:16:54 +01:00 |
|
Laurent Destailleur
|
57797b1309
|
Remove image
|
2019-01-31 12:48:51 +01:00 |
|
gauthier
|
caa937660d
|
FIX : wrong test enabled
|
2019-01-31 12:43:39 +01:00 |
|
Laurent Destailleur
|
4c31749f4b
|
Add tooltip on setup
|
2019-01-31 11:11:56 +01:00 |
|
gauthier
|
09ba059c21
|
FIX : need an order by in case we found other invoice with same number but not same date
|
2019-01-31 11:03:06 +01:00 |
|
Laurent Destailleur
|
2bed90e9db
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/sociales/class/chargesociales.class.php
|
2019-01-31 10:24:52 +01:00 |
|
Laurent Destailleur
|
7d4475f812
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-01-31 10:23:16 +01:00 |
|
Laurent Destailleur
|
4c2b27560d
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/viewimage.php
|
2019-01-31 10:22:32 +01:00 |
|
Laurent Destailleur
|
484b4371c1
|
FIX XSS
Conflicts:
htdocs/viewimage.php
|
2019-01-31 10:19:23 +01:00 |
|
Laurent Destailleur
|
5e46a359e0
|
FIX XSS
|
2019-01-31 10:18:06 +01:00 |
|
Laurent Destailleur
|
21c089fee9
|
FIX XSS
|
2019-01-31 10:17:29 +01:00 |
|
Laurent Destailleur
|
6121771c5f
|
FIX XSS
|
2019-01-31 10:16:49 +01:00 |
|
Laurent Destailleur
|
045b8b13ed
|
css
|
2019-01-30 23:20:57 +01:00 |
|
Laurent Destailleur
|
a23fd6f090
|
Fix phpcs
|
2019-01-30 20:55:55 +01:00 |
|
Laurent Destailleur
|
01f1f6162f
|
Fix phpcs
|
2019-01-30 20:06:21 +01:00 |
|
Laurent Destailleur
|
15bd99acf4
|
Fix phpcs
|
2019-01-30 20:06:05 +01:00 |
|
Laurent Destailleur
|
c1f3f4c2b5
|
Fix: text for empty line not visible in select
|
2019-01-30 20:03:04 +01:00 |
|
Laurent Destailleur
|
b197ad72d3
|
Work on billing projects
|
2019-01-30 20:02:41 +01:00 |
|
Laurent Destailleur
|
200d30f2b9
|
Fix: text for empty line not visible in select
|
2019-01-30 20:01:55 +01:00 |
|
Laurent Destailleur
|
2882f45bca
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-01-30 18:55:01 +01:00 |
|
Laurent Destailleur
|
f67937c59d
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-01-30 18:54:29 +01:00 |
|
Laurent Destailleur
|
ae1c4e065b
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-01-30 18:53:56 +01:00 |
|
Laurent Destailleur
|
231395dab8
|
Merge pull request #10398 from atm-john/fix_trigger
Fix missing trigger
|
2019-01-30 18:53:10 +01:00 |
|