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

68883 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
b270563cd3
Merge pull request #9389 from frederic34/patch-17 
Update myobject.class.php
 2018-09-02 15:41:30 +02:00
Laurent Destailleur
1418adde8b
Merge pull request #9388 from frederic34/patch-16 
Update actioncommreminder.class.php
 2018-09-02 15:41:07 +02:00
Laurent Destailleur
b34731afb4
Merge pull request #9385 from frederic34/patch-15 
Update html_cerfafr.modules.php
 2018-09-02 15:38:19 +02:00
Laurent Destailleur
63217de5e0
Merge pull request #9384 from frederic34/patch-14 
comment missing and not camecaps are incompatible
 2018-09-02 15:37:38 +02:00
Laurent Destailleur
91809de1c3
Merge pull request #9383 from frederic34/patch-13 
Update doc_generic_user_odt.modules.php
 2018-09-02 15:35:54 +02:00
Laurent Destailleur
86331ee321
Merge pull request #9382 from frederic34/patch-11 
Update dav.class.php
 2018-09-02 15:35:41 +02:00
Laurent Destailleur
b90cecf728
Merge pull request #9380 from frederic34/patch-9 
remove superfluous space
 2018-09-02 15:35:29 +02:00
Laurent Destailleur
ff6a57d52a
Merge pull request #9381 from frederic34/patch-10 
remove superfluous space
 2018-09-02 15:35:18 +02:00
Laurent Destailleur
bb5fae0e46 Fix eol 2018-09-02 15:30:56 +02:00
Laurent Destailleur
32a03f3c0b Fix eol 2018-09-02 14:25:52 +02:00
Frédéric FRANCE
0c16761f48
Update myobject.class.php 2018-09-02 10:23:00 +02:00
Frédéric FRANCE
71977514d7
Update actioncommreminder.class.php 2018-09-02 09:06:51 +02:00
Frédéric FRANCE
49a1e33fc9
Update html_cerfafr.modules.php 2018-09-01 16:23:30 +02:00
Frédéric FRANCE
83a647ce0d
comment missing and not camecaps are incompatible 2018-09-01 15:56:14 +02:00
Laurent Destailleur
c3438b79c8 Fix merge 2018-09-01 15:39:11 +02:00
Laurent Destailleur
c8912d6a4f
Merge pull request #9242 from frederic34/camelCaps 
mark non camelCaps function
 2018-09-01 15:37:56 +02:00
Laurent Destailleur
948c95c0f6 Reduce travis test to min and max php only 2018-09-01 15:34:25 +02:00
Frédéric FRANCE
ae52b737b3
Update doc_generic_user_odt.modules.php 2018-09-01 15:29:41 +02:00
Frédéric FRANCE
beeaf9cf8a
Update dav.class.php 2018-09-01 15:27:51 +02:00
Laurent Destailleur
2301ecf1dc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-01 14:51:20 +02:00
Laurent Destailleur
c2548b8b39
Merge pull request #9298 from ksar-ksar/Upd_hook_formConfirm 
NEW hook formConfirm always called if hooked
 2018-09-01 14:50:08 +02:00
Frédéric FRANCE
b3b0816e24
remove superfluous space 2018-09-01 14:34:53 +02:00
Frédéric FRANCE
6798d4e55c
remove superfluous space 2018-09-01 14:33:37 +02:00
Laurent Destailleur
e4e1bf5a1a
Merge pull request #9361 from frederic34/patch-19 
Update discount.class.php
 2018-09-01 14:30:16 +02:00
Laurent Destailleur
359eebbbec Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-01 14:26:48 +02:00
Laurent Destailleur
08bc81a7ab
Merge pull request #9370 from joseplluis/patch-5 
NEW optional param to show a specific extrafield
 2018-09-01 14:24:23 +02:00
Laurent Destailleur
bc71aef7b4 Code comment 2018-09-01 14:24:02 +02:00
Laurent Destailleur
5b6a44434c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-01 14:17:15 +02:00
Laurent Destailleur
bcee0ef0ae Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/societe/class/societe.class.php
	htdocs/stripe/config.php
 2018-09-01 14:16:57 +02:00
Laurent Destailleur
26cff9e11f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/langs/en_US/blockedlog.lang
	htdocs/stripe/config.php
 2018-09-01 14:13:01 +02:00
Laurent Destailleur
677d7dd0fb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-09-01 14:09:20 +02:00
Laurent Destailleur
123a66dc2a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/product/class/product.class.php
 2018-09-01 14:09:00 +02:00
Frédéric FRANCE
10200374ef
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 14:06:23 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Laurent Destailleur
b5ed4de6a6
Merge pull request #9367 from joseplluis/patch-4 
FIX support of option PRODUCT_DISABLE_VOLUME
 2018-09-01 13:37:38 +02:00
Laurent Destailleur
aa2655d604
Merge pull request #9374 from bafbes/abb80014 
Fix: No link is shown to access for bank transfers.
 2018-09-01 13:36:08 +02:00
Laurent Destailleur
fe06a0a021
Merge pull request #9365 from frederic34/patch-23 
Update categorie.class.php
 2018-09-01 13:31:42 +02:00
Laurent Destailleur
b6f4b1dff7
Merge pull request #9363 from frederic34/patch-21 
Update modSociete.class.php
 2018-09-01 13:31:23 +02:00
Frédéric FRANCE
2b5407c31d Update export.php 2018-09-01 13:30:28 +02:00
Laurent Destailleur
0d3c34f2b3
Merge pull request #9364 from frederic34/patch-22 
Update export.php
 2018-09-01 13:29:41 +02:00
Laurent Destailleur
06355f7f08
Merge pull request #9362 from frederic34/patch-20 
Update ldap.class.php
 2018-09-01 13:28:32 +02:00
Laurent Destailleur
bb444c80d0
Merge pull request #9360 from frederic34/patch-18 
Update ldap.php
 2018-09-01 13:28:16 +02:00
Laurent Destailleur
aed91028b9
Merge pull request #9372 from frederic34/patch-24 
FIX syntax propal.class.php
 2018-09-01 13:27:59 +02:00
Laurent Destailleur
1eeb567e67
Merge pull request #9359 from frederic34/patch-17 
Update card.php
 2018-09-01 13:27:49 +02:00
Laurent Destailleur
4bd8b288ed
Merge pull request #9375 from frederic34/patch-26 
FIX get_product_vat_for_country functions.lib.php
 2018-09-01 13:27:05 +02:00
Laurent Destailleur
7d8e2ccedd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-01 13:26:38 +02:00
Laurent Destailleur
1750bb6802 Fix column name 2018-09-01 13:26:28 +02:00
Laurent Destailleur
dee9442720 Fix regression 2018-09-01 13:12:09 +02:00
Laurent Destailleur
5604f3b0c3
Merge pull request #9376 from frederic34/functionCommentMissing 
function Comment Missing
 2018-09-01 12:59:32 +02:00
Josep Lluís
bfaf7ae473 Fix: undefined rights_class on modules 
When a module has the permission variable rights_class undefined, on unactivate the module are deleted all rows in cronjobs and menu tables with module=''.
 2018-09-01 12:44:16 +02:00