Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
87,753 Commits 36 Branches 189 Tags
45f834cb15122c034e1666a03e920f159183d7dd
Commit Graph

6095 Commits

Author SHA1 Message Date
Laurent Destailleur
8c1d362e8d Merge pull request #10286 from ptibogxiv/patch-103 
New Use ajax switch into on socialnetworks.php
 2019-01-02 20:00:44 +01:00
Laurent Destailleur
d613041703 Merge pull request #10282 from ptibogxiv/patch-99 
NEW: Use ajax swith button on setup of multi-currency module
 2019-01-02 19:58:20 +01:00
Laurent Destailleur
422e18ee8e Merge pull request #10268 from hregis/develop_upgrade 
FIX remove old unused and deprecated function "getStaticMember"
 2019-01-02 19:37:49 +01:00
ptibogxiv
511579a24b FIX: Ajax on socialnetworks.php 2018-12-30 19:48:04 +01:00
ptibogxiv
82d597ade2 FIX: ajax on stock.php 2018-12-30 19:07:21 +01:00
ptibogxiv
b9baaafe19 Update multicurrency.php 2018-12-30 17:15:11 +01:00
ptibogxiv
8adecf0689 Update multicurrency.php 2018-12-30 17:09:38 +01:00
ptibogxiv
dec4e1f6a6 New option use currency on document + toggle 
- change with toogle
- new option use currency on document for online payment
 2018-12-30 16:49:54 +01:00
Laurent Destailleur
5c516fdae2 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2018-12-26 19:43:01 +01:00
Regis Houssin
1a15698f96 FIX replace deprecated "print_titre" with "load_fiche_titre" 
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
 2018-12-25 08:36:42 +01:00
Regis Houssin
8f4c452075 FIX replace deprecated "print_fiche_titre" with "load_fiche_titre" 
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
 2018-12-25 08:34:26 +01:00
Laurent Destailleur
7b61fc8fd1 Fix setup of dav module 2018-12-23 14:03:19 +01:00
Laurent Destailleur
f55db6dd84 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/resources/dbmodel/dolibarr_schema.mwb
 2018-12-15 14:09:16 +01:00
Laurent Destailleur
27f8096afa Merge branch 'develop' into PR_NEW_reception 2018-12-15 12:50:31 +01:00
Laurent Destailleur
59bc15377d CSS 2018-12-14 18:58:55 +01:00
Laurent Destailleur
88a52aa11d Merge branch 'develop' into develop_mc 2018-12-14 15:58:52 +01:00
Laurent Destailleur
2011afe6fb Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
Laurent Destailleur
b0941967f0 Fix sort of email templates 2018-12-13 12:13:28 +01:00
Laurent Destailleur
4882615c8a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-12 11:53:06 +01:00
Laurent Destailleur
13f5476678 Responsive 2018-12-12 11:50:10 +01:00
Laurent Destailleur
434cf2e046 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-11 09:58:14 +01:00
Laurent Destailleur
3213b3be07 Standardize code: Move jabberid into social network module 2018-12-11 09:17:02 +01:00
Laurent Destailleur
bdb4295379 Fix menu editor 2018-12-10 18:24:05 +01:00
Laurent Destailleur
b35a9c0e64 FIX Edition of menu fails (mainmenu required for top menu) 2018-12-10 17:50:58 +01:00
Laurent Destailleur
f755457236 Test imap available 2018-12-07 14:54:25 +01:00
Laurent Destailleur
cf00519e90 Test imap available 2018-12-06 21:40:51 +01:00
Laurent Destailleur
1d9c0f6b77 Fix look and feel 2018-12-04 13:26:19 +01:00
Laurent Destailleur
d9bb39970f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/barcode.php
 2018-12-04 13:20:40 +01:00
Laurent Destailleur
5061a9b0c2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/install/mysql/tables/llx_paiementfourn.sql
 2018-12-04 13:17:25 +01:00
Laurent Destailleur
275eeca135 Trans 2018-12-04 13:09:58 +01:00
Regis Houssin
8953a3ed73 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_mc

Conflicts:
	ChangeLog
 2018-12-03 08:46:03 +01:00
Philippe GRAND
8ec2bac36a FIX #3234 2018-12-02 10:02:05 +01:00
Frédéric FRANCE
d2d623b0b6 GETPOSTISSET has only one param 2018-12-02 09:26:24 +01:00
Philippe GRAND
3800fde225 fix typo error 2018-11-26 14:29:25 +01:00
Laurent Destailleur
1d4c756783 FIX Remote ip detection was wrong with proxy (example: cloudflare) 2018-11-22 11:44:37 +01:00
Laurent Destailleur
b6dac7da20 FIX Remote ip detection was wrong with proxy (example: cloudflare) 2018-11-21 15:40:15 +01:00
Laurent Destailleur
93929a652b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-21 15:35:15 +01:00
Laurent Destailleur
084516b885 Fix ip detection of geoip 2018-11-21 15:11:57 +01:00
Laurent Destailleur
0ea6f2778b Fix examples 2018-11-20 22:01:38 +01:00
Laurent Destailleur
c891f6ed10 Disable javascript feature with no javascript 2018-11-20 21:26:22 +01:00
Laurent Destailleur
f455e32bef FIX Some modules templates were visible when it should not 2018-11-20 16:22:16 +01:00
Laurent Destailleur
4b82538941 Better module position 2018-11-20 14:56:14 +01:00
Laurent Destailleur
1e1ccd4c88 Fix pagination in action/event list 2018-11-19 14:25:34 +01:00
Regis Houssin
7cba680f38 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2018-11-18 17:07:03 +01:00
Laurent Destailleur
7f33403d43 Fix translation 2018-11-17 22:55:13 +01:00
Laurent Destailleur
028be21070 Debug 2018-11-16 16:55:53 +01:00
Frédéric FRANCE
ce6b7adaa0 Merge remote-tracking branch 'upstream/develop' into actionrefused 2018-11-15 22:15:45 +01:00
Laurent Destailleur
6d640ab83c Fix feature to drag and drop rows of table (not generic) 2018-11-15 19:58:06 +01:00
Regis Houssin
aaa9a4f47c FIX use getEntity('invoice') instead getEntity('facture') 2018-11-15 17:27:49 +01:00
Laurent Destailleur
c04fcf170b Work on emailcollector 2018-11-15 16:23:07 +01:00