Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
68,848 Commits 36 Branches 189 Tags
f8b0e535fae484348da17099e3747b0823ce52f6
Commit Graph

68848 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
5bab9d59b2 Fix var_dump 2018-09-02 14:19:23 +02:00
Laurent Destailleur
df721a5fbc Only min and max php version 2018-09-02 14:18:04 +02:00
Laurent Destailleur
37fb70d983 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2018-09-02 14:15:32 +02:00
Laurent Destailleur
02bedc49d3 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	test/phpunit/PricesTest.php
	test/phpunit/RestAPIUserTest.php
	test/phpunit/WebservicesInvoicesTest.php
 2018-09-02 14:15:17 +02:00
Laurent Destailleur
e41b55af13 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2018-09-02 14:10:28 +02:00
Laurent Destailleur
a69c3caf2c Prepare compatibility with phpunit 6.1 2018-09-02 14:10:06 +02:00
Laurent Destailleur
53caac13a9 Test phpunit 2018-09-02 13:57:51 +02:00
Laurent Destailleur
df26ae764e Fix typo 2018-09-01 17:56:52 +02:00
Laurent Destailleur
0bf967ab10 Fix setup 2018-09-01 17:50:13 +02:00
Laurent Destailleur
5f2eeb552a Fix setup of email 2018-09-01 17:48:35 +02:00
Laurent Destailleur
dfda029da4 FIX a removed option was still in setup 2018-09-01 17:44:07 +02:00
Laurent Destailleur
ada6d2c963 More logs 2018-09-01 17:27:14 +02:00
Laurent Destailleur
32baec1c9a Fix logs 2018-09-01 17:10:47 +02:00
Laurent Destailleur
c17233a409 More logs 2018-09-01 16:51:40 +02:00
Laurent Destailleur
d8fb18e6a9 Reduce travis test to min and max php only 2018-09-01 15:35:34 +02:00
Laurent Destailleur
fe7a0c894f Merge pull request #9368 from atm-ph/fix_7.0_search_company_by_code 
Fix search company by code
 2018-09-01 14:42:32 +02:00
Laurent Destailleur
945e925399 Update html.form.class.php 2018-09-01 14:41:44 +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
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
bb444c80d0 Merge pull request #9360 from frederic34/patch-18 
Update ldap.php
 2018-09-01 13:28:16 +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
dee9442720 Fix regression 2018-09-01 13:12:09 +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
179feebd80 Merge pull request #9347 from atm-greg/fix_getLabelOfUnit 
remove useless db begin
 2018-09-01 12:34:43 +02:00
Laurent Destailleur
ae36469166 FIX #9337 2018-09-01 12:28:36 +02:00
Laurent Destailleur
160a35f63f Merge pull request #9335 from frederic34/patch-11 
Update blockedlog.lang
 2018-09-01 12:19:36 +02:00
Frédéric FRANCE
c30b1c274d Update config 2018-09-01 12:10:00 +02:00
Laurent Destailleur
81c4e6a764 FIX Force stripe api version to avoid trouble if we update stripe api 
Conflicts:
	htdocs/stripe/config.php
 2018-09-01 12:03:44 +02:00
Laurent Destailleur
f0fc99ee4c FIX Force stripe api version to avoid trouble if we update stripe api 2018-09-01 12:01:01 +02:00
Frédéric FRANCE
66d64359cf FIX get_product_vat_for_country functions.lib.php 2018-08-31 20:23:26 +02:00
Laurent Destailleur
ca2e9f20f6 Fix missing extrafield table 2018-08-31 18:39:13 +02:00
Laurent Destailleur
6af8f8f475 Fix trans 2018-08-31 16:57:50 +02:00
Laurent Destailleur
b08971b03b FIX vat rate code not return by get_product_vat_for_country 2018-08-31 14:52:34 +02:00
atm-ph
102b698c76 Fix search company by code 2018-08-31 11:38:45 +02:00
Laurent Destailleur
07d5bd143a Fix entity 2018-08-31 11:26:53 +02:00
Laurent Destailleur
bdbe2c02ed Sample 2018-08-31 10:51:32 +02:00
Frédéric FRANCE
2eade6ea68 Update modSociete.class.php 2018-08-30 23:22:06 +02:00
Frédéric FRANCE
f61450ffa8 Update ldap.php 2018-08-30 23:04:32 +02:00
Frédéric FRANCE
9c44f80746 Update card.php 2018-08-30 23:03:03 +02:00
Laurent Destailleur
8dc208c961 Fix missing legal ids in source address 2018-08-30 19:19:43 +02:00
Laurent Destailleur
151d84405a FIX trans on null object 2018-08-30 17:01:49 +02:00
Laurent Destailleur
4d22c4f9f9 Typo 2018-08-30 11:37:06 +02:00
atm-greg
f8fef61075 remove useless db begin 2018-08-30 09:19:44 +02:00
Frédéric FRANCE
285e231ea1 Update blockedlog.lang 2018-08-29 23:08:13 +02:00
Laurent Destailleur
f146572b81 ident 2018-08-29 21:18:47 +02:00