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

22829 Commits

Author SHA1 Message Date
Laurent Destailleur
0f5fc7353e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/index.php
	htdocs/admin/mailing.php
	htdocs/admin/paymentbybanktransfer.php
	htdocs/admin/prelevement.php
	htdocs/modulebuilder/template/admin/setup.php
 2021-01-24 15:29:53 +01:00
Laurent Destailleur
c5cda97c19 FIX Generation of aliases (main alias and alt alias into subdirs) 2021-01-24 14:34:29 +01:00
Laurent Destailleur
005292054d FIX Generation of aliases (main alias and alt alias into subdirs) 2021-01-24 14:31:29 +01:00
Laurent Destailleur
d9908efdef Code comment 2021-01-24 13:29:38 +01:00
Laurent Destailleur
15b818da30 Code comment 2021-01-24 13:27:52 +01:00
Laurent Destailleur
c5bbaffb50 Fix look and feel v13 2021-01-23 19:50:04 +01:00
Laurent Destailleur
452aea1d8b Fix bad test 2021-01-23 17:59:56 +01:00
Laurent Destailleur
dd69aed27b Fix error test 2021-01-23 17:49:08 +01:00
Laurent Destailleur
21e55d1542 NEW Can filter files in GED on status Shared/Not shared 2021-01-23 13:56:51 +01:00
Laurent Destailleur
8bd7ddee6b Clean code 2021-01-23 13:55:56 +01:00
Laurent Destailleur
791f5f3f62 Fix css 2021-01-23 13:50:06 +01:00
Laurent Destailleur
599d69b07c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-22 13:40:08 +01:00
Laurent Destailleur
e1b6f33894 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/card.php
	htdocs/contact/class/contact.class.php
	htdocs/langs/fr_FR/stocks.lang
	htdocs/modulebuilder/template/myobject_list.php
 2021-01-22 13:40:00 +01:00
Laurent Destailleur
d23e6646ed
Merge pull request #16030 from atm-adrien/FIX/Linked_extrafields_10.0 
FIX : Linked extrafields lists
 2021-01-22 13:35:56 +01:00
Laurent Destailleur
7982cab526 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/modules/contract/doc/pdf_strato.modules.php
	htdocs/ticket/card.php
 2021-01-21 18:34:55 +01:00
Laurent Destailleur
69479584ed Fix $ok is not used 2021-01-21 13:50:31 +01:00
Laurent Destailleur
8e5b971c49
Merge pull request #15918 from zuiko/patch-1 
Fix #15633: Product creation: EAN13 barcode automatic generation incompatible with EAN13 existing barcode scanning, unusable function.
 2021-01-21 13:33:47 +01:00
Laurent Destailleur
af438624a6
Update commonobject.class.php 2021-01-21 13:21:22 +01:00
Laurent Destailleur
0a55ba32f8
Merge branch 'develop' into FIX/Linked_extrafields_10.0 2021-01-21 13:20:34 +01:00
Adrien Raze
645685d16e FIX : Linked extrafields list 2021-01-20 18:39:18 +01:00
BlackMirror
640cf50b7f [FM] Fix 12.0 - duplicate label, probably mistaken for ref 2021-01-20 15:20:50 +01:00
Laurent Destailleur
113ef1a02b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/class/user.class.php
 2021-01-19 16:21:53 +01:00
Laurent Destailleur
fd65a2adc1 FIX #15955 2021-01-19 16:04:21 +01:00
Laurent Destailleur
0917b37bb9 FIX #15966 #15967 2021-01-19 15:20:35 +01:00
Laurent Destailleur
7cb8d5af55 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-19 12:25:28 +01:00
Laurent Destailleur
f54efca075 Clean code 2021-01-19 12:25:05 +01:00
stickler-ci
0cdd9f8640 Fixing style errors. 2021-01-19 10:43:03 +00:00
zuiko
21fac1ff7a
Update mod_barcode_product_standard.php 
Fix #15633: Product creation: EAN13 barcode automatic generation incompatible with EAN13 existing barcode scanning, unusable function.
#15918 
ok with @eldy
Avoid  sql call if no joker at the end of mask
Treat EAN13 in a more evolutive code form to prepare needs for other barcodes with key
 2021-01-19 11:40:53 +01:00
Laurent Destailleur
01996261dc
Merge pull request #15985 from frederic34/codesyntax 
code syntax
 2021-01-19 11:29:18 +01:00
Laurent Destailleur
7ad7ad9bb8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-19 10:43:31 +01:00
Laurent Destailleur
2c6d11e040 When creating invoice by mass action, message has link to invoice 2021-01-19 10:42:43 +01:00
Frédéric FRANCE
36eeef81bf
code syntax 2021-01-19 00:41:39 +01:00
Laurent Destailleur
6d251e6a43
Merge pull request #15963 from FHenry/13.0 
fix thirdparty list filter type_ent can be empty
 2021-01-18 19:21:58 +01:00
David Bensel
9813cb430a FIX: type 'sellist' not handled properly in showInputField and showOutputField 2021-01-18 19:14:12 +01:00
Laurent Destailleur
2baeec1537
Merge pull request #15964 from FHenry/12.0 
extrafeild selllist can be use with string fk
 2021-01-18 18:53:01 +01:00
Laurent Destailleur
7195a6880f
Merge pull request #15992 from atm-kevin/FIX/GETPOST_param_card_presend 
FIX : missing GETPOST parameters on card_presend.tpl.php
 2021-01-18 18:49:28 +01:00
David Bensel
85d63891d9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2021-01-18 17:33:22 +03:00
David Bensel
b777a0660c FIX: type 'sellist' not handled properly in showInputField and showOutputField 2021-01-18 17:31:49 +03:00
Laurent Destailleur
f95bf56c15 Fix translation 2021-01-18 15:24:50 +01:00
Laurent Destailleur
3ff720f8d0
Merge pull request #15999 from frederic34/boxdolibarrstat 
fix unknown variable
 2021-01-18 15:18:07 +01:00
Laurent Destailleur
5a4ab3d00e Fix look and feel v13 2021-01-18 12:07:40 +01:00
Laurent Destailleur
250b530b29 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
 2021-01-18 11:07:46 +01:00
Laurent Destailleur
c69631d646 Fix css for multiselect component that are fist hidden 2021-01-18 11:05:02 +01:00
Florian HENRY
58eeb7152b Merge branch '12.0' into 13.0 2021-01-18 09:19:05 +01:00
Florian HENRY
c4f8e81d5d better fix 2021-01-18 09:18:42 +01:00
Florian HENRY
1cd0f71c09 Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12.0 2021-01-18 09:12:29 +01:00
Florian HENRY
33a0cf078c better fix 2021-01-18 09:12:23 +01:00
Florian HENRY
014d3cc114 better fix 2021-01-18 09:08:54 +01:00
Florian HENRY
1eec6fbb8f Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0 2021-01-18 09:05:12 +01:00
Frédéric FRANCE
83b7e3c678
fix unknown variable 2021-01-18 08:01:18 +01:00