Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-17 15:01:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
57,668 Commits 36 Branches 190 Tags
08eaff729ff90a0beb51a5665d7ed35b5b703912
Commit Graph

10726 Commits

Author SHA1 Message Date
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
Laurent Destailleur
9b436ce871 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/product/class/product.class.php
 2016-12-11 02:51:32 +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
Laurent Destailleur
50bc65ce77 Add css to help debug 2016-12-10 13:05:38 +01:00
Juanjo Menent
d5e28fa3d2 Merge remote-tracking branch 'upstream/develop' into develop 2016-12-10 12:28:09 +01:00
Juanjo Menent
370f76d097 Fix #6106 error message when cancel pic resize 2016-12-10 12:27:11 +01:00
florian HENRY
0f0db5a3fb fix: uniformize 2016-12-10 12:06:18 +01:00
florian HENRY
a422819277 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_advtaremailng 2016-12-10 11:49:52 +01:00
florian HENRY
2d2959ffba Set hidden option back 2016-12-10 11:49:35 +01:00
Laurent Destailleur
bd1d076753 Merge pull request #6096 from aspangaro/5.0-b2 
VAT payment card - Uniformize presentation
 2016-12-10 11:44:38 +01:00
Laurent Destailleur
4bb778c54f Merge pull request #6095 from aspangaro/5.0-b1 
Fix presentation on Loan / Expense report / VAT
 2016-12-10 11:42:08 +01:00
florian HENRY
3b25bf2ee6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_advtaremailng 2016-12-10 11:37:07 +01:00
florian HENRY
9da324031c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2016-12-10 09:57:18 +01:00
florian HENRY
a0e8b509db Finish Advance target emailing feature (back from hashes since 3.7) 2016-12-09 19:06:59 +01:00
florian HENRY
ec5a094d27 FIX : Do not include separate extrafields into export cause "separate" 
extrafields aren't sql column
 2016-12-09 17:17:58 +01:00
Laurent Destailleur
10c00d37b5 Complete use of dol_banner 2016-12-09 15:59:31 +01:00
Laurent Destailleur
fb45c72cc3 Complete use of dol_banner 2016-12-09 15:03:57 +01:00
Regis Houssin
239e42faa0 Fix: contract use "total_vat" instead "total_tva" 2016-12-09 13:04:05 +01:00
aspangaro
b1c007aa75 VAT payment card - Uniformize presentation 2016-12-09 06:59:24 +01:00
aspangaro
302109b3fe Loan - Move tab Notes after Files tab 2016-12-08 22:32:10 +01:00
Laurent Destailleur
d23604701c Fix responsive 2016-12-07 15:00:20 +01:00
Laurent Destailleur
083aef9b90 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-07 14:27:07 +01:00
Laurent Destailleur
1583d0e49f Fix linkof mass action for pdf merge 2016-12-07 14:14:03 +01:00
Laurent Destailleur
9efcda6714 Merge pull request #6086 from fappels/develop-work-on-warehouse-status 
New continue work on warehouse status #5115
 2016-12-07 13:06:07 +01:00
Laurent Destailleur
c2bee0f937 FIX #6088 2016-12-07 12:44:56 +01:00