Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
113,852 Commits 36 Branches 189 Tags
8e61f77f4df34b6789c2f3f0c2f5f9f0af7f901b
Commit Graph

11129 Commits

Author SHA1 Message Date
Florian
3091448d1a Expose bank account holder, label and number 
Useful for automated texts on invoices to have those values available as well.
 2021-09-16 15:40:25 +02:00
Laurent Destailleur
49ef24edcb Fix trans 2021-09-16 15:16:18 +02:00
Laurent Destailleur
b70764af88 Fix translation of ticket categories 2021-09-16 15:08:04 +02:00
Laurent Destailleur
e9a3cca609 Fix lang file 2021-09-16 14:50:38 +02:00
Laurent Destailleur
1177e86f2e Fix language of group of tickets 2021-09-16 14:46:14 +02:00
Laurent Destailleur
d9751704c8 Fix ambiguous field 2021-09-16 14:37:38 +02:00
Laurent Destailleur
086754e149 Fix translation of category codes 2021-09-16 14:31:20 +02:00
Laurent Destailleur
8909702619 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/bom/class/bom.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/product/class/productfournisseurprice.class.php
 2021-09-16 13:40:05 +02:00
lmarcouiller
04a024570c update fetchKnowledge and html.formticket 2021-09-16 13:19:43 +02:00
stickler-ci
9d3b680259 Fixing style errors. 2021-09-16 07:31:23 +00:00
antonin_tdj
8c1b3efc47 Avoir Error 19 Constraint Violation (in case of password unchanged) 2021-09-16 09:31:00 +02:00
Laurent Destailleur
aab8d4a628 css 2021-09-16 02:24:25 +02:00
antonin_tdj
2c73c19bd5 fix ldap passw bug with activedirectory 
Fix to avoid LDAP Error: 53 (Unwilling to perform) on Samba4 AD
 2021-09-15 18:26:32 +02:00
lmarcouiller
b26e9be36f Close #18677 : new show articles of KM 2021-09-15 15:36:57 +02:00
Laurent Destailleur
21462d0b82 Fix can reset filter in setup 2021-09-14 17:24:53 +02:00
Laurent Destailleur
bbacb4e740 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-13 02:45:00 +02:00
Laurent Destailleur
c005a20cc0 Fix ldap with ssl 2021-09-11 03:27:59 +02:00
Laurent Destailleur
f8b1e4d482 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-10 20:56:15 +02:00
Laurent Destailleur
edb1f31a19 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/expensereport/index.php
	htdocs/accountancy/supplier/index.php
 2021-09-10 20:55:52 +02:00
Laurent Destailleur
9dcf3e49d0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2021-09-10 20:50:34 +02:00
Laurent Destailleur
2f4463c983 FIX Collapsing of extrafields has disappeared. 2021-09-10 20:49:22 +02:00
Laurent Destailleur
3980e4a32b Merge pull request #18681 from FHenry/14_fix_extrafield_separator_type 
fix: show display/hide icon on extrafield type separator
 2021-09-10 19:49:26 +02:00
Laurent Destailleur
d50c518b70 Merge pull request #18676 from FHenry/14_fix_ajax_company_ambious_column 
fix: when COMPANY_SHOW_ADDRESS_SELECTLIST is 1 ajax call to company.php is broken
 2021-09-10 19:49:12 +02:00
Vincent Dieltiens
b3984798ba Add product-id and price-id in dataset of product select 2021-09-10 15:32:16 +02:00
Florian HENRY
f3a555ec69 fix: show display/hide icon on extrafield type separator 2021-09-10 15:17:09 +02:00
Christian Foellmann
29820f446d fix import of product desc without wrong linebreaks 2021-09-10 13:37:42 +02:00
Florian HENRY
c66181a00e fix: when COMPANY_SHOW_ADDRESS_SELECTLIST is 1 ajax call to company.php is broken 2021-09-10 13:25:40 +02:00
Christian Foellmann
e5192de9f2 fix import of product desc without wrong linebreaks 2021-09-10 11:36:08 +02:00
Laurent Destailleur
fa28621709 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/list.php
 2021-09-09 16:11:29 +02:00
Laurent Destailleur
402757bdfe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-09 14:41:51 +02:00
Laurent Destailleur
cbe08183ac Merge pull request #18648 from atm-gauthier/NEW_mass_delete_objects 
NEW : mass action delete, no more break if at least one object has child
 2021-09-09 14:38:49 +02:00
Laurent Destailleur
7eba2f6f39 Code comment 2021-09-09 14:32:59 +02:00
Laurent Destailleur
ac8dfb2dd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-09 04:41:55 +02:00
Laurent Destailleur
d42492c67b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/dolreceiptprinter.class.php
 2021-09-09 04:41:39 +02:00
Laurent Destailleur
6d7cb01951 Merge pull request #18645 from atm-adrien/FIX_add_token 
FIX : Add token to remove error when removing widget
 2021-09-09 04:31:03 +02:00
Laurent Destailleur
034c5651c8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/eventorganization/class/conferenceorbooth.class.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/public/eventorganization/attendee_subscription.php
 2021-09-08 22:13:35 +02:00
Laurent Destailleur
e0fa4e4b5c Fix phpcs 2021-09-08 21:19:01 +02:00
Laurent Destailleur
57a2ea3a53 Fix sql error 2021-09-08 19:49:24 +02:00
Laurent Destailleur
405beb77f5 Fix sql error 2021-09-08 19:45:55 +02:00
Laurent Destailleur
b92784c04b Fix autoselect of thirdparty 2021-09-07 23:38:33 +02:00
Laurent Destailleur
3cc888f4df Debug event module 2021-09-07 23:19:36 +02:00
Laurent Destailleur
3df005778c Debug event module 2021-09-07 19:48:32 +02:00
Gauthier PC portable 024
938092d67c NEW : when we delete several objects with massaction, if somes object has child we must see which objects are concerned and nevertheless delete objects which can be deleted 2021-09-07 16:46:48 +02:00
ksar
e26e6288c2 FIX #18591 : Remove double quotes of SQL Queries 
FIX #18591 : Remove double quotes of SQL Queries for postgresql compatibility
 2021-09-07 15:22:02 +02:00
Adrien Raze
948d2bc4e9 FIX : Add token when remove the last widget on home page 2021-09-07 14:43:37 +02:00
Laurent Destailleur
586e5c8b5b Can set sort order in the ->fields description array for foreign key 2021-09-07 14:10:26 +02:00
Laurent Destailleur
2d6b9a2a0a CSS 2021-09-06 03:26:27 +02:00
Laurent Destailleur
f288f36b71 NEW Can use textarea field into confirm popup. 
Reponsive
 2021-09-06 01:42:54 +02:00
Laurent Destailleur
ee066ad725 Cast sql var 2021-09-03 21:25:43 +02:00
Laurent Destailleur
77e9f15360 Work on #18448 2021-09-02 22:52:17 +02:00