Juanjo Menent
|
2af54199da
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2016-12-11 15:38:09 +01:00 |
|
Juanjo Menent
|
1c71eed703
|
Very best fix of cancel edit line
|
2016-12-11 15:37:29 +01:00 |
|
Juanjo Menent
|
bdf4fb587f
|
Merge pull request #6153 from simnandez/develop
Best fix of cancel edit line
|
2016-12-11 15:23:32 +01:00 |
|
Juanjo Menent
|
7915021495
|
Best fix of cancel edit line
|
2016-12-11 15:23:07 +01:00 |
|
Juanjo Menent
|
c62a2fb97e
|
Best fix of cancel edit line
|
2016-12-11 15:21:06 +01:00 |
|
Juanjo Menent
|
5233c65aba
|
Merge pull request #6152 from jpfox/develop
FIX cancelling order line modification returned to list instead of card
|
2016-12-11 15:00:37 +01:00 |
|
Jean-Pierre Morfin
|
4a39c79d56
|
FIX cancelling order line modification returned to list instead of card
|
2016-12-11 14:32:27 +01:00 |
|
Juanjo Menent
|
6e30831611
|
Merge pull request #6149 from simnandez/develop
Fix Uniformize status alignment
|
2016-12-11 14:31:33 +01:00 |
|
Juanjo Menent
|
34cc4b3db5
|
Merge pull request #6151 from atm-maxime/mko_minor_fix
Minor fixes
|
2016-12-11 14:30:58 +01:00 |
|
Juanjo Menent
|
c74cdaf890
|
Merge pull request #6150 from aspangaro/5.0-b8
Problem of traduction
|
2016-12-11 14:29:59 +01:00 |
|
Maxime Kohlhaas
|
4296a2802c
|
Wrong menu in tab link on user card
|
2016-12-11 14:27:10 +01:00 |
|
Juanjo Menent
|
3abbb2a3e5
|
Fix Uniformize status alignment
|
2016-12-11 14:19:23 +01:00 |
|
aspangaro
|
b7babb8a48
|
Problem of traduction
|
2016-12-11 14:13:48 +01:00 |
|
Maxime Kohlhaas
|
5c6a1bece0
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_minor_fix
|
2016-12-11 14:12:21 +01:00 |
|
Maxime Kohlhaas
|
5ed041c0cd
|
Rights should not be given by default
|
2016-12-11 14:11:28 +01:00 |
|
Juanjo Menent
|
6503d4db21
|
Merge pull request #6148 from defrance/patch-60
print_barre_liste only on top of list
|
2016-12-11 14:06:32 +01:00 |
|
Juanjo Menent
|
31fad0a610
|
Merge pull request #6147 from atm-maxime/mko_multicurrency_debug
Fix multicurrency - Part 3
|
2016-12-11 14:04:39 +01:00 |
|
BENKE Charlie
|
37d734387b
|
print_barre_liste only on top of list
|
2016-12-11 14:03:48 +01:00 |
|
Maxime Kohlhaas
|
6964f196c8
|
Fix bank account box
|
2016-12-11 14:01:04 +01:00 |
|
Maxime Kohlhaas
|
083aa63fb4
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_multicurrency_debug
|
2016-12-11 13:55:07 +01:00 |
|
Juanjo Menent
|
aacfa33012
|
Merge pull request #6145 from atm-maxime/mko_minor_fix
Minor fixes on thirdparty list
|
2016-12-11 13:51:40 +01:00 |
|
Maxime Kohlhaas
|
df019b255f
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_multicurrency_debug
# Conflicts:
# htdocs/commande/class/commande.class.php
|
2016-12-11 13:48:24 +01:00 |
|
Maxime Kohlhaas
|
11d9d5096e
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_minor_fix
|
2016-12-11 13:46:24 +01:00 |
|
Maxime Kohlhaas
|
b5712d1f1c
|
Missing lang load
|
2016-12-11 13:44:47 +01:00 |
|
Maxime Kohlhaas
|
f800e38099
|
Wrong fields in soc list
|
2016-12-11 13:39:44 +01:00 |
|
Laurent Destailleur
|
2a61b360e9
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2016-12-11 13:32:05 +01:00 |
|
Laurent Destailleur
|
74c463fd21
|
Fix phpcs
|
2016-12-11 13:31:15 +01:00 |
|
Laurent Destailleur
|
caa71b4463
|
Merge pull request #6140 from jpfox/develop
FIX updating supplier order line
|
2016-12-11 13:27:47 +01:00 |
|
Laurent Destailleur
|
0c5f66f10d
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2016-12-11 13:24:55 +01:00 |
|
Laurent Destailleur
|
ca113553c6
|
git push origin developMerge branch 'tarrsalah-fix_banks_trans_missing' into develop
|
2016-12-11 13:21:50 +01:00 |
|
Laurent Destailleur
|
871c69ad08
|
Merge branch 'fix_banks_trans_missing' of
https://github.com/tarrsalah/dolibarr into
tarrsalah-fix_banks_trans_missing
Conflicts:
htdocs/core/lib/company.lib.php
|
2016-12-11 13:21:21 +01:00 |
|
Laurent Destailleur
|
6fa84206aa
|
Merge pull request #6141 from atm-ph/fix_develop_multicurrency_historisation_rate
Fix no historisation of rate
|
2016-12-11 13:18:35 +01:00 |
|
Laurent Destailleur
|
2dcb97e61d
|
Continue work on dol_banner
|
2016-12-11 13:16:21 +01:00 |
|
tarrsalah
|
0547c91d75
|
Fix #6142
load "banks" translation when constructing societe tab head in
`societe_prepare_head`.
|
2016-12-11 13:10:05 +01:00 |
|
phf
|
9adc994e21
|
Fix no historisation of rate
|
2016-12-11 12:01:38 +01:00 |
|
Jean-Pierre Morfin
|
a4e424ee0e
|
FIX updating supplier order line
|
2016-12-11 11:59:49 +01:00 |
|
Maxime Kohlhaas
|
1e6196dc4a
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_multicurrency_debug
|
2016-12-11 11:59:42 +01:00 |
|
Laurent Destailleur
|
224bd12065
|
Fix css for limit after a link to intervention
|
2016-12-11 11:51:50 +01:00 |
|
Laurent Destailleur
|
372f50bbde
|
FIX Do not show total of balance if currencies differs
|
2016-12-11 11:51:21 +01:00 |
|
Laurent Destailleur
|
c6293db23c
|
Try a better fix for responsive and avoid scrolling on field selectors
|
2016-12-11 11:28:30 +01:00 |
|
Laurent Destailleur
|
190f432c23
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2016-12-11 11:07:22 +01:00 |
|
Laurent Destailleur
|
4969af8c74
|
Merge remote-tracking branch 'origin/4.0' into develop
Conflicts:
ChangeLog
htdocs/product/card.php
|
2016-12-11 11:04:15 +01:00 |
|
Maxime Kohlhaas
|
ac41b61ad8
|
Empty inputs when editing line
|
2016-12-11 10:48:49 +01:00 |
|
Juanjo Menent
|
aa2d783aaa
|
Merge pull request #6134 from atm-maxime/fix_photo_product
Fix product photo in tooltip
|
2016-12-11 10:21:31 +01:00 |
|
Maxime Kohlhaas
|
0302e8c1f8
|
Missing comment
|
2016-12-11 09:29:20 +01:00 |
|
Laurent Destailleur
|
c1ec3d9b73
|
Merge pull request #6135 from defrance/patch-59
Add translation tabs
|
2016-12-11 02:59:09 +01:00 |
|
Laurent Destailleur
|
144743df6d
|
Merge pull request #6131 from defrance/patch-57
Bad return on linkback
|
2016-12-11 02:57:23 +01:00 |
|
Laurent Destailleur
|
aa3bfb06cd
|
Merge pull request #6133 from defrance/patch-58
Bad number rights on User badge tabs
|
2016-12-11 02:54:46 +01:00 |
|
Laurent Destailleur
|
e7bc4bc70c
|
Merge pull request #6137 from atm-maxime/mko_multicurrency_debug
Fix multicurrency - Part 2
|
2016-12-11 02:53:38 +01:00 |
|
Maxime Kohlhaas
|
d6083cccb8
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_multicurrency_debug
|
2016-12-11 02:50:42 +01:00 |
|