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

56953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aspangaro
b7babb8a48 Problem of traduction 2016-12-11 14:13:48 +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
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
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
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
Maxime Kohlhaas
a4a47a064c fix missing commit and return 2016-12-11 02:50:31 +01:00
Maxime Kohlhaas
f7524b93ad Actualize currency on supplier order and invoice 2016-12-11 02:50:21 +01:00
Laurent Destailleur
859a9cadcb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-11 02:32:13 +01:00
Laurent Destailleur
7d5c708043 Fix size of field for member list 2016-12-11 02:31:59 +01:00
Laurent Destailleur
4e75f064fe Fix popup of selection of fields 2016-12-11 02:22:54 +01:00
Laurent Destailleur
2802be2ed5 Fix bad limit 2016-12-11 02:20:13 +01:00
Maxime Kohlhaas
3d2143809b Multicurrency on supplier order and invoice 2016-12-11 02:09:57 +01:00
Maxime Kohlhaas
177ec97689 Actualize currency on propal, order and invoice 2016-12-11 01:04:58 +01:00
Maxime Kohlhaas
d426ab04f0 Multicurrency on proposal and order 2016-12-11 00:42:52 +01:00
Maxime Kohlhaas
707ca379c9 Fix currency on supplier order creation 2016-12-10 23:57:26 +01:00
BENKE Charlie
b645a50742 Add translation tabs 2016-12-10 23:49:09 +01:00
Maxime Kohlhaas
3befe1b83f Fix product photo in tooltip 2016-12-10 23:34:32 +01:00
BENKE Charlie
f2eb73a101 Update info.php 2016-12-10 23:32:01 +01:00
BENKE Charlie
5bc3107c5d Update note.php 2016-12-10 23:30:31 +01:00
BENKE Charlie
35107f1dbf bad number rights on badge tabs 2016-12-10 23:29:43 +01:00
Laurent Destailleur
3fc8e2cf4c Merge pull request #6130 from aternatik/bug-6129 
FIX #6129 : correct test on database connection
 2016-12-10 23:19:07 +01:00
Laurent Destailleur
0f2963d05b Merge pull request #6123 from atm-maxime/mko_multicurrency_debug 
Fix multicurrency - Part 1
 2016-12-10 23:16:14 +01:00
Laurent Destailleur
f70c4e4d23 Merge pull request #6126 from aspangaro/5.0-b6 
Fix presentation on warehouse card
 2016-12-10 23:15:13 +01:00
jfefe
d5128a1889 FIX #6129 : correct test on database connection 2016-12-10 23:12:03 +01:00
Laurent Destailleur
f321d4a77d Merge pull request #6125 from defrance/patch-55 
bad rights on  create order
 2016-12-10 23:11:55 +01:00
Laurent Destailleur
09520d814a Fix columns hidden 2016-12-10 23:08:11 +01:00
Laurent Destailleur
5a35588b63 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-10 22:59:19 +01:00
Laurent Destailleur
5120093872 FIX balance of TR 2016-12-10 22:58:55 +01:00
BENKE Charlie
8589f077c0 Bad return on linkback 2016-12-10 22:54:13 +01:00
Maxime Kohlhaas
466f89930e Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_multicurrency_debug 2016-12-10 22:42:17 +01:00
Maxime Kohlhaas
194639c30e Missing lang in admin 2016-12-10 22:41:57 +01:00
Maxime Kohlhaas
3ab23ecb7e Better currency rate setup 2016-12-10 22:40:25 +01:00