Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 03:28:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
68,865 Commits 36 Branches 190 Tags
c3438b79c8e2ab4dc49b9cc96873c9ff5b51f92c
Commit Graph

68865 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Josep Lluís
79ee31df5c 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:43:02 +02:00
Laurent Destailleur
8bd231adb0 Merge pull request #9357 from joseplluis/patch-3 
FIX undefined rights_class on modules may lose setup when module disabled
 2018-09-01 12:42:22 +02:00
Laurent Destailleur
007381907e Merge pull request #9356 from ptibogxiv/patch-52 
Add shipping_method label in fetch
 2018-09-01 12:40:26 +02:00
Laurent Destailleur
8341765375 Merge pull request #9351 from frederic34/patch-9 
restore build badge for develop
 2018-09-01 12:37:28 +02:00
Laurent Destailleur
179feebd80 Merge pull request #9347 from atm-greg/fix_getLabelOfUnit 
remove useless db begin
 2018-09-01 12:34:43 +02:00
Laurent Destailleur
9f33d586ff Merge pull request #9346 from frederic34/patch-16 
Create index.html
 2018-09-01 12:34:10 +02:00
Laurent Destailleur
b89202572e Merge pull request #9342 from ptibogxiv/patch-51 
fix multicompany and footer ticket public page
 2018-09-01 12:33:55 +02:00
Laurent Destailleur
fc5ebc8099 Merge pull request #9340 from ptibogxiv/patch-49 
Fix image if multicompany + no login in onlinesign
 2018-09-01 12:32:38 +02:00
Laurent Destailleur
cbe89af8f3 Merge pull request #9339 from ptibogxiv/patch-48 
add logo with multicompany
 2018-09-01 12:31:56 +02:00
Laurent Destailleur
0913b871aa Merge pull request #9338 from ptibogxiv/patch-47 
Fix multicompany
 2018-09-01 12:30:53 +02:00
Laurent Destailleur
ae36469166 FIX #9337 2018-09-01 12:28:36 +02:00
Laurent Destailleur
59a27085fd Merge pull request #9336 from ptibogxiv/patch-45 
fix multicompany in public ticket page
 2018-09-01 12:20:06 +02:00
Laurent Destailleur
160a35f63f Merge pull request #9335 from frederic34/patch-11 
Update blockedlog.lang
 2018-09-01 12:19:36 +02:00
Laurent Destailleur
bb22d5e083 Merge pull request #9341 from ptibogxiv/patch-50 
header/footer uniformization in ticket public page
 2018-09-01 12:19:18 +02:00
Laurent Destailleur
3b1cf41823 Fix eol 2018-09-01 12:17:52 +02:00
Laurent Destailleur
c7020d4243 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-01 12:11:13 +02:00
Laurent Destailleur
b863b5176d Merge pull request #9322 from grandoc/new_branch_29_08_2018 
New branch 29 08 2018
 2018-09-01 12:11:01 +02:00
Frédéric FRANCE
c30b1c274d Update config 2018-09-01 12:10:00 +02:00