Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-23 09:51:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
104,562 Commits 36 Branches 190 Tags
c5f3f428672bbf27ffb51a410b58c03b664fae14
Commit Graph

25892 Commits

Author SHA1 Message Date
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
lmarcouiller
fd888be5e5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-01-19 09:05:08 +01:00
Gauthier PC portable 024
e2abbbcece Merge branch '12.0_new_payments_on_vat' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_vat_objects 2021-01-19 08:57:24 +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
Gauthier PC portable 024
2cfaf5fbd6 NEW : add real payments on vat objects 2021-01-18 17:08:17 +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
stickler-ci
fe01f35207 Fixing style errors. 2021-01-18 10:33:46 +00:00
lmarcouiller
383281e5f3 New update of funnel of prospection 2021-01-18 11:32:02 +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
Frédéric FRANCE
f71d803da8 Merge remote-tracking branch 'upstream/develop' into codesyntax 2021-01-17 20:21:05 +01:00
Laurent Destailleur
62300689f8 Fix look and feel v13 2021-01-17 15:59:04 +01:00