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

56461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
b17b30f5a2 Merge pull request #5114 from esprit-libre/develop 
FIX When buy price not explicetly defined, it is return by defineBuyPrice function that return total price instead of unit price
 2016-04-29 19:40:29 +02:00
Laurent Destailleur
5d1dbdb82c Merge pull request #5089 from atm-maxime/fix_slect_ziptown 
Fix country and state were not properly updated after ziptown selection
 2016-04-29 19:26:40 +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
eba29890d8 Update changelog #5107 2016-04-29 18:57:20 +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
b434dad21a Fix: remove a debug code 2016-04-29 18:34:56 +02:00
Laurent Destailleur
cea1c06f7d Merge pull request #4764 from benlo06/fr_4763 
FR4763 add possibility to export contacts/thirdparty categories
 2016-04-29 18:33:58 +02:00
Laurent Destailleur
1799af2972 git push origin developMerge branch 'PeartreeG-patch-1' into develop 2016-04-29 18:31:29 +02:00
Laurent Destailleur
19162fc8d5 Merge branch 'patch-1' of https://github.com/PeartreeG/dolibarr into 
PeartreeG-patch-1

Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/resource/element_resource.php
 2016-04-29 18:31:11 +02:00
Alexis Algoud
e5b6d39e51 NEW allow a document to be linked to project from another customer on config 2016-04-29 18:04:59 +02:00
Laurent Destailleur
466404d968 Fix missing dol_fiche_xxx 2016-04-29 17:58:39 +02:00
Laurent Destailleur
26b4a5a1e0 Merge pull request #4267 from bafbes/patch-12 
allow cherry-pick of a sub-menu by changing its parent identifier
 2016-04-29 17:55:29 +02:00
Laurent Destailleur
14838d222b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-29 17:53:29 +02:00
Laurent Destailleur
dfa5998467 Merge branch 'aternatik-dol_resource' into develop 2016-04-29 17:52:22 +02:00
Laurent Destailleur
8fe799f424 Merge branch 'dol_resource' of https://github.com/aternatik/dolibarr 
into aternatik-dol_resource

Conflicts:
	dev/initdata/img/printcompany.png
	htdocs/compta/bank/card.php
 2016-04-29 17:51:11 +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
88842ccd8b Merge pull request #5111 from nka11/api_improvement 
Api improvement
 2016-04-29 17:13:02 +02:00
Laurent Destailleur
bec4c58732 Merge pull request #5133 from olsesacl/develop-bug-module-cronjob 
FIX Bug insert cronjobs in modules, default values
 2016-04-29 17:11:58 +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
174cead40d Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/commande/list.php
 2016-04-29 15:33:57 +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
42f10234b1 Fix regression 2016-04-29 15:28:26 +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
Juanjo Menent
926dd3d77f Merge pull request #5124 from olsesacl/develop-bug 
FIX: Remove table tag
 2016-04-29 13:55:54 +02:00
Frédéric FRANCE
7e8aef037a Update expensereport.class.php 2016-04-29 13:23:06 +02:00
Sergio Sanchis Climent
cd4e104b76 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 
Conflicts:
	htdocs/product/card.php
 2016-04-29 12:39:00 +02:00
Frédéric FRANCE
a982f764fe don't change ref if ref is not prov 2016-04-29 12:26:41 +02:00
Juanjo Menent
5ca989c836 Merge pull request #5126 from FHenry/dev_fixpgsql 
FIX Postgres migration from 3.9 to 4.0
 2016-04-29 12:18:49 +02:00
Juanjo Menent
6d58103d11 Merge pull request #5091 from marcosgdf/fr-4972 
NEW #4972 Translated Charges sociales (type 0) and Charges sociales (type 1) in reports page
 2016-04-29 12:03:04 +02:00
Juanjo Menent
206dee7106 Merge pull request #5086 from aspangaro/4.0-p23 
NEW: Loan - Add list to select accounting account in admin
 2016-04-29 12:01:44 +02:00
Juanjo Menent
08a875b813 Merge pull request #5084 from atm-maxime/new_remaintopay_invoice_list 
New add remain to pay column in invoice list
 2016-04-29 12:00:53 +02:00
Juanjo Menent
d6b1cd8a1c Merge pull request #5083 from aspangaro/4.0-p22 
FIX: Accountancy - Work on categories for report - Add french example & other
 2016-04-29 11:59:41 +02:00
Juanjo Menent
a33df1401b Merge pull request #5079 from marcosgdf/fix-undefined-variable 
Fixed undefined $user variable in Account::countAccountToReconcile
 2016-04-29 11:58:48 +02:00
Juanjo Menent
143a70c893 Merge pull request #5078 from atm-maxime/new_stats_on_home 
New stats on home (contacts and interventions)
 2016-04-29 11:57:44 +02:00
Juanjo Menent
9909143c42 Merge pull request #5076 from aspangaro/4.0-p21 
FIX: For external api, don't use lengt_accountg without module accountancy activated
 2016-04-29 11:55:55 +02:00
Florian HENRY
b01c7572f7 FIX travis 2016-04-29 10:21:39 +02:00
Florian HENRY
6ff71792a0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-29 09:00:42 +02:00