lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
94,625 Commits 43 Branches 150 Tags 886 MiB
803722e323
Commit Graph

94625 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maxime Kohlhaas
803722e323 Fix : we only want employee users for holidays 2021-08-04 14:48:10 +02:00
Laurent Destailleur
d822421e10 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/accountancy/tpl/export_journal.tpl.php
	htdocs/projet/tasks/time.php
 2021-08-02 18:31:26 +02:00
Laurent Destailleur
b725dd0309
Merge pull request #18186 from frederic34/patch-8 
fix variable
 2021-08-01 23:46:42 +02:00
Laurent Destailleur
a983dc7506
Merge pull request #18214 from FHenry/12_fix_css_form_confirmlist 
fix: since commit be62c2f7 selectlist from formconfirm were behind form confirm
 2021-08-01 14:53:08 +02:00
Laurent Destailleur
b77ec22590
Merge pull request #18278 from aspangaro/12p17 
FIX: Invoice - Missing button to reopen an abandoned situation invoice
 2021-07-31 12:19:26 +02:00
Laurent Destailleur
f4ed3941a7
Merge pull request #18287 from atm-maxime/12.0 
Fix right check on thirdparty set on ticket card
 2021-07-30 15:11:27 +02:00
Maxime Kohlhaas
12b2ba64eb Fix right check on thirdparty set on ticket card 2021-07-29 17:49:37 +02:00
Alexandre SPANGARO
262dd1600b FIX: Invoice - Missing button to reopen an abandoned situation invoice 2021-07-29 06:23:12 +02:00
Laurent Destailleur
03ac579b64
Merge pull request #18241 from FHenry/fix_numbertotext_ndf 
fix: expense report line, on update qty must/can be decimal
 2021-07-28 19:31:16 +02:00
Laurent Destailleur
20217806c6
Merge pull request #18227 from Hystepik/develop_v13#1 
Fix #18185 : Filter fk_stcomm fixed
 2021-07-28 19:11:04 +02:00
Laurent Destailleur
c9a46ab0cc
Merge pull request #18273 from aspangaro/12p17 
FIX: Accountancy - Debug Export Sage50 / CIEL Compta / CIEL Compta Evo (Format XIMPORT)
 2021-07-28 18:55:47 +02:00
Laurent Destailleur
bd731d9213
Merge pull request #18226 from FHenry/fix_addtimespend 
FIX: cannot add time spend when column ref is not displayed
 2021-07-28 17:38:04 +02:00
Alexandre SPANGARO
cd63ede35a Correctif date 2021-07-28 16:46:57 +02:00
Laurent Destailleur
97e829c7de
Merge pull request #18262 from aspangaro/12p17 
FIX: Accountancy - Debug Export Sage50 / CIEL Compta / CIEL Compta Evo (Format XIMPORT)
 2021-07-28 15:27:58 +02:00
Alexandre SPANGARO
7acebd28ca Add information 2021-07-28 14:08:53 +02:00
Alexandre SPANGARO
712f0b897d FIX: Accountancy - Debug Export Sage50 / CIEL Compta / CIEL Compta Evo (Format XIMPORT) 2021-07-28 12:02:45 +02:00
Laurent Destailleur
e8061df976
Merge pull request #18257 from frederic34/patch-13 
remove debug
 2021-07-28 11:11:03 +02:00
Frédéric FRANCE
42252abc07
remove debug 2021-07-28 10:14:57 +02:00
Florian HENRY
a7f55f4778 fix: Expense report line, on update qty can be decimal 2021-07-26 15:43:57 +02:00
lmarcouiller
b5dde982d5 Fix #18185 : for v13 2021-07-26 10:32:51 +02:00
Florian HENRY
a7cef1aa15 FIX: cannot add time spend when column ref is not displayed 2021-07-26 10:20:11 +02:00
Florian HENRY
e93a362a0d fix: since be62c2f7 commit selectlist from formconfirm were behind the form confirm 2021-07-23 18:33:18 +02:00
Frédéric FRANCE
922354f366
Update projects.php 2021-07-20 18:19:27 +02:00
Laurent Destailleur
34c31492cf
Merge pull request #18161 from FHenry/13_fix_barecode_externaluser 
fix: print barcode sould not be available for external user #18160
 2021-07-16 12:38:32 +02:00
