Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
52,175 Commits 36 Branches 189 Tags
21a83c7e04e5cd052d24d2d77e09f6d2ed1710c0
Commit Graph

52175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
21a83c7e04 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-05-08 11:02:54 +02:00
Laurent Destailleur
7262dd5934 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-05-08 10:49:09 +02:00
Laurent Destailleur
cb4e569a5f FIX Merge manually PR #5161 - Bad translation key 2016-05-08 10:48:55 +02:00
Laurent Destailleur
06eeb0ced4 Merge pull request #5141 from aspangaro/3.8-p3 
FIX: Accountancy - 3.8 - Chart of accounts are limited on only one country
 2016-05-05 22:28:08 +02:00
Laurent Destailleur
d39bd75c57 Merge pull request #5140 from aspangaro/3.9-p21 
FIX: Accountancy - 3.9 - Chart of accounts are limited on only one country
 2016-05-05 22:27:51 +02:00
Laurent Destailleur
5040fe46b0 FIX Missing number total of modules 2016-05-05 11:15:53 +02:00
Laurent Destailleur
911e862a8e Fix missing translation and add a TODO to avoid infinite loop. 2016-05-04 13:49:05 +02:00
Laurent Destailleur
7998cefdd2 Fix mark a deprecated function as deprecated 2016-05-04 13:15:00 +02:00
aspangaro
e6843a64ae FIX: Accountancy - 3.8 - Chart of accounts are limited on only one country 2016-04-30 07:13:23 +02:00
aspangaro
3cf1d891ab FIX: Accountancy - 3.9 - Chart of accounts are limited on only one country 2016-04-30 07:05:10 +02:00
Laurent Destailleur
3d9456b202 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/facture/list.php
 2016-04-29 20:42:35 +02:00
Laurent Destailleur
755b994750 Prepare 3.9.2 2016-04-29 20:40:00 +02:00
Laurent Destailleur
53386e22ea Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/expedition/class/expedition.class.php
	htdocs/index.php
 2016-04-29 20:39:17 +02:00
Laurent Destailleur
0735413e7c Merge pull request #5101 from altatof/fix_fournprice_select 
FIX: end of select when no fournprice
 2016-04-29 20:36:44 +02:00
BENKE Charlie
49c3c69e30 minor error code 2016-04-29 20:20:47 +02:00
BENKE Charlie
31a9acc77d </option> not present in some select list 2016-04-29 20:18:26 +02:00
esprit libre
f5a541d469 Fix problem about unit buy price fetching 
To fix a bug encountered at customer shop about margin calculation. In some case, returned buy price is total buy price from provider and not unit buy price.
Case opened on forum: http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/55467-calcul-des-marges
 2016-04-29 19:41:47 +02:00
Laurent Destailleur
864af3294c Merge pull request #5137 from Dolibarr/revert-5136-revert-5080-bug-4813 
Revert "Revert "FIX #4813 Won translation for the key OppStatusWON instead OppStatusWIN""
 2016-04-29 19:01:48 +02:00
Laurent Destailleur
0ed998af03 Revert "Revert "FIX #4813 Won translation for the key OppStatusWON instead OppStatusWIN"" 2016-04-29 19:01:38 +02:00
Laurent Destailleur
3396734d44 Merge pull request #5136 from Dolibarr/revert-5080-bug-4813 
Revert "FIX #4813 Won translation for the key OppStatusWON instead OppStatusWIN"
 2016-04-29 19:00:22 +02:00
Laurent Destailleur
3a74946210 Revert "FIX #4813 Won translation for the key OppStatusWON instead OppStatusWIN" 2016-04-29 18:59:54 +02:00
Laurent Destailleur
ea924df4c5 Merge pull request #5080 from marcosgdf/bug-4813 
FIX #4813 Won translation for the key OppStatusWON instead OppStatusWIN
 2016-04-29 18:59:52 +02:00
Laurent Destailleur
b94295e4ca Merge pull request #5102 from atm-alexis/3.8 
FIX search on date into supplier invoice list
 2016-04-29 18:45:04 +02:00
