Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-21 00:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
54,672 Commits 36 Branches 190 Tags
eb06f56164ebde04f7d7d3fb14a901b24602840c
Commit Graph

54672 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
4e9ea2786a Fix s 2016-04-30 01:43:34 +02:00
BENKE Charlie
379a621b1f soory it's a mistake 2016-04-30 01:01:32 +02:00
Laurent Destailleur
1bfc7e9b70 Merge pull request #5104 from fappels/patch-1 
Update product.class.php
 2016-04-30 00:28:22 +02:00
Laurent Destailleur
019398857a Merge pull request #5099 from aspangaro/4.0-p24 
FIX: Accountancy - Upgrade Cegid Bank export
 2016-04-30 00:27:36 +02:00
Laurent Destailleur
e8bd1357f3 More help to use REST API 2016-04-30 00:00:59 +02:00
aspangaro
35c87972bb Merge remote-tracking branch 'Upstream/develop' into 4.0-p24 2016-04-29 20:47:52 +02:00
Laurent Destailleur
0cde6ad98f Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2016-04-29 20:43:42 +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
Laurent Destailleur
04f4a99684 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-29 20:35:50 +02:00
Laurent Destailleur
3c927fbe0e Debug website module 2016-04-29 20:35:38 +02:00
Laurent Destailleur
d7ea8139fe Merge pull request #5103 from fappels/develop-fix-societe-update 
Fix #5100 Develop unable to create new third party
 2016-04-29 20:22:03 +02:00
BENKE Charlie
49c3c69e30 minor error code 2016-04-29 20:20:47 +02:00
Laurent Destailleur
f5df6488db Merge pull request #5094 from defrance/patch-2 
minor error code
 2016-04-29 20:18:55 +02:00
BENKE Charlie
31a9acc77d </option> not present in some select list 2016-04-29 20:18:26 +02:00
Laurent Destailleur
db4024035e Merge pull request #5092 from defrance/patch-1 
</option> not present in some select list
 2016-04-29 20:17:56 +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
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