lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
101,425 Commits 43 Branches 150 Tags 886 MiB
9dcf3e49d0
Commit Graph

101425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
5d512243b8
Merge pull request #18683 from FHenry/14_fix_search_evt_tab 
fix: on Event tabs, if no evt type use in filter, filter on label and state not apply
 2021-09-10 19:57:12 +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
Laurent Destailleur
78ec200c73
Merge pull request #18679 from FHenry/14_fix_cat_icon_perms 
fix: do not display icon to edit/delete tags if user not authorize
 2021-09-10 19:45:23 +02:00
Laurent Destailleur
fe92c2605d Fix look and feel v14 2021-09-10 17:45:27 +02:00
Laurent Destailleur
75cd63a29b Fix css and missing test 2021-09-10 17:39:58 +02:00
Florian HENRY
257686c2fe fix: on Event tabs, if no evt type use in filter, filter on label and state not apply 2021-09-10 15:45:03 +02:00
Florian HENRY
f3a555ec69 fix: show display/hide icon on extrafield type separator 2021-09-10 15:17:09 +02:00
Florian HENRY
962bda810c Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_fix_cat_icon_perms 2021-09-10 15:00:54 +02:00
Christian Foellmann
29820f446d fix import of product desc without wrong linebreaks 2021-09-10 13:37:42 +02:00
Florian HENRY
ef888d5fca Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_fix_ajax_company_ambious_column 2021-09-10 13:26:05 +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
Laurent Destailleur
4939cc9911 Fix trans 2021-09-10 11:04:59 +02:00
Laurent Destailleur
7526cb3b8b Fix VAT rate label and add Mali default vat rate 2021-09-10 09:44:06 +02:00
Laurent Destailleur
6465e8aa36 Include ref into label of log history 2021-09-09 19:47:51 +02:00
Laurent Destailleur
b8b5b97d78 Code comment 2021-09-09 19:47:15 +02:00
Laurent Destailleur
520ce4c3ac Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-09 19:21:45 +02:00
Laurent Destailleur
ffd7f60830 FIX #18589 #18617 2021-09-09 19:21:32 +02:00
Laurent Destailleur
647fa49202
Merge pull request #18667 from lainwir3d/fix_order_shipment_list_duplicates 
FIX #18666 Order / Shipment list: Don't SQL JOIN category table when not necessary.
 2021-09-09 18:59:28 +02:00
lainwir3d
63abe2f1ff FIX #18666 Order / Shipment list: Don't SQL JOIN category table when not necessary. 2021-09-09 19:56:28 +04:00
Florian HENRY
45ad23206a fix: do not display icon to edit/delete tags if not perms 2021-09-09 17:41:40 +02:00
Laurent Destailleur
a80950b96d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-09 16:06:28 +02:00
Laurent Destailleur
5406e3d34e Fix phpcs 2021-09-09 16:06:16 +02:00
Laurent Destailleur
de005f5cd2
Merge pull request #18661 from Hystepik/develop_v14#4 
Fix #18660 : fix rights of supplier order with API
 2021-09-09 15:18:17 +02:00
Laurent Destailleur
5d5b7c3af4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/peruser.php
	htdocs/main.inc.php
 2021-09-09 15:15:26 +02:00
Laurent Destailleur
30894b989c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-09-09 15:12:16 +02:00
Laurent Destailleur
70f22f2648 # WARNING: head commit changed in the meantime 
Merge
 2021-09-09 15:12:02 +02:00
Laurent Destailleur
654bf4d672 Fix name of index #18623 2021-09-09 15:07:55 +02:00
Laurent Destailleur
4d5621ea6f Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-09 14:59:12 +02:00
Laurent Destailleur
f1758b6f0c
Merge pull request #18623 from atm-gauthier/14.0_fix_salary_extrafields 
14.0 fix salary extrafields are no more available
 2021-09-09 14:58:54 +02:00
Laurent Destailleur
1a8364adcc
Merge pull request #18637 from hregis/fix_multicompany 
FIX multicompany transverse mode compatibility
 2021-09-09 14:50:22 +02:00
lmarcouiller
4928d03c4f update to have modify ! to empty() 2021-09-09 14:44:17 +02:00
fr69400
ad0c4c518f Update row.php 
right write doesn't exist for supplier_proposal

->line order dont works
 2021-09-09 14:42:43 +02:00
lmarcouiller
8af6b8679e update with fournisseur && supplier_order 2021-09-09 14:40:39 +02:00
Laurent Destailleur
70eed40146
Merge pull request #18659 from Hystepik/develop_v14#3 
Fix : reception list sql error
 2021-09-09 14:17:10 +02:00
lmarcouiller
022f3e640d Fix #18660 : fix rights of supplier order with API 2021-09-09 13:28:30 +02:00
lmarcouiller
d451703bbf Fix : reception list sql error 2021-09-09 11:21:34 +02:00
Regis Houssin
303b0e7f31 FIX better sql request 2021-09-09 09:21:30 +02:00
Laurent Destailleur
e5b71a1a89
Merge pull request #18598 from henrynopo/patch-2 
Increase the width of column for General Set-ups - Update dolibarr.php
 2021-09-09 05:12:06 +02:00
Laurent Destailleur
de97b248f2
Update dolibarr.php 2021-09-09 05:11:56 +02:00
Laurent Destailleur
ea9a07fb3d
Update dolibarr.php 2021-09-09 05:11:31 +02:00
Laurent Destailleur
a4d897f609
Merge pull request #18625 from jyhere/patch-1 
Fix : unable to create a direct debit if ics_transfer is empty
 2021-09-09 05:04:06 +02:00
Laurent Destailleur
adf4c94f45
Merge pull request #18631 from hregis/fix_maxlength_of_input 
FIX increase maxlength of password input
 2021-09-09 05:00:03 +02:00
Laurent Destailleur
9fe9d0e9bf
Merge pull request #18630 from hregis/fix_wrong_table_element_line 
FIX wrong table_element_line
 2021-09-09 04:59:27 +02:00
Laurent Destailleur
3c215730db
Merge pull request #18639 from Hystepik/develop_v14#1 
Fix #18633 : fix error message
 2021-09-09 04:56:54 +02:00
Laurent Destailleur
77b8d91895
Update 13.0.0-14.0.0.sql 2021-09-09 04:56:25 +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