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

46268 Commits

Author SHA1 Message Date
Florian HENRY
fda5e6002f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/websites/index.php
 2016-05-02 20:27:34 +02:00
Laurent Destailleur
d69904c14d Can set the home page of web sites 2016-05-02 15:51:18 +02:00
Laurent Destailleur
df4afdd663 NEW Can disable a module by renaming dir of module into module.disabled 
(this save time for maintenance when working with FTP).
 2016-05-02 09:49:58 +02:00
Laurent Destailleur
5823055cdf Work on website module. 2016-05-01 21:19:29 +02:00
Laurent Destailleur
46e2ed2810 NEW: All variant of ckeditor config can be tested into the setup page of 
module.
 2016-05-01 20:36:42 +02:00
Laurent Destailleur
170dc467ff Better code for website edition 2016-05-01 19:49:03 +02:00
Laurent Destailleur
3045449dbb Work on website module. Can delete a page. 2016-05-01 17:01:38 +02:00
Laurent Destailleur
f59f3032c6 NEW: Rename path for generic medias files into '/medias' instead of 
fckeditor. Add location of medias into title of media browser of
ckeditor.
Work on website module
 2016-05-01 16:34:50 +02:00
Laurent Destailleur
f324c662c2 Better update of database cleaning non expected records. 2016-04-30 21:58:00 +02:00
Laurent Destailleur
50323afe94 Add comment 2016-04-30 21:33:18 +02:00
Laurent Destailleur
6a123c91b5 Solve warnings that appears because code is using statically a mehtod 
that can't be static yet.
 2016-04-30 19:30:28 +02:00
Laurent Destailleur
9c855f3a5e Start to work to have custom dir available and active by default. 2016-04-30 17:11:48 +02:00
Laurent Destailleur
a8363052c6 Better style 2016-04-30 15:55:39 +02:00
Laurent Destailleur
de59d115d9 Option THIRDPARTY_CUSTOMERPROSPECT_BY_DEFAULT and 
THIRDPARTY_SUPPLIER_BY_DEFAULT to have fields customer/prospect/supplier
set when creating a new thirdparty.
 2016-04-30 14:59:40 +02:00
Laurent Destailleur
e61e717cac FIX Bad permission to edit bank account on customer invoice 2016-04-30 14:28:48 +02:00
Laurent Destailleur
f747018fb6 Clean dead code 
FIX when editing price with tax, reset price without so i will be
recalculated.
 2016-04-30 14:24:33 +02:00
Laurent Destailleur
97bf91cc5d Show both currency symbol and code 2016-04-30 14:09:00 +02:00
Laurent Destailleur
6ffb45f5d8 FIX Missing param user on update() 2016-04-30 13:58:35 +02:00
Laurent Destailleur
9e24abacac Missing translation load 2016-04-30 13:26:31 +02:00
Laurent Destailleur
e717baefe5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-30 01:43:44 +02:00
Laurent Destailleur
4e9ea2786a Fix s 2016-04-30 01:43:34 +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
0ed998af03 Revert "Revert "FIX #4813 Won translation for the key OppStatusWON instead OppStatusWIN"" 2016-04-29 19:01:38 +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
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
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
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