lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
96,756 Commits 43 Branches 150 Tags 886 MiB
49faedae6f
Commit Graph

96756 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
8d65dff93d Fix missing param 2021-01-13 11:16:48 +01:00
Laurent Destailleur
db8ca42da2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-13 11:15:51 +01:00
Laurent Destailleur
ffc936fff3 Fix missing param 2021-01-13 11:15:30 +01:00
Alexandre SPANGARO
dae1794e3d FIX: Accountancy - Export Gestinum_v3 use facnumber for customer invoice 2021-01-13 11:08:33 +01:00
Frédéric FRANCE
e2c57584b7
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-12 23:47:24 +01:00
Frédéric FRANCE
dad329602a
Update html.formmail.class.php 2021-01-12 23:46:29 +01:00
Frédéric FRANCE
cf24fd5d85
code syntax 2021-01-12 23:30:59 +01:00
Florian HENRY
7e30812529 fix review 2021-01-12 22:01:53 +01:00
zuiko
f718a396d5
Update mod_barcode_product_standard.php 
$out .= $obj->libelle; //take the libelle corresponding to the type rowid in the database
Take the libelle instead the code for the litteral value of the barcode type rowid.
 2021-01-12 21:59:09 +01:00
Florian HENRY
3ddcc0efd3 revert stuff from 12.0 2021-01-12 21:50:02 +01:00
Florian HENRY
1cc88794b5 merge from 12.0 because this bug comme from it 2021-01-12 21:48:34 +01:00
Florian HENRY
78e3dd3fa8 Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12.0 2021-01-12 21:44:48 +01:00
Florian HENRY
34b792e9a2 betterfix 2021-01-12 21:44:18 +01:00
zuiko
364158c35b
Update mod_barcode_product_standard.php 
Blank line after comment removed...
 2021-01-12 21:24:55 +01:00
stickler-ci
14e3be630c Fixing style errors. 2021-01-12 20:16:34 +00:00
zuiko
ff06798660
Update mod_barcode_product_standard.php 
More evolving coding by testing the type of barcode in literal form.
Does not change deeply the #15918 correction principle in order to fix bug #15633.
 2021-01-12 21:14:43 +01:00
Laurent Destailleur
eb2faed656 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-12 21:06:20 +01:00
Laurent Destailleur
958b255822 Fix #15949 by introducing 'alphawithlgt' as GETPOST possible param. 2021-01-12 21:06:02 +01:00
Laurent Destailleur
a7c78c2f60
Merge pull request #15960 from seblu/fix_ldap_login 
Use login from LDAP attribute
 2021-01-12 20:59:46 +01:00
Laurent Destailleur
a72b33367a
Merge pull request #15957 from aspangaro/13b8 
FIX: Accountancy - Piece is a required field for FEC compatibility
 2021-01-12 20:57:20 +01:00
Laurent Destailleur
942016d0cd
Merge pull request #15956 from aspangaro/13b7 
FIX : Accountancy - FEC Export - Add trans & unaccent on journal label
 2021-01-12 20:56:11 +01:00
Laurent Destailleur
2b9ce6995f
Merge pull request #15951 from FHenry/12_fix_update_groupname 
fix: update group name
 2021-01-12 20:26:17 +01:00
Laurent Destailleur
3054fb4cd6
Merge pull request #15959 from FHenry/dev_fix_contact_bulk 
Dev fix contact bulk
 2021-01-12 20:25:26 +01:00
Florian HENRY
f30b303269 Merge branch '12.0' into 13.0 2021-01-12 17:45:54 +01:00
Florian HENRY
5b21702508 extrafeild selllist can be use with string fk 2021-01-12 17:44:22 +01:00
Florian HENRY
b1a78c6c18 fix thirdparty list filter type_ent empty 2021-01-12 17:18:41 +01:00
Marc de Lima Lucio
82b0f18378 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_product_customer_price_ref 2021-01-12 15:10:15 +01:00
Marc de Lima Lucio
759dd379d3 NEW: customer price customer ref: push back to v14 2021-01-12 14:43:09 +01:00
Laurent Destailleur
2e9f3b803d Add some hooks to add new buttons (compensation of removal of tabs). 
Signed-off-by: Laurent Destailleur <eldy@destailleur.fr>
 2021-01-12 13:59:20 +01:00
Laurent Destailleur
75323859e4 Add some hooks to add new buttons (compensation of removal of tabs). 2021-01-12 13:58:16 +01:00
Sébastien Luttringer
3f13dacacd Use login from LDAP attribute 
The LDAP authentication function (check_user_password_ldap) returns the login
sting when authentication is successful.

The current implementation always return the provided login to the check function,
instead of LDAP entry login field (as defined in the LDAP_FIELD_LOGIN).

This is problematic when you expect user to log with several login, like mail,
or the LDAP login doesn't match the dolibarr database.

For example, the following filter allows users auth with mail and cn ldap fields:
$dolibarr_main_auth_ldap_filter = '(&(objectClass=person)(|(cn=%1%)(mail=%1%)))';
but, dolibarr will not find the user when mail is provided.

This patch returns the $ldap->login when LDAP_FIELD_LOGIN is configured.
 2021-01-12 12:07:36 +01:00
Laurent Destailleur
fd35ef0a6f Fix travis 2021-01-12 10:45:15 +01:00
Laurent Destailleur
0d6ff51598 Move pgloader version 2021-01-12 10:40:53 +01:00
Laurent Destailleur
bad4b14ba5 Fix properties 2021-01-12 10:34:15 +01:00
Florian HENRY
98eff62aff Merge branch '13_backport' into dev_fix_contact_bulk 2021-01-12 10:25:18 +01:00
Florian HENRY
e34a797899 Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13_backport 2021-01-12 10:21:35 +01:00
Florian HENRY
d856b0149d Merge branch '13_backport' into develop 2021-01-12 10:08:12 +01:00
Florian HENRY
2be924d5d8 fix js bulkemail 2021-01-12 10:01:32 +01:00
Laurent Destailleur
3906acc951 Must use the generic version 2021-01-12 10:00:05 +01:00
Florian HENRY
7f90c88d6a fix js syntax 2021-01-12 09:51:39 +01:00
Florian HENRY
a689d2898e Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13_8fablab 2021-01-12 09:37:50 +01:00
Alexandre SPANGARO
19ac498f4e FIX: Accountancy - Piece is a required field for FEC compatibility 2021-01-12 06:03:57 +01:00
Alexandre SPANGARO
5d6ca5c636 FIX: Accountancy - Add translation when journal label data is record 2021-01-12 05:52:47 +01:00
Alexandre SPANGARO
20fba8f4d2 FIX : Accountancy - FEC Export - Add trans & unaccent on journal label 2021-01-12 05:46:24 +01:00
Laurent Destailleur
db69707579 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-11 20:53:31 +01:00
Laurent Destailleur
6e860efa44 CSS 2021-01-11 20:53:18 +01:00
Florian HENRY
33d7998a96 fix: date auto fill date paiement tax 2021-01-11 19:47:20 +01:00
Florian HENRY
e5ef455628 fix: date auto fill date paiement tax 2021-01-11 19:46:08 +01:00
Florian HENRY
77f213832e fix: update group name 2021-01-11 19:40:44 +01:00
Florian HENRY
21e1d5c8c9 Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13_8fablab 2021-01-11 18:07:10 +01:00