Laurent Destailleur
b0977e3e2a Merge pull request #5122 from fmarcet/3.8 
FIX: Not filtering correctly when come from dashboard
 2016-04-29 17:40:03 +02:00
Laurent Destailleur
59a30cd2e7 Merge pull request #5120 from atm-maxime/fix_total_on_cabyprodserv 
Fix wrong qty total in ca by prod/serv report
 2016-04-29 17:39:40 +02:00
Laurent Destailleur
9a1cff99cc Merge pull request #5123 from fmarcet/3.9 
FIX: Not filtering correctly when coming from dashboard
 2016-04-29 17:20:10 +02:00
Laurent Destailleur
b0b1056a44 Merge pull request #5121 from fmarcet/3.7 
Fix: Not filtering correctly on supplier invoice's list
 2016-04-29 17:19:15 +02:00
Laurent Destailleur
3c2c9a25b8 Merge pull request #5130 from frederic34/patch-9 
FIX if type fee not specified, line is invisible and can't edit it
 2016-04-29 17:11:14 +02:00
Laurent Destailleur
84a39f41d6 Merge pull request #5125 from frederic34/patch-7 
FIX Load user personal param at login. This cause boxes disordered at login time.
 2016-04-29 17:10:41 +02:00
Laurent Destailleur
f4224881c3 Merge pull request #5132 from frederic34/patch-11 
FIX keep files attached with PROV status
 2016-04-29 17:08:22 +02:00
Laurent Destailleur
9a53e5edff Merge pull request #5131 from frederic34/patch-10 
If no project, update line is impossible
 2016-04-29 17:06:39 +02:00
Laurent Destailleur
8a4871323d Merge pull request #5022 from marcosgdf/bug-5008 
FIX #5008 SQL error when editing the reference of a supplier invoice that already exists
 2016-04-29 17:01:01 +02:00
Laurent Destailleur
c539cc7151 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-04-29 15:30:04 +02:00
Laurent Destailleur
f91a8934bd Merge remote-tracking branch 'origin/3.7' into 3.8 2016-04-29 15:17:11 +02:00
Laurent Destailleur
211d217f8c Merge remote-tracking branch 'origin/3.6' into 3.7 2016-04-29 15:13:27 +02:00
Laurent Destailleur
2a27fe02eb Fix detection if tag already exists 2016-04-29 15:12:58 +02:00
Frédéric FRANCE
7e8aef037a Update expensereport.class.php 2016-04-29 13:23:06 +02:00
Frédéric FRANCE
a982f764fe don't change ref if ref is not prov 2016-04-29 12:26:41 +02:00
Frédéric FRANCE
ab63bdd235 keep files attached with PROV status 2016-04-28 22:30:22 +02:00
Frédéric FRANCE
c743f6cfe5 If no project, update line is impossible 2016-04-28 21:56:28 +02:00
Frédéric FRANCE
972e5e571d Update card.php 2016-04-28 21:52:23 +02:00
Frédéric FRANCE
4404197597 Load user personal param at login 2016-04-28 11:54:42 +02:00
fmarcet
33499ae652 FIX: Compatible with multicompany 2016-04-28 11:14:00 +02:00
Laurent Destailleur
608c93702d FIX Can't create a stock transfer from product card 2016-04-28 11:05:34 +02:00
fmarcet
e96e0f637a FIX: Not filtering correctly when come from dashboard 2016-04-28 10:41:37 +02:00
fmarcet
d599261d20 FIX: Not filtering correctly when come from dashboard 2016-04-28 10:38:50 +02:00
Ferran Marcet
7380676717 Fix: Not filtering correctly on supplier invoice's list 2016-04-28 10:25:55 +02:00
Maxime Kohlhaas
0a67614e72 Fix wrong qty total in ca by prod/serv report 2016-04-28 09:10:22 +02:00
Laurent Destailleur
77fcbd3884 FIX: init var at wrong place report incorrect "shippable" flag on draft 
order.
 2016-04-27 12:34:52 +02:00
Christophe Battarel
2a0c508d47 FIX: end of select when no fournprice 2016-04-25 11:26:13 +02:00