lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
78,168 Commits 43 Branches 150 Tags 886 MiB
9ca85b8e19
Commit Graph

78168 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean Traullé
9ca85b8e19
Disabling coding style checks for Pull Requests 
Because coding style would have been checked by SticklerCI, we can safely skip this in Travis-CI when in Pull Request context.
It will increase build speed by about 50%.
 2019-08-27 09:30:42 +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
48d6583f1d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-27 03:42:52 +02:00
Laurent Destailleur
505a06ca3e Fix phpunit 2019-08-27 03:42:34 +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
855ebc298f Removed hound (not used) 2019-08-27 03:39:27 +02:00
Laurent Destailleur
01e2a181b8 Fix user not yet enrolled 2019-08-27 03:36:47 +02:00
Laurent Destailleur
0ae7be8fe6 Test sponsor github 2019-08-27 03:34:43 +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
784f5ec097 Fix bad name of hidden constant 2019-08-27 03:23:25 +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
965bd171eb Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-26 23:56:51 +02:00
Laurent Destailleur
513f224349 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-26 23:56:43 +02:00
Laurent Destailleur
c7f06fe50e Fix phpcs 2019-08-26 23:56:17 +02:00
Laurent Destailleur
e8bb84e803 NEW Add status of warehouse in tooltip of a warehouse. 2019-08-26 23:54:15 +02:00
Laurent Destailleur
db6b1b6ffb NEW Add status of warehouse in tooltip of a warehouse. 2019-08-26 23:44:20 +02:00
Laurent Destailleur
9e04eccf54 Fix syntax error 2019-08-26 23:28:06 +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
669301669d Add phpunit for FormTest 2019-08-26 22:48:45 +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
952e395943 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-08-26 22:34:51 +02:00
Laurent Destailleur
76bd9a09a6 FIX #11570 2019-08-26 22:34:41 +02:00
Jean Traullé
c08c3b5c9c
Enable fixer to auto-fix code style issues 2019-08-26 21:33:46 +02:00
ptibogxiv
ad38478fc6
Fix lang for "nature" in contact 2019-08-26 20:01:05 +02:00
Jean Traullé
7d8f86c614
Create .stickler.yml 2019-08-26 17:51:13 +02:00
Jean Traullé
8ea4d6e21d
Merge pull request #11 from Dolibarr/develop 
Merge from upstream
 2019-08-26 17:48:16 +02:00
Laurent Destailleur
7009f036a0
Merge pull request #11744 from andreubisquerra/master 
Control errors before validate invoice in TakePOS
 2019-08-26 17:24:03 +02:00
Laurent Destailleur
2ee864c905
Merge pull request #11738 from ptibogxiv/patch-238 
NEW email template for Takepos (sending invoice)
 2019-08-26 17:21:03 +02:00
Laurent Destailleur
7b5dc1390a
Merge pull request #11750 from jtraulle/project-funding-links 
Add project funding links
 2019-08-26 17:17:55 +02:00
Laurent Destailleur
79d6731936
Merge pull request #11717 from fbosman/patch-1 
NEW Add hidden option THIRDPARTY_PROPAGATE_EXTRAFIELDS_TO_ORDER to copy extrafields from third party to order
 2019-08-26 17:16:29 +02:00
Laurent Destailleur
f07d99ed9a
Merge pull request #11730 from atm-ph/fix_9.0_missing_hooks 
Fix wrong placement to print title and missing hook to print value
 2019-08-26 17:14:50 +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
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