Commit Graph

6146 Commits

Author SHA1 Message Date
Laurent Destailleur
a5de93cf44 Validate the oauthstateanticsrf value. 2022-01-19 23:03:24 +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
d38784f45a WIP Login with Google 2022-01-19 20:33:20 +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
24de82859e Debug v15 2022-01-16 20:22:09 +01:00
Laurent Destailleur
372b583e50 Debug template of warehouse 2022-01-16 19:21:59 +01:00
Laurent Destailleur
744296a43a FIX Permission on holiday and expensereport. 2022-01-14 13:52:08 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
c3a42162d9 FIX The vat code was not correctly managed on PDF templates 2022-01-08 14:43:24 +01:00
Laurent Destailleur
60b2479389 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/action/list.php
2022-01-07 16:00:19 +01:00
Laurent Destailleur
7618966f81 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/comm/action/list.php
	htdocs/core/class/utils.class.php
	htdocs/install/mysql/data/llx_20_c_departements.sql
2022-01-07 15:56:21 +01:00
Laurent Destailleur
132d393d23 Code comment 2022-01-06 16:06:17 +01:00
Laurent Destailleur
d9715729c8 Fix var 2022-01-05 22:44:12 +01:00
Laurent Destailleur
0189d92139 Some country need qr code for legal issues. Add a hook to allow this. 2022-01-04 20:44:17 +01:00
Laurent Destailleur
1d80b8394a Debug v15 2022-01-04 12:56:08 +01:00
Laurent Destailleur
f8a97ef928 FIX a lot of problem with rules for password validation 2022-01-03 16:09:08 +01:00
Ferran Marcet
ff2388ceaf Fix: correctly display the products of a warehouse in the pdf 2022-01-03 13:08:20 +01:00
Laurent Destailleur
cecb11bb1c Debug v15 2022-01-03 12:28:42 +01:00
Laurent Destailleur
72998cd8fe Debug v15 2022-01-03 12:26:57 +01:00
Laurent Destailleur
f7871be6cd Debug v15 2022-01-03 03:06:18 +01:00
Laurent Destailleur
0037ee2254 Fix ckeditor plugins 2022-01-01 19:37:53 +01:00
Laurent Destailleur
9c50cfeb62 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modBom.class.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/modPropale.class.php
2021-12-30 19:18:41 +01:00
Laurent Destailleur
809c8f993b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/modPropale.class.php
	htdocs/filefunc.inc.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
2021-12-30 19:03:46 +01:00
Laurent Destailleur
108df3726a Fix php syntax 2021-12-30 18:46:26 +01:00
Laurent Destailleur
62a74ed428 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
	htdocs/societe/list.php
2021-12-30 17:57:45 +01:00
Laurent Destailleur
ebb7aa7494 Merge pull request #19693 from grandoc/new_branch_27_12_2021
fix : units were not displayed
2021-12-30 13:19:25 +01:00
John BOTELLA
0f587a37e2 fix missing var definition 2021-12-28 19:36:44 +01:00
Philippe GRAND
f8884d2c86 fix : units were not displayed 2021-12-27 15:00:05 +01:00
Laurent Destailleur
2de5db83a9 Fix iban_prefix 2021-12-21 14:51:57 +01:00
Laurent Destailleur
bb6bf2f743 Fix replacement of ICS on sepa mandate 2021-12-21 11:45:42 +01:00
Laurent Destailleur
8e4077eedf Fix ics on sepa mandate template 2021-12-21 11:25:19 +01:00
Ferran Marcet
2b7c3be511 Replace sql operator 2021-12-20 12:34:46 +01:00
lvessiller
68174cf440 FIX check stickler 2021-12-17 12:41:44 +01:00
lvessiller
5a2a6a07ea NEW add entity filter in exports 2021-12-17 12:38:13 +01:00
Laurent Destailleur
bef1afc7b8 Clean code 2021-12-16 17:01:15 +01:00
Laurent Destailleur
49853adf82 Fix pb with cache 2021-12-13 09:35:27 +01:00
Laurent Destailleur
2bc417fcf7 FIX parameter $action replaced with $mode. $action reserved for action 2021-12-11 13:22:43 +01:00
Laurent Destailleur
b5d1ea4629 FIX select too large into addrights (pb of missing parenthesis) 2021-12-09 11:07:38 +01:00
Laurent Destailleur
0e7d23e169 Fix constraint and loading on module activation. 2021-12-07 14:14:13 +01:00
Laurent Destailleur
10e126eb69 Clean code on pdf templates 2021-12-02 10:43:44 +01:00
Ferran Marcet
ac975ecc61 Undo changes 2021-11-30 13:30:17 +01:00
Laurent Destailleur
a7f9ffd5d0 Merge pull request #19461 from frederic34/lastactivationversion
keep info on latest activation version of module
2021-11-30 12:16:39 +01:00
Laurent Destailleur
962ac263ba Fix look and feel v15 2021-11-27 15:29:48 +01:00
Laurent Destailleur
734c9871ad Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2021-11-27 01:07:32 +01:00
Ferran Marcet
5265cd8084 Fix: correctly display the products of a warehouse in the pdf 2021-11-26 12:49:07 +01:00
Ferran Marcet
419eaa217f dejar igual que 13 2021-11-26 12:38:09 +01:00
Ferran Marcet
ad1d553d11 Merge branch '13.0up' into 13.0
# Conflicts:
#	htdocs/core/modules/modAdherent.class.php
#	htdocs/core/modules/modProduct.class.php
#	htdocs/core/modules/modProjet.class.php
#	htdocs/core/modules/modResource.class.php
#	htdocs/core/modules/modService.class.php
#	htdocs/core/modules/modSociete.class.php
#	htdocs/core/modules/modUser.class.php
2021-11-26 12:29:38 +01:00
Frédéric FRANCE
e6af0facdd keep info on latest activation version of module 2021-11-23 23:27:07 +01:00
Laurent Destailleur
c79fa4d3d0 NEW Add workflow action close purchase order on reception validation
NEW Add workflow action close purchase order on reception closing
2021-11-19 23:03:12 +01:00