Commit Graph

81180 Commits

Author SHA1 Message Date
ptibogxiv
9ac1add425 FIX amount or stripe account with currency 2019-08-27 12:46:28 +02:00
Laurent Destailleur
442793aa65 Merge pull request #11755 from jtraulle/stickler-ci
Add .stickler.yml config file
2019-08-27 12:39:50 +02:00
Laurent Destailleur
8a4ac2cb07 Merge pull request #11760 from atm-john/FIX_module_product_disabled
FIX: remove disabled product type from product list
2019-08-27 12:38:21 +02:00
Laurent Destailleur
31e99414b5 Prepare for php 8 2019-08-27 12:34:46 +02:00
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
Laurent Destailleur
c2c9e1d042 Fix warning 2019-08-27 12:15:29 +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é
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
047298cded Merge pull request #11511 from atm-florianm/9.0_FIX_dispatched-products-array-bug
9.0 fix dispatched products array bug
2019-08-26 23:58:40 +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
d7cc76b94a NEW purchase_prices API 2019-08-26 20:10:00 +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