Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-16 06:21:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
94,477 Commits 36 Branches 190 Tags
026e4548258febf35c66351c8ff7cb1556db84e7
Commit Graph

22973 Commits

Author SHA1 Message Date
Laurent Destailleur
b7402ecf3f Merge branch 'develop' into NEW_product_customer_price_ref 2021-01-13 13:38:19 +01:00
Laurent Destailleur
015c5a028b Doxygen 2021-01-13 12:45:23 +01:00
Laurent Destailleur
93a2edd8d9 Fix property not used 2021-01-13 12:21:26 +01:00
Laurent Destailleur
3bed2c91c7 Fix version 2021-01-13 12:20:32 +01:00
stickler-ci
432d45b289 Fixing style errors. 2021-01-13 11:19:39 +00:00
Laurent Destailleur
1571b0496c Merge pull request #15794 from atm-gauthier/develop_new_workstation 
NEW : Workstations management
 2021-01-13 12:19:38 +01:00
Laurent Destailleur
1499998a99 Debug 2021-01-13 12:17:45 +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
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
1cc88794b5 merge from 12.0 because this bug comme from it 2021-01-12 21:48:34 +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
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
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
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
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
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
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
Laurent Destailleur
3906acc951 Must use the generic version 2021-01-12 10:00:05 +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
Laurent Destailleur
c2187b2ff1 Merge branch 'develop' into develop_new_workstation 2021-01-11 17:59:13 +01:00
Laurent Destailleur
cae9dc3acf Merge pull request #15925 from FHenry/dev_add_tag_contact_thirdpartycontactcreateion 
NEW : Add contact tag and bulk email status on thirparty+contact create form
 2021-01-11 17:28:12 +01:00
Laurent Destailleur
df3034d13a Merge branch 'develop' into patch-1 2021-01-11 17:15:46 +01:00
Laurent Destailleur
238fd5accb Merge pull request #15346 from ATM-Consulting/FIX_12.0_date_extrafields_are_not_filterable_on_lists 
NEW Can filter on extrafields date on lists
 2021-01-11 16:41:01 +01:00
Laurent Destailleur
307d718e82 Merge pull request #15931 from ATM-Nicolas/new_shipping_workflow 
NEW : Workflow to set a shipment as closed
 2021-01-11 16:34:26 +01:00
stickler-ci
f5fa7928ca Fixing style errors. 2021-01-11 15:29:33 +00:00
Laurent Destailleur
5ee97dfd4a Update mod_barcode_product_standard.php 2021-01-11 16:27:37 +01:00
Laurent Destailleur
9962c182c4 Merge pull request #15805 from FHenry/dev_exfields_of_lines_into_line_tr 
NEW : Extrafields of documents lines are inside the lines, not any more on separate TR
 2021-01-11 16:15:45 +01:00
Laurent Destailleur
f6de607889 Fix warning 2021-01-11 16:07:02 +01:00
Laurent Destailleur
9a5ae77615 Merge pull request #15926 from FHenry/develop 
fix : remove php warning on install pages
 2021-01-11 16:04:04 +01:00
Laurent Destailleur
ed00f6bfb9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-11 13:46:50 +01:00
Laurent Destailleur
f9f84f84ba Fix rounding of foreign amount 2021-01-11 13:46:23 +01:00
Laurent Destailleur
5bd59cd6d1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-11 13:37:59 +01:00
Laurent Destailleur
8debb58f7c Fix rounding of currency unit prices 2021-01-11 13:36:53 +01:00
Laurent Destailleur
5660159a6d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/bom/bom_card.php
 2021-01-11 13:13:26 +01:00
Laurent Destailleur
c10072ccef Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-11 13:07:31 +01:00
Gauthier PC portable 024
6668cfa311 FIX : name in copyrights 2021-01-11 11:40:04 +01:00
Gauthier PC portable 024
e3e4f0590c FIX : get and delete linked items with association tables methods created in common object 2021-01-11 11:36:19 +01:00
Gauthier PC portable 024
8dfb088fc5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_workstation 2021-01-11 10:34:38 +01:00
Florian HENRY
c7cddb19be fix stickler 2021-01-10 11:58:22 +01:00
Florian HENRY
2a3a73c831 Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into develop 2021-01-10 11:58:06 +01:00
Laurent Destailleur
f411b29b28 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/listbysubaccount.php
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/accountancy.lang
 2021-01-09 02:34:43 +01:00
Laurent Destailleur
b3461161ec Add option MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH 2021-01-09 02:28:50 +01:00
zuiko
bcff65c3d3 Update mod_barcode_product_standard.php 
get barcode type configuration for products only if $type not set
 2021-01-09 01:01:14 +01:00