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

94111 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
48a50f3b10 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php
 2021-04-27 01:58:19 +02:00
Laurent Destailleur
b3f8a6758e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-04-27 01:46:13 +02:00
Laurent Destailleur
804eac55e9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-04-27 01:46:04 +02:00
Laurent Destailleur
7a6edfd61f
Merge pull request #17295 from atm-gauthier/fix_adv_target_emailing_extrafields_link 
FIX : type link extrafield case for advanced target emailing
 2021-04-27 01:45:26 +02:00
Laurent Destailleur
e9b8e81773
Update advtargetemailing.class.php 2021-04-27 01:45:10 +02:00
Laurent Destailleur
5a6d3b7c88
Merge pull request #17372 from marc-dll/FIX_11.0_invoice__generation_after_paiement 
FIX: invoice PDF generation after payment
 2021-04-26 22:49:56 +02:00
Laurent Destailleur
f66c506011
Merge pull request #17381 from atm-lena/12.0_FormAttachOptions_AddHookParameters_Options 
Add parameter "option" to hook formattachOptions
 2021-04-26 21:00:12 +02:00
Laurent Destailleur
6c2d9d3b3c Fix permission to reopen invoice. 2021-04-25 13:17:47 +02:00
Laurent Destailleur
db6bcd180c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-04-24 18:52:41 +02:00
Laurent Destailleur
48c26fd614 Fix add option INVOICE_DISALLOW_REOPEN to lock problematic feature 2021-04-24 18:43:24 +02:00
atm-lena
3d3fb17da3 Add parameter "option" to hook formattachOptions 2021-04-23 15:41:43 +02:00
Marc de Lima Lucio
ce022ab36c FIX: payment validation: invoices PDF were no re-generated, make it with correct display options 2021-04-22 15:57:06 +02:00
Marc de Lima Lucio
ee96fb6470 FIX: payment creation: re-generate invoice PDF with correct display options 2021-04-22 15:56:12 +02:00
Laurent Destailleur
b00628118a
Merge pull request #17310 from OGPayet/fix/addMissingFromHookInFichinterList 
fix add missing printFieldListFrom hook in fichinter list
 2021-04-19 21:16:25 +02:00
Laurent Destailleur
28f0c6c7cf Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/stock/card.php
 2021-04-19 20:55:09 +02:00
Laurent Destailleur
e2d7e84072
Merge pull request #17326 from atm-greg/FIX_warehouse_label_edition 
fix warehouse label field edition
 2021-04-19 20:26:56 +02:00
atm-greg
74345c4f21 fix warehouse label field edition 2021-04-19 16:03:22 +02:00
Pierre Payet
a6c6f9eb08 add missing printFieldListFrom hook 2021-04-19 10:20:51 +02:00
stickler-ci
318a783237 Fixing style errors. 2021-04-19 07:19:45 +00:00
Gauthier PC portable 024
8c428081ab FIX : test on link type 2021-04-19 09:17:33 +02:00
Gauthier PC portable 024
ff8aae1209 Merge branch 'fix_adv_target_emailing_extrafields_link' of github.com:atm-gauthier/dolibarr into fix_adv_target_emailing_extrafields_link 2021-04-19 09:16:06 +02:00
Gauthier PC portable 024
5b6439ca5e FIX : cast int 2021-04-19 09:15:47 +02:00
Laurent Destailleur
60990dc0e6
Merge pull request #17278 from OGPayet/fix/addMissingGroupByHookInFichinterList 
fix add missing group by hook in fichinter list
 2021-04-16 20:41:39 +02:00
Laurent Destailleur
7ce8470788
Merge pull request #17288 from FHenry/fix_13_toomanytestmenu 
fix: remove double test
 2021-04-16 20:14:22 +02:00
Laurent Destailleur
af9c2384ef Add warning 2021-04-16 19:14:01 +02:00
stickler-ci
37f44f4a07 Fixing style errors. 2021-04-16 14:58:57 +00:00
Gauthier PC portable 024
f8fcf7c16b FIX : type link extrafield case for advanced target emailing 2021-04-16 16:55:19 +02:00
Florian HENRY
99b7deba14 Merge branch '13.0' of github.com:Dolibarr/dolibarr into fix_13_toomanytestmenu 2021-04-16 10:37:50 +02:00
Florian HENRY
0cd567f256 fix double test 2021-04-16 10:37:42 +02:00
Laurent Destailleur
38f54d0582 FIX Missing extrafields into export of agenda record 2021-04-16 10:26:35 +02:00
Laurent Destailleur
460d6a0589 Fix init pass 2021-04-15 11:57:53 +02:00
Laurent Destailleur
bc574a1849 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-04-15 11:52:41 +02:00
Laurent Destailleur
39d6ac3753 initdemopassword can use password_hash algorithm 2021-04-15 11:52:20 +02:00
Pierre Payet
377c730363 add missing group by hook in fichinter list 2021-04-14 21:27:53 +02:00
Laurent Destailleur
4dfc90f8cb
Merge pull request #17256 from OGPayet/fix/ComptaFactureDateClosingOptionPosition 
fix date closing option position
 2021-04-13 23:03:02 +02:00
Laurent Destailleur
fe57ba2116 Fix phpcs 2021-04-13 20:00:36 +02:00
Pierre Payet
75ed5e45f2 fix date closing option position 2021-04-13 17:21:51 +02:00
Laurent Destailleur
ce18d416e6
Merge pull request #17222 from aspangaro/13p31 
FIX Write right on document
 2021-04-13 16:18:48 +02:00
Laurent Destailleur
adbebac0fc
Merge pull request #17243 from frederic34/patch-3 
fix MAIN_ADD_PDF_BACKGROUND
 2021-04-13 15:41:20 +02:00
Laurent Destailleur
6b542a89f6
Merge pull request #17245 from Robin-Yann/13-fix-project-visibility-field 
FIX: project visibility field with two option
 2021-04-13 15:40:04 +02:00
Laurent Destailleur
ee07796131
Update card.php 2021-04-13 15:39:34 +02:00
Laurent Destailleur
de73c0adb2
Update card.php 2021-04-13 15:38:51 +02:00
Laurent Destailleur
0efe49e461
Merge pull request #17249 from Robin-Yann/13-fix-missing_param_settings 
FIX missing parameter in select for POP
 2021-04-13 15:19:14 +02:00
Laurent Destailleur
6b5091bb4a
Merge pull request #17244 from Robin-Yann/fix_13_addmissinghook 
fix: add missing hook
 2021-04-13 12:09:38 +02:00
Laurent Destailleur
41dc69e05a
Merge pull request #17250 from Robin-Yann/fix-societe-list-fournisseur 
FIX: mask selector fournisseur if module not activate
 2021-04-13 12:05:31 +02:00
Robin
dbd56bc03e FIX: mask selector fournisseur if module not activate 2021-04-13 11:00:28 +02:00
Robin
0839ee25cd FIX missing parameter in select for POP 
All options can be modified for selector in pop
 2021-04-13 10:44:14 +02:00
stickler-ci
6ab0de145b Fixing style errors. 2021-04-13 08:33:57 +00:00
Robin
d6caa057f2 FIX: project visibility field with two option 
If two option of disabled visibility are add on constant, combo is not display
 2021-04-13 10:23:05 +02:00
Frédéric FRANCE
d007e75a8e
Update pdf_eratosthene.modules.php 2021-04-13 09:55:04 +02:00