Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
99,661 Commits 36 Branches 189 Tags
6d049f5c2e018603ec04219fa4586f544952ce60
Commit Graph

24418 Commits

Author SHA1 Message Date
Alexandre SPANGARO
0ef02880eb Fix: Fa-icon on movement 2021-01-26 08:54:21 +01:00
Alexandre SPANGARO
94d4f2da8e Missing language key & error translation 2021-01-26 05:14:01 +01:00
Laurent Destailleur
13378897a8 FIX Report by Ricardo Matias 
Conflicts:
	test/phpunit/SecurityTest.php
 2021-01-25 22:52:30 +01:00
Laurent Destailleur
6a12de741f FIX Report by Ricardo Matias 2021-01-25 22:46:09 +01:00
Laurent Destailleur
b4be97ec15 Draft code 2021-01-25 18:59:04 +01:00
Frédéric FRANCE
22522f5aa2 fix include 2021-01-25 17:06:25 +01:00
Laurent Destailleur
0861c639ae Fix sql injection 2021-01-25 12:40:52 +01:00
Laurent Destailleur
470cd5c682 Clean code 2021-01-25 12:39:44 +01:00
Laurent Destailleur
4b248263c8 Doxygen 2021-01-25 12:29:31 +01:00
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
lmarcouiller
cfcd51f291 style errors update 2021-01-22 17:03:39 +01:00
lmarcouiller
7685dee5f6 style changes 2021-01-22 16:59:34 +01:00
lmarcouiller
5a95cc16aa update clipboardcopypaste with jquery 2021-01-22 16:58:47 +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
lmarcouiller
76ce77f7ba stickler-ci edit 2021-01-22 09:13:04 +01:00
lmarcouiller
64d08544b2 move of function showValueWithCopyPasteButton in function.lib.php 2021-01-22 09:09:46 +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
lmarcouiller
60d6de86f1 change of line 1346 because miss remove 2021-01-21 14:31:18 +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
Frédéric FRANCE
e8c4db2188 Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-19 11:36:59 +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
lmarcouiller
afab5a977a dolgrap.class.php with frederic34 advices 2 2021-01-19 09:43:06 +01:00
lmarcouiller
d69e36c110 Merge branch 'develop#1' of github.com:Hystepik/dolibarr into develop#1 2021-01-19 09:11:29 +01:00
lmarcouiller
82b688a2b0 dolgrap.class.php with frederic34 advices 2021-01-19 09:10:15 +01:00