Commit Graph

71941 Commits

Author SHA1 Message Date
Laurent Destailleur
05ba397156
Merge pull request #10421 from frederic34/patch-2
correct menu
2019-01-27 17:55:23 +01:00
Laurent Destailleur
3c88816bf8 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-27 17:44:13 +01:00
Laurent Destailleur
d59097f65c Fix upload of module file 2019-01-27 17:40:56 +01:00
Frédéric FRANCE
46b6d16210
correct menu 2019-01-27 09:17:01 +01:00
Laurent Destailleur
3118e92d2b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-26 14:30:59 +01:00
Laurent Destailleur
ba87284a90 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-26 14:30:44 +01:00
Laurent Destailleur
7785f3e3e2
Merge pull request #10397 from atm-gauthier/8.0_fix_discount_on_excess_with_creditnote_or_deposit
FIX : when we add a payment on an invoice which already has payments …
2019-01-26 14:24:06 +01:00
Laurent Destailleur
c6fe94c455
Merge pull request #10388 from hregis/9.0_bug
FIX JSON.parse not needeed and missing simple quote escaping
2019-01-26 14:13:26 +01:00
Laurent Destailleur
ab6393a939
Merge pull request #10396 from Librethic/9.0-fix-inventory-create
FIX: wrong permission test for inventory creation
2019-01-26 14:03:03 +01:00
Laurent Destailleur
8d019a2759
Merge pull request #10409 from atm-florian/9.0
fix broken link into contact tpl
2019-01-26 13:52:32 +01:00
Laurent Destailleur
7f13319d9a
Merge pull request #10402 from frederic34/patch-2
fix travis
2019-01-26 13:48:58 +01:00
Laurent Destailleur
6867a8a88a Typo 2019-01-26 13:46:59 +01:00
Laurent Destailleur
43694f9384 FIX Compatibility with windows 10 2019-01-26 13:32:36 +01:00
Laurent Destailleur
97cc414b29 Update doliwamp 2019-01-26 12:35:02 +01:00
Laurent Destailleur
89420dde62 Fix translation 2019-01-26 01:44:28 +01:00
Laurent Destailleur
3f75bb694c Fix phpcs 2019-01-26 01:31:22 +01:00
florian HENRY
822706000f fix broken link into contact tpl 2019-01-24 18:01:40 +01:00
Laurent Destailleur
c95b915db3 Merge branch '9.0' of github.com:Dolibarr/dolibarr into 9.0 2019-01-24 07:07:31 +01:00
Laurent Destailleur
ecb16cf914 Trans 2019-01-24 07:07:26 +01:00
Frédéric FRANCE
4c70c05e20
fix travis 2019-01-23 23:35:57 +01:00
Laurent Destailleur
278b3e0b08 Fix css 2019-01-23 15:30:54 +01:00
gauthier
84e1f92acd FIX : when we add a payment on an invoice which already has payments with credit note or deposit amount, and then we get an excess received, discount amount must be $total_paiements + $total_creditnote_and_deposit - $object->total_ttc; 2019-01-23 15:16:51 +01:00
Laurent Destailleur
ad54a2b8af Fix website edit of virtualhost 2019-01-23 15:06:28 +01:00
Laurent Destailleur
e33f102dc2 FIX Edit of virtualhost 2019-01-23 14:57:43 +01:00
jfefe
b3dfbaf38c FIX: wrong permission test for inventory creation 2019-01-23 02:45:46 +01:00
Laurent Destailleur
bb1e7ee0a1 Fix transifex 2019-01-22 19:54:47 +01:00
Laurent Destailleur
c5686df035 Sync transifex 2019-01-22 18:16:08 +01:00
Laurent Destailleur
eefa57bf6b Sync transifex 2019-01-22 18:15:47 +01:00
Laurent Destailleur
0ae3aeff12 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-21 20:47:52 +01:00
Laurent Destailleur
3cf81d14e3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-21 20:47:44 +01:00
Laurent Destailleur
a4017fa823 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-21 20:47:22 +01:00
Laurent Destailleur
6f553db93d Remove bad text 2019-01-21 20:47:07 +01:00
Regis Houssin
0a36a487c4 FIX remove unused option 2019-01-21 18:43:12 +01:00
Laurent Destailleur
9c3a0bb14e
Merge pull request #10382 from frederic34/patch-2
add missing global $conf in bonprelevement class
2019-01-21 18:03:10 +01:00
Laurent Destailleur
0df1d2e2f7
Merge pull request #10384 from atm-florian/9.0
fix php warning
2019-01-21 18:02:50 +01:00
Laurent Destailleur
a928f3a9d7
Update dolresource.class.php 2019-01-21 18:02:43 +01:00
Regis Houssin
406f26b9d2 FIX JSON.parse not needeed and missing simple quote escaping 2019-01-21 16:48:14 +01:00
Laurent Destailleur
0cba7e1613 FIX Hide path into exported filename 2019-01-21 14:31:27 +01:00
Laurent Destailleur
ac522ee88d Fix travis postgresql 2019-01-21 11:56:54 +01:00
florian HENRY
1da29fbed3 fix php warning 2019-01-21 10:12:13 +01:00
Frédéric FRANCE
4ab19c25c8
add missing global $conf in bonprelevement class 2019-01-21 08:23:31 +01:00
Laurent Destailleur
d4aaaa47e4 Fix travis 2019-01-21 05:50:14 +01:00
Laurent Destailleur
f8b205aae3 Fix missing index 2019-01-21 05:16:23 +01:00
Laurent Destailleur
3ca6bf1005 Fix sequence name 2019-01-21 05:05:47 +01:00
Laurent Destailleur
95bfecdd60 Fix missing index in migration 2019-01-21 05:03:31 +01:00
Laurent Destailleur
ae1ac001dd Fix travis 2019-01-21 04:28:35 +01:00
Laurent Destailleur
9c1339ae06 Fix migration with pgsql 2019-01-21 04:27:30 +01:00
Laurent Destailleur
270033469f Log 2019-01-21 03:50:05 +01:00
Laurent Destailleur
190aff2d8a Fix travis 2019-01-21 03:10:29 +01:00
Laurent Destailleur
82988d45d5 Fix constraint 2019-01-21 02:54:39 +01:00