Laurent Destailleur
98b2d4c16e
Merge pull request #18158 from ATM-Consulting/FIX_13.0_inconsistent_triggers_in_reception_line_class 
FIX 13.0: class CommandeFournisseurDispatch triggers
 2021-07-16 12:38:03 +02:00
Florian HENRY
c928de89c6 fix: print barcode sould not be available for external user 2021-07-16 10:41:06 +02:00
Florian Mortgat
180527d23a FIX 13.0: class CommandeFournisseurDispatch provides trigger for UPDATE but not for CREATE / DELETE 2021-07-16 10:10:57 +02:00
Laurent Destailleur
a3526a2649 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/actions_addupdatedelete.inc.php
 2021-07-14 14:46:05 +02:00
Laurent Destailleur
a773652c04 Fix phpcs 2021-07-14 14:37:07 +02:00
Laurent Destailleur
7281a51eff
Merge pull request #18148 from AlexisLaurier/fix/CommonObjectShowInputFieldCheckboxAndRadio 
fix showInputField checkbox and radio type
 2021-07-14 13:55:53 +02:00
Laurent Destailleur
90fa36b46a
Merge pull request #18145 from atm-gauthier/12.0_fix_method_exists 
FIX : method_exists needs object at first param
 2021-07-14 13:52:03 +02:00
Alexis LAURIER
cd5e1d603e fix showInputField checkbox and radio type 2021-07-14 12:02:03 +02:00
Gauthier PC portable 024
0fe46b53d8 FIX : method_exists needs object at first param 2021-07-13 15:18:40 +02:00
Laurent Destailleur
7a589921fe Fix #18142 2021-07-13 13:10:19 +02:00
Laurent Destailleur
df3d88570c Fix missing column in migration 2021-07-13 11:39:08 +02:00
Laurent Destailleur
d3f324c2d4 Try a better fix for #18105 2021-07-12 16:55:16 +02:00
Laurent Destailleur
a2de6c00a0 Prepare 13.0.4 2021-07-12 12:26:21 +02:00
Laurent Destailleur
5b6358d938 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-07-08 23:43:19 +02:00
Laurent Destailleur
2314c5dda2 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-07-08 23:41:16 +02:00
Laurent Destailleur
14f52f2871
Merge pull request #18118 from aspangaro/12p16 
FIX Problem of z-index with popup and top menu
 2021-07-08 23:40:18 +02:00
Laurent Destailleur
76037db0ef
Merge pull request #18117 from aspangaro/13p11 
FIX Accountancy - if we define a date start, automatic binding try to continue to solve old binding
 2021-07-08 23:37:38 +02:00
Alexandre SPANGARO
be62c2f7f4 FIX Problem of z-index with popup and top menu 2021-07-08 22:11:41 +02:00
Alexandre SPANGARO
cd215cda17 FIX Accountancy - if we define a date start, automatic binding try to solve old binding 2021-07-08 21:49:53 +02:00
Laurent Destailleur
c3bf4f4b7f
Merge pull request #18113 from aspangaro/13p10 
Fix: formconfim if type radio must be :checked to get correct value
 2021-07-08 17:35:27 +02:00
Laurent Destailleur
a44d646946 Fix to allow html content 2021-07-08 17:31:41 +02:00
Alexandre SPANGARO
eaa6987e8b Fix: formconfim if type radio must be :checked to get correct value 2021-07-08 17:15:03 +02:00
Laurent Destailleur
01e272fb8c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-07-07 14:40:55 +02:00
Laurent Destailleur
2f25079981 Fix CSRF token generation must be fast, can have low entropy. 2021-07-07 14:40:47 +02:00
Laurent Destailleur
6bafb09837
Merge pull request #18097 from ATM-Consulting/FIX_13.0_fatal_missing_require_once_ajax 
FIX 13.0 - fatal - missing inclusion of ajax.lib.php
 2021-07-06 18:52:33 +02:00
Florian Mortgat
9f7be989c2 FIX 13.0 - fatal - missing inclusion of ajax.lib.php for calling ajax_autocompleter() 2021-07-06 17:38:37 +02:00