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

81180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
9d2942bb88 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-08-26 16:41:14 +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
60b8982a74 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-08-26 16:39:39 +02:00
Laurent Destailleur
bdd57ecce7 Merge pull request #11727 from hregis/7.0_price 
FIX avoid sql error if fk_project is empty during update
 2019-08-26 16:38:57 +02:00
Laurent Destailleur
fc1381c056 Merge pull request #11739 from ptibogxiv/patch-239 
Fix display context for takepos in invoice/list.php
 2019-08-26 16:38:27 +02:00
Laurent Destailleur
11dbe80a7b Merge pull request #11740 from ptibogxiv/patch-240 
Fix context display with takepos societe/list.php
 2019-08-26 16:37:57 +02:00
Laurent Destailleur
bc5e5be3bf Merge pull request #11736 from ptibogxiv/patch-236 
NEW display membership in takepos if member link to thirdparty
 2019-08-26 16:37:25 +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
11acedbe59 Merge pull request #11735 from ptibogxiv/patch-235 
Fix load langs in takepos
 2019-08-26 16:35:42 +02:00
Laurent Destailleur
bf713e7477 Merge pull request #11725 from ptibogxiv/patch-229 
NEW update / delete stripe account for supplier
 2019-08-26 16:35:27 +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
7c986301d8 Merge pull request #11723 from schhub/patch-2 
Fix Delete action for documents backup.
 2019-08-26 16:34:05 +02:00
Laurent Destailleur
5c13f5d397 Update dolibarr_export.php 2019-08-26 16:33:38 +02:00
Laurent Destailleur
6771af4565 Update dolibarr_export.php 2019-08-26 16:33:22 +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
238970c069 Merge pull request #11734 from hregis/8.0_mc2 
FIX wrong parameters
 2019-08-26 16:28:39 +02:00
Laurent Destailleur
8a6c27379f Merge pull request #11737 from ptibogxiv/patch-237 
Fix lang in takepos
 2019-08-26 16:27:50 +02:00
Laurent Destailleur
6771a2e1f9 Update invoice.php 2019-08-26 16:27:00 +02:00
Laurent Destailleur
766d67e0b7 Merge pull request #11729 from ptibogxiv/patch-232 
Fix phpcs
 2019-08-26 16:24:35 +02:00
Laurent Destailleur
b21818a510 Merge pull request #11753 from aspangaro/10.0_p7 
FIX Missing div for buttons in tax, loan, various payment modules
 2019-08-26 16:24:10 +02:00
Laurent Destailleur
d08ed9fbcf FIX column jabberid missing 2019-08-26 16:19:39 +02:00
Laurent Destailleur
9e7796d495 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-26 16:09:57 +02:00
Laurent Destailleur
0c8640bfd9 FIX #11752 2019-08-26 16:09:20 +02:00
Laurent Destailleur
ebfeea4de7 Merge pull request #11751 from jtraulle/project-issues-templates 
Use distinct GitHub issue templates for Bugs and Feature requests
 2019-08-26 16:02:58 +02:00
Laurent Destailleur
56ee89c38d Merge pull request #11742 from ptibogxiv/patch-242 
Fix lang in societe/list.php
 2019-08-26 16:02:31 +02:00
Laurent Destailleur
7ebd79a45f Update list.php 2019-08-26 16:02:24 +02:00
Laurent Destailleur
be93cd839f Merge pull request #11748 from aspangaro/10.0_p6 
FIX #11746 Unable to modify amount of insurance of a loan
 2019-08-26 15:59:50 +02:00
Laurent Destailleur
dd53d3d4a1 Merge pull request #11749 from aspangaro/11.0_p1 
Fix travis
 2019-08-26 15:59:30 +02:00
Alexandre SPANGARO
76691925a4 FIX Missing div for buttons in tax, loan, various payment modules 2019-08-26 15:35:20 +02:00
Jean Traullé
69d3eed32b Merge branch 'develop' into project-issues-templates 2019-08-26 15:20:16 +02:00
Jean Traullé
bc14f3979d Fix CI 2019-08-26 15:19:51 +02:00
Jean Traullé
89639d8e43 Merge branch 'develop' into project-funding-links 2019-08-26 15:18:10 +02:00
Jean Traullé
bc7250dc92 Fix CI 2019-08-26 15:17:19 +02:00
Jean Traullé
92ea663266 Delete old issue template 2019-08-26 14:27:43 +02:00
Jean Traullé
af23f344ce Use distinct Github issue templates for Bugs and Feature requests 
This allow to have distinct placeholder texts and auto-assign labels (Bug or Feature request).
 2019-08-26 14:23:14 +02:00
Jean Traullé
e5f2b0c623 Add project funding links 2019-08-26 14:10:28 +02:00
Alexandre SPANGARO
20e2180de4 Fix travis 2019-08-26 13:54:46 +02:00
Alexandre SPANGARO
b00020c4ea FIX #11746 Unable to modify amount of insurance of a loan 2019-08-26 12:10:19 +02:00
Frans Bosman
23311abd6a Update card.php 2019-08-25 19:57:49 +02:00
Frans Bosman
a822a34a51 Update card.php 2019-08-25 19:54:42 +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
6328585395 Fix: the API_RESTRICT_ON_IP must be at lower level (also on explorer) 2019-08-25 16:40:21 +02:00
Laurent Destailleur
c8078f1195 Rename module_part parameter into modulepart into document APIs 2019-08-25 16:39:15 +02:00
Laurent Destailleur
6a906a6064 Rename module_part parameter into modulepart into document APIs 2019-08-25 16:38:09 +02:00
Laurent Destailleur
4040693823 FIX Use a SCA ready workflow with Stripe module 2019-08-24 18:12:20 +02:00
andreubisquerra
07244f002b else if to elseif 2019-08-24 18:11:47 +02:00