2
0
forked from Wavyzz/dolibarr
Commit Graph

105798 Commits

Author SHA1 Message Date
atm-lena
2ea5da3e13 WIP 2022-01-25 17:16:21 +01:00
atm-lena
a5ab9e059a WIP : clean code 2022-01-25 16:25:53 +01:00
atm-lena
f0942a5ac6 WIP 2022-01-25 12:33:28 +01:00
atm-lena
d436d7af83 WIP 2022-01-24 18:23:26 +01:00
atm-lena
1f2f12717f WIP 2022-01-24 17:36:39 +01:00
atm-lena
1f591c20b1 MO Cosumption selectors auto : WIP 2022-01-24 15:19:47 +01:00
atm-lena
378473ca1f OF Consumption batch select : WIP 2022-01-21 12:21:47 +01:00
atm-lena
d5f0fe6c10 OF consumption batch select : wip 2022-01-21 10:55:06 +01:00
Laurent Destailleur
dfa2cab408 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/modules/oauth/google_oauthcallback.php
2022-01-19 23:04:05 +01:00
Laurent Destailleur
a5de93cf44 Validate the oauthstateanticsrf value. 2022-01-19 23:03:24 +01:00
Laurent Destailleur
4be8cb5ded Validate the oauthstateanticsrf value. 2022-01-19 23:01:50 +01:00
Laurent Destailleur
3ae63cb111 Clean code 2022-01-19 22:49:53 +01:00
Laurent Destailleur
b09cb42e25 Decode extra params of id_token 2022-01-19 22:26:31 +01:00
Laurent Destailleur
ee836305ba Fix state field 2022-01-19 20:51:53 +01:00
Laurent Destailleur
d38784f45a WIP Login with Google 2022-01-19 20:33:20 +01:00
Laurent Destailleur
ff1037634b Clean OAuth feature 2022-01-19 18:23:31 +01:00
Laurent Destailleur
4f533c3f9d Merge 2022-01-19 16:54:00 +01:00
Laurent Destailleur
d06f570c23 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-19 16:50:11 +01:00
Laurent Destailleur
db903ad64d Fix #yogosha8457 2022-01-19 16:40:48 +01:00
Laurent Destailleur
60b90056c4 Fix #yogosha8450 2022-01-19 15:20:10 +01:00
Laurent Destailleur
ed2ca6af79 CSS 2022-01-19 14:32:15 +01:00
Laurent Destailleur
49f0e2f765 Merge pull request #19521 from altairis-melina/displaysku
NEW : Show product reference in Takepos
2022-01-19 02:32:51 +01:00
Laurent Destailleur
eb3bce9759 Merge pull request #19527 from altairis-melina/nocategory
NEW : Add constant to hide categories in TakePos
2022-01-19 02:30:52 +01:00
Laurent Destailleur
6179d7a4e6 Merge pull request #19618 from altairis-melina/hookproduct
Add Hooks for takepos ajax search
2022-01-19 02:30:09 +01:00
Laurent Destailleur
659372aa9e Merge pull request #19645 from FHenry/dev_addOAuthWordPress
NEW: add WordPress OAuth
2022-01-19 02:26:54 +01:00
Laurent Destailleur
63d6ef1ba0 Merge pull request #19647 from OPEN-DSI/new-exports-entity-filters
NEW add entity filter in exports
2022-01-19 02:26:18 +01:00
Laurent Destailleur
3310f3ffa5 Merge pull request #19758 from FHenry/new_product_ref_for_bom
NEW: Display product ref in "Object link" product tab for BOM
2022-01-19 02:12:06 +01:00
Laurent Destailleur
595bfa3f7b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-19 02:03:00 +01:00
Laurent Destailleur
c2c74f4849 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-19 02:02:52 +01:00
Laurent Destailleur
fc7e8ed720 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-19 02:02:03 +01:00
Laurent Destailleur
c469634101 Fix hook for emailcollector 2022-01-19 02:01:52 +01:00
Laurent Destailleur
499dd859ee Merge pull request #19853 from atm-maxime/new_hook_main_area
New hook printMainArea
2022-01-19 01:57:39 +01:00
Laurent Destailleur
b88da24ba4 Merge pull request #19850 from ptibogxiv/patch-459
Fix stripe SetupIntent
2022-01-19 01:49:53 +01:00
Laurent Destailleur
f4cdcf93bb Merge pull request #19864 from Dolibarr/snyk-fix-62ffe24e6f5c18ab2cad0bc251d4e52a
[Snyk] Security upgrade node-fetch from 2.6.7 to 3.1.1
2022-01-19 01:16:44 +01:00
Laurent Destailleur
7bc0f44e7c Merge pull request #19870 from fappels/15_fix_dispatchProduct
FIX: origin missing for supplier order dispatchProduct
2022-01-19 01:07:05 +01:00
Laurent Destailleur
ede465e78e Merge pull request #19871 from OPEN-DSI/new-const-search-cat-or-default
NEW MAIN_SEARCH_CAT_OR_BY_DEFAULT const for search by category
2022-01-19 01:06:32 +01:00
Laurent Destailleur
bd1864fcd1 Merge pull request #19873 from bb2a/patch-1
Fix - User triger
2022-01-19 01:04:56 +01:00
Laurent Destailleur
0f03f5c57f Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-18 20:15:23 +01:00
Anthony Berton
f093e01cec Update 14.0.0-15.0.0.sql 2022-01-18 19:34:18 +01:00
Anthony Berton
16ca2d68b6 Update llx_c_action_trigger.sql 2022-01-18 19:31:51 +01:00
Laurent Destailleur
3eff894da1 Fix css 2022-01-18 19:27:06 +01:00
Laurent Destailleur
f2760cded6 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-18 19:22:43 +01:00
Laurent Destailleur
b3a8b56625 Fix typo 2022-01-18 19:01:51 +01:00
Laurent Destailleur
178f7b0ace CSS 2022-01-18 18:59:03 +01:00
lvessiller
6a9c9cc81a NEW MAIN_SEARCH_CAT_OR_BY_DEFAULT const for search by category 2022-01-18 16:36:50 +01:00
Francis Appels
d4adeba1fc FIX: origin missing for supplier order dispatchProduct 2022-01-18 16:22:41 +01:00
Laurent Destailleur
3757d7e952 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	.travis.yml
2022-01-18 16:11:48 +01:00
Laurent Destailleur
200f796232 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-18 16:08:54 +01:00
Laurent Destailleur
75eb256589 Fix perm to delete a draft supplier order 2022-01-18 16:06:27 +01:00
Laurent Destailleur
01aa2deae6 Fix bad include 2022-01-18 15:27:43 +01:00