Commit Graph

10532 Commits

Author SHA1 Message Date
Alexis Algoud
f0ea610401 change date value 2016-12-16 17:06:05 +01:00
Alexis Algoud
41ddaf5d9b fix but major bug on date name, as to seach a solution 2016-12-16 16:28:10 +01:00
Alexis Algoud
79867a85d0 fix list issue 2016-12-16 16:09:02 +01:00
Alexis Algoud
4d375bcf95 debug translate 2016-12-16 11:31:14 +01:00
Alexis Algoud
b7a6a71dff move file to core 2016-12-15 17:20:46 +01:00
Alexis Algoud
1596760d21 fix regulate / apply new PMP / add or remove line 2016-12-15 17:02:20 +01:00
Alexis Algoud
9f6f874655 fix 2016-12-15 12:33:26 +01:00
Alexis Algoud
81b01cd055 fix 2016-12-15 11:23:13 +01:00
Alexis Algoud
703b8708e3 fix create 2016-12-15 10:39:59 +01:00
Alexis Algoud
a463759ba3 init query builder into db 2016-12-14 16:54:05 +01:00
Alexis Algoud
565bcf2332 debug fetch method 2016-12-14 16:11:37 +01:00
Alexis Algoud
a636d27ccb Div 2016-12-14 14:34:12 +01:00
Alexis Algoud
efc22a4cd8 include default list conception 2016-12-13 09:49:59 +01:00
Alexis Algoud
baf1acb4fd debug 2016-12-13 09:17:43 +01:00
Alexis Algoud
dfb9ae234c debug 2016-12-12 19:03:02 +01:00
Alexis Algoud
cdfbed5d08 new listview 2016-12-12 17:36:22 +01:00
Alexis Algoud
a7813c37a1 init inventory integration 2016-12-12 12:36:00 +01:00
Laurent Destailleur
0c84a0f9af Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-11 22:10:34 +01:00
Laurent Destailleur
6c4f15df63 Fix lot of fix in css look to match v5 rules. 2016-12-11 16:11:42 +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
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
Maxime Kohlhaas
6964f196c8 Fix bank account box 2016-12-11 14:01:04 +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
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
tarrsalah
0547c91d75 Fix #6142
load "banks" translation when constructing societe tab head in
`societe_prepare_head`.
2016-12-11 13:10:05 +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
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
Laurent Destailleur
c1ec3d9b73 Merge pull request #6135 from defrance/patch-59
Add translation tabs
2016-12-11 02:59:09 +01:00
Maxime Kohlhaas
f7524b93ad Actualize currency on supplier order and invoice 2016-12-11 02:50:21 +01:00
Maxime Kohlhaas
177ec97689 Actualize currency on propal, order and invoice 2016-12-11 01:04:58 +01:00
BENKE Charlie
b645a50742 Add translation tabs 2016-12-10 23:49:09 +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
aspangaro
31fcf9aff9 Fix warehouse presentation 2016-12-10 22:13:06 +01:00
Maxime Kohlhaas
7c82b18da0 New : allow to actualize currency rate 2016-12-10 22:07:25 +01:00
Maxime Kohlhaas
9f045eb996 Missing comments 2016-12-10 22:07:05 +01:00
Maxime Kohlhaas
1f48e0486f Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_multicurrency_debug 2016-12-10 21:50:31 +01:00
Laurent Destailleur
2dda1d7c74 Merge pull request #6116 from simnandez/develop
Fix: fails to load image to redim into photo resize
2016-12-10 20:00:52 +01:00
Laurent Destailleur
653eb4d907 Fix project into dol_banner 2016-12-10 20:00:07 +01:00
Juanjo Menent
d310fb71a1 Merge remote-tracking branch 'upstream/develop' into develop 2016-12-10 19:59:50 +01:00
Maxime Kohlhaas
6474591e25 Allow to enter price in currency 2016-12-10 19:54:16 +01:00
Maxime Kohlhaas
b1d5f2689a Fix colspan missing 2016-12-10 16:45:52 +01:00
Maxime Kohlhaas
eb8f89119f Dynamic select currency 2016-12-10 16:20:37 +01:00
Laurent Destailleur
185e9e88ae Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-10 15:59:52 +01:00
Juanjo Menent
99542de935 Fix: fails to load image to redim into photo resize 2016-12-10 14:47:18 +01:00