Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 00:52:01 +01:00
Code Issues Packages Projects Releases Wiki Activity
94,154 Commits 39 Branches 191 Tags
2d7ecb8a449e767af645e6fcb8f74bb1e493667f
Commit Graph

94154 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
2d7ecb8a44 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/boxes/box_produits_alerte_stock.php
 2021-05-03 18:57:52 +02:00
Laurent Destailleur
5348f13a60 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-04-28 20:47:43 +02:00
Laurent Destailleur
95ecb95ff1 FIX dol_print_date for %a and %b with some timezone 2021-04-28 20:47:28 +02:00
Laurent Destailleur
92fb9fc6b9 Merge pull request #17418 from SylvainLegrand/13.0 
v13.0 Error 500 on propal card when we change the deadline
 2021-04-28 15:07:59 +02:00
Laurent Destailleur
6dcee425a1 Update card.php 2021-04-28 15:07:31 +02:00
Sylvain Legrand
39507e9a41 Merge pull request #1 from SylvainLegrand/Deadline-error-on-propal 
Error 500 on propal card when we change the deadline
 2021-04-28 12:01:29 +02:00
Sylvain Legrand
18d2bef8f3 Error 500 on propal card when we change the deadline 
if we don't use the automatic generation for PDF documents (MAIN_DISABLE_PDF_AUTOUPDATE is set to 1) when we change the deadline on a proposal we get an error 500.
 2021-04-28 11:58:34 +02:00
Laurent Destailleur
0037da1a56 FIX selection of project for reception must use 
PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS
 2021-04-27 23:29:53 +02:00
Laurent Destailleur
0a871546ee Merge pull request #17379 from atm-adrien/FIX_add_function_price2num_to_productAlertStock_box_12.0 
FIX : Add function price2num for rounding values in productAlertStock…
 2021-04-27 18:45:26 +02:00
Adrien Raze
e8c2085abd FIX : Change parameters MF to MS for price2num() function 2021-04-27 09:24:22 +02:00
Laurent Destailleur
0a0b3f414a Fix phpcs 2021-04-27 02:54:33 +02:00
Laurent Destailleur
f57b38ae59 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-04-27 02:16:44 +02:00
Laurent Destailleur
ea19747bc6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-04-27 02:16:16 +02:00
Laurent Destailleur
2e9cf8d00b Fix phpcs 2021-04-27 02:15:58 +02:00
Laurent Destailleur
407ed9e40a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-04-27 02:11:36 +02:00
Laurent Destailleur
9513f25a36 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-04-27 02:11:11 +02:00
Laurent Destailleur
c7f38c4cf0 Fix bad var 2021-04-27 02:10:52 +02:00
Laurent Destailleur
098582d7a7 Fix bad merge 2021-04-27 02:09:43 +02:00
Laurent Destailleur
27aa7cdb48 Fix bad merge 2021-04-27 02:08:36 +02:00
Laurent Destailleur
12a4bc64ad Remove $_REQUEST 2021-04-27 02:01:46 +02:00
Laurent Destailleur
ea040a423f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-04-27 01:58:30 +02:00
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
e026b92a99 Merge pull request #17354 from aspangaro/13p9 
FIX Accountancy - Quadra export - wrong data on credit
 2021-04-27 01:32:45 +02:00
Laurent Destailleur
32970b78ee Merge pull request #17359 from FHenry/13.0 
fix: add some .gitignore for module builder template
 2021-04-27 01:30:43 +02:00
Laurent Destailleur
5f4fe20756 Merge pull request #17371 from ksar-ksar/13.0 
FIX #17363
 2021-04-26 23:39:52 +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
3d287dcd89 Merge pull request #17376 from indelog/fix_emptymail_adhnewpubform 
Fix : empty email on public membership form
 2021-04-26 21:22:43 +02:00
Laurent Destailleur
a24da7274b Merge pull request #17399 from atm-jpb/fix_variant_default_vat_code 
fix the productCombination class on updatePrice
 2021-04-26 21:01:06 +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
stickler-ci
a8136a00b1 Fixing style errors. 2021-04-26 15:07:41 +00:00
jpb
8d07b43ccd space stickler 2021-04-26 17:05:21 +02:00
jpb
09d68dd7a6 fix the productCombination class on updatePrice 2021-04-26 17:00:53 +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
Florian HENRY
bc924ca00e .gitignre 2021-04-24 18:27:43 +02:00
Florian HENRY
e229348e2c .gitignre 2021-04-24 18:24:25 +02:00
Florian HENRY
8b49585b64 fix: return invoice id when create from order 2021-04-24 18:21:36 +02:00
atm-lena
3d3fb17da3 Add parameter "option" to hook formattachOptions 2021-04-23 15:41:43 +02:00
Adrien Raze
c5775cc902 FIX : Add parameter to function price2num() 2021-04-23 12:31:45 +02:00
Adrien Raze
2ab17c44e9 FIX : Add function price2num for rounding values in productAlertStock box 2021-04-23 11:11:47 +02:00
stickler-ci
e7a4699bd9 Fixing style errors. 2021-04-22 17:26:46 +00:00
Indelog
196ebbb8e8 Fix : empty email on public membership form 
We can validate the public membership form whith an empty email when
`$conf->global->ADHERENT_MAIL_REQUIRED` is set. This fix it.
 2021-04-22 19:18:47 +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
ksar
efcc5e714a FIX #17363 2021-04-22 15:49:37 +02:00