Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-14 05:21:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
81,180 Commits 36 Branches 190 Tags
0a125f73b5ae8ef858ec3a901b2f68045ddbb16c
Commit Graph

18639 Commits

Author SHA1 Message Date
Laurent Destailleur
69688a22e0 Merge 2019-08-27 12:33:42 +02:00
Laurent Destailleur
22719b90b6 Fix remove warning 2019-08-27 12:31:15 +02:00
Laurent Destailleur
36c936357c Add phpunit testDolStringIsGoodIso 2019-08-27 12:25:24 +02:00
John Botella
c2f570ae60 FIX: remove disabled product type from product list 2019-08-27 11:54:20 +02:00
Laurent Destailleur
20f61fb9be Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-27 11:43:07 +02:00
Laurent Destailleur
9fb06b1e7e Fix phpcs 2019-08-27 11:42:18 +02:00
Jean Traullé
dd1e7bbc3d Merge branch 'develop' into stickler-ci 2019-08-27 08:52:33 +02:00
Jean Traullé
0702ef4e0f Fix CI (code style) 2019-08-27 08:43:58 +02:00
Laurent Destailleur
b1479e5787 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-27 03:41:27 +02:00
Laurent Destailleur
63dcef710e Fix phpcs 2019-08-27 03:41:02 +02:00
Laurent Destailleur
a77c8023dc Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-27 03:23:59 +02:00
Laurent Destailleur
4fb36ce84d Fix phpcs 2019-08-27 03:22:58 +02:00
Laurent Destailleur
290766acaa Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-26 23:57:15 +02:00
Laurent Destailleur
783c69c618 Merge pull request #11756 from ptibogxiv/patch-245 
Fix lang for "nature" in contact
 2019-08-26 22:51:23 +02:00
Laurent Destailleur
4b5d9e44b2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-26 22:47:33 +02:00
Laurent Destailleur
45ff873064 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/core/class/html.form.class.php
 2019-08-26 22:44:49 +02:00
Laurent Destailleur
b6db04a727 Fix add missing filter on entity on stock listing for product combo 2019-08-26 22:42:04 +02:00
Laurent Destailleur
76bd9a09a6 FIX #11570 2019-08-26 22:34:41 +02:00
ptibogxiv
ad38478fc6 Fix lang for "nature" in contact 2019-08-26 20:01:05 +02:00
Laurent Destailleur
999db7ed41 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/salaries/card.php
	htdocs/compta/sociales/class/chargesociales.class.php
	htdocs/takepos/invoice.php
 2019-08-26 16:49:25 +02:00
Laurent Destailleur
7c5fc9f3f8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-26 16:43:33 +02:00
Laurent Destailleur
c93e6550ce Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/compta/sociales/class/chargesociales.class.php
 2019-08-26 16:43:24 +02:00
Laurent Destailleur
dcfbba9af5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/compta/sociales/class/chargesociales.class.php
 2019-08-26 16:41:06 +02:00
Laurent Destailleur
3e4433a6c5 Merge pull request #11731 from ptibogxiv/patch-233 
NEW birthdays member boxe
 2019-08-26 16:36:20 +02:00
Laurent Destailleur
2b8c57b714 Merge pull request #11724 from ptibogxiv/patch-228 
Fix stripelive_oauthcallback.php
 2019-08-26 16:34:40 +02:00
Laurent Destailleur
039a613ea1 Merge pull request #11728 from ptibogxiv/patch-231 
Fix stripetest_oauthcallback.php
 2019-08-26 16:29:00 +02:00
Laurent Destailleur
0c8640bfd9 FIX #11752 2019-08-26 16:09:20 +02:00
Laurent Destailleur
7cb68d6438 NEW Default for Stripe is STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION 2019-08-25 18:02:10 +02:00
Laurent Destailleur
60c3cefc53 FIX Api of documents work with value 'thirdparty' 2019-08-25 16:44:39 +02:00
Laurent Destailleur
69b2d03c47 FIX Api of documents work with value 'thirdparty' 2019-08-25 16:41:59 +02:00
Laurent Destailleur
4040693823 FIX Use a SCA ready workflow with Stripe module 2019-08-24 18:12:20 +02:00
Laurent Destailleur
1463302bdd Add option to disable the anonymous ping 2019-08-23 16:23:31 +02:00
ptibogxiv
c8cf06ed2f Update box_birthdays_members.php 2019-08-23 14:59:12 +02:00
ptibogxiv
30b929c621 Update modAdherent.class.php 2019-08-23 13:57:22 +02:00
ptibogxiv
73bcf3110d NEW birthday boxe for member 
use new function for displays the X next birthday by date ASC
 2019-08-23 13:56:04 +02:00
ptibogxiv
839ba76ae4 Update stripetest_oauthcallback.php 2019-08-23 08:58:08 +02:00
ptibogxiv
06fdd5ddbc Update stripelive_oauthcallback.php 2019-08-22 22:50:41 +02:00
ptibogxiv
0be59646a8 Update stripelive_oauthcallback.php 2019-08-22 22:00:53 +02:00
Laurent Destailleur
3339f89fc5 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/api/class/api_login.class.php
	htdocs/dav/fileserver.php
 2019-08-22 12:45:23 +02:00
Laurent Destailleur
27cd6cd308 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/product/fournisseurs.php
	htdocs/stripe/payment.php
 2019-08-22 12:39:07 +02:00
Laurent Destailleur
cdda08c0d3 FIX #11685 2019-08-22 11:47:03 +02:00
Laurent Destailleur
923eb935eb Revert "FIX for MAIN_MAXTABS_IN_CARD = $i card" 2019-08-22 11:28:49 +02:00
Laurent Destailleur
2bc0163354 Merge pull request #11685 from ptibogxiv/patch-224 
FIX for MAIN_MAXTABS_IN_CARD = $i card
 2019-08-22 11:25:08 +02:00
Regis Houssin
90f60b0137 FIX add $context parameter in checkLoginPassEntity 2019-08-22 10:56:07 +02:00
Laurent Destailleur
b06dab6930 Fix add option to restore backward compatibility 2019-08-22 00:44:28 +02:00
Laurent Destailleur
f5aede8256 NEW GeoIP v2 support is natively provided. 2019-08-21 19:38:45 +02:00
Laurent Destailleur
bfbabbf626 Update geoip v1 2019-08-21 18:26:41 +02:00
Laurent Destailleur
689aa4979e Code comment 2019-08-21 17:28:54 +02:00
Laurent Destailleur
eb0644c6f4 PSR-12 2019-08-21 13:00:22 +02:00
Laurent Destailleur
2c3b2cd1a0 Look and feel 2019-08-21 04:21:43 +02:00