Commit Graph

84774 Commits

Author SHA1 Message Date
Scrutinizer Auto-Fixer
e8083e2a65 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-23 14:54:02 +00:00
Laurent Destailleur
0905b3a6b2 Fix function not found 2020-03-23 15:46:16 +01:00
Laurent Destailleur
716777f364 Fix scrutinizer errors 2020-03-23 15:43:41 +01:00
Laurent Destailleur
01e60562b9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/commande/index.php
	htdocs/takepos/takepos.php
2020-03-23 15:38:10 +01:00
Laurent Destailleur
db6cb2d449 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-23 15:34:03 +01:00
Laurent Destailleur
24dc202022 Doc 2020-03-23 15:33:52 +01:00
Laurent Destailleur
1e955a89ef FIX #13399 after #13285 and #13183 2020-03-23 15:28:18 +01:00
Laurent Destailleur
0dbc37667c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-03-23 15:25:42 +01:00
Laurent Destailleur
ca4b641094 FIX #13407 2020-03-23 15:24:29 +01:00
Laurent Destailleur
e4a9763f54
Merge pull request #13405 from aspangaro/12.0_a25
Qual: Move supplier proposal menu to the core
2020-03-23 15:17:10 +01:00
Laurent Destailleur
55dd3ae0ae
Merge pull request #13403 from andreubisquerra/11.0
Fix TakePOS DirectPayment when place is higher 0
2020-03-23 15:13:35 +01:00
Laurent Destailleur
aab3ca4fa1
Merge pull request #13402 from andreubisquerra/develop
Fix TakePOS DirectPayment when place is higher 0
2020-03-23 15:12:38 +01:00
Laurent Destailleur
d662bb97dc Debug parallel sale feature 2020-03-23 15:02:15 +01:00
Laurent Destailleur
d965aad6e6 Some fix to support correctly parallel sales 2020-03-23 14:31:59 +01:00
Laurent Destailleur
2177afecd9 Sort order 2020-03-23 14:12:48 +01:00
Alexandre SPANGARO
89de39f199 Move supplier proposal menu to the core 2020-03-23 08:51:38 +01:00
andreubisquerra
fbe6711353
Fix TakePOS DirectPayment when place is higher 0 2020-03-22 22:46:40 +01:00
andreubisquerra
618da0a808
Fix TakePOS DirectPayment when place is higher 0 2020-03-22 22:39:41 +01:00
Laurent Destailleur
94b6fbb223 FIX #13300 2020-03-22 20:52:00 +01:00
Laurent Destailleur
26e9500c26 FIX #13300 2020-03-22 20:50:50 +01:00
Laurent Destailleur
b3e87e89b7 Add more excluding tags 2020-03-22 20:35:47 +01:00
Laurent Destailleur
f20e0efe06 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-22 20:22:41 +01:00
Laurent Destailleur
c80c247a84 Fix phpcs 2020-03-22 20:22:33 +01:00
Laurent Destailleur
3eaed6bfc8 Fix phpcs 2020-03-22 20:22:08 +01:00
Laurent Destailleur
4b3d2bfb64
Merge pull request #13398 from andreubisquerra/master
NEW: Multiple sales in TakePOS
2020-03-22 20:19:40 +01:00
glu000
61deab41f9 Fix #13394 2020-03-22 20:17:52 +01:00
Laurent Destailleur
1cb598290a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-22 20:17:10 +01:00
Laurent Destailleur
cd0b0111e1
Merge pull request #13395 from glu000/develop
Fix #13394
2020-03-22 20:16:59 +01:00
Laurent Destailleur
1fdef022f0 css 2020-03-22 20:16:14 +01:00
Laurent Destailleur
cafe898b6a
Merge pull request #13392 from andreubisquerra/develop
Remove vars to avoid conficts in TakePOS setup
2020-03-22 19:49:38 +01:00
Laurent Destailleur
226f4695cd Fix migration of type of field 2020-03-22 19:48:53 +01:00
Laurent Destailleur
8313ed9ee4
Merge pull request #13388 from OPEN-DSI/new-type-category-from-hook
NEW add category type from hook
2020-03-22 19:45:31 +01:00
Laurent Destailleur
6f3cbe69e8 Fix phpcs 2020-03-22 19:40:58 +01:00
Laurent Destailleur
700e384639 WIP Edit fields into alternate language 2020-03-22 19:11:21 +01:00
Laurent Destailleur
b0f3fba71a Fix phpcs 2020-03-22 18:27:56 +01:00
Laurent Destailleur
5df690f9bb Fix phpcs 2020-03-22 17:29:15 +01:00
Laurent Destailleur
3d6849dfea Fix label of tabs 2020-03-22 17:27:08 +01:00
Laurent Destailleur
ce47351b76 Trans 2020-03-22 17:11:58 +01:00
Laurent Destailleur
7145754376 Can set different warehous, lot during production 2020-03-22 17:06:59 +01:00
andreubisquerra
40e5e7a46b
Travis fixes 2020-03-22 15:24:32 +01:00
jove@bisquerra.com
a2b973f9f7 NEW: Multiple sales in TakePOS 2020-03-22 14:50:09 +01:00
Laurent Destailleur
425d2afc4b Rename js into js.php. Fix some labels 2020-03-22 12:31:27 +01:00
Laurent Destailleur
23e06debb7 Popup is smaller 2020-03-22 11:52:02 +01:00
Laurent Destailleur
9f583226f9 FIX var $ismutientitymanaged must be public not protected 2020-03-22 11:45:40 +01:00
Laurent Destailleur
bcf17c79ef FIX closing tags 2020-03-22 02:44:00 +01:00
Laurent Destailleur
a0dfbaaea8 Fix: Clean header an non https redirect to avoid to have cookie session
ID in non https answers.
2020-03-22 02:16:33 +01:00
Laurent Destailleur
ba8ece525d NEW If $dolibarr_main_force_https is set, the flag 'secure' on session
cookie is also set.
2020-03-22 01:59:32 +01:00
Laurent Destailleur
c8b05036a4 Prepare notif using the notif table 2020-03-22 01:24:50 +01:00
Laurent Destailleur
e2acb0c65e code indent 2020-03-21 19:37:09 +01:00
Laurent Destailleur
198914f91d Rename file 2020-03-21 19:20:33 +01:00