Commit Graph

107112 Commits

Author SHA1 Message Date
Laurent Destailleur
643f4c8bdc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-08-10 13:08:03 +02:00
Laurent Destailleur
1a5ddb9c05 Merge pull request #21685 from frederic34/patch-5
do not loose description
2022-08-10 04:19:02 +02:00
Frédéric FRANCE
5ef9d2d40d keep url 2022-08-08 11:11:17 +02:00
Frédéric FRANCE
96c17b485c do not loose decription
when changing country, reload cause description lost
2022-08-08 11:07:38 +02:00
Laurent Destailleur
1c7d3f96a5 Merge pull request #21579 from atm-lena/15.0_KnowledgementDelete_CategorieManagement
Delete Knowledge : category management
2022-08-03 18:28:15 +02:00
Laurent Destailleur
93b040250e Update knowledgerecord.class.php 2022-08-03 18:25:32 +02:00
Laurent Destailleur
2ab8af433d Merge pull request #21649 from Dolibarr/revert-21633-fix_invoice_newVat_from_different_thirdparty
Revert "FIX : VAT rate recalculation"
2022-08-03 17:06:30 +02:00
Laurent Destailleur
c545756b6e Revert "FIX : VAT rate recalculation" 2022-08-03 17:06:19 +02:00
Laurent Destailleur
6b700905f1 Merge pull request #21633 from atm-jpb/fix_invoice_newVat_from_different_thirdparty
FIX : VAT rate recalculation
2022-08-03 17:05:46 +02:00
Laurent Destailleur
01b1cab84c Merge pull request #21643 from ptibogxiv/patch-30
Fix correct fix of paymentok.php
2022-08-03 17:00:46 +02:00
ptibogxiv
d872b9c2c7 Fix correct fix of paymentok.php
this line was deleted by error
2022-08-02 21:05:33 +02:00
Laurent Destailleur
78c5a83c7a Merge pull request #21625 from ptibogxiv/patch-27
FIX validation paymentok.php if advance rights
2022-08-02 19:16:58 +02:00
jpb
cec9725ced FIX : VAT rate recalculation
set a checkbox on clone formquestion
2022-08-01 16:28:44 +02:00
ptibogxiv
af4d8ef53e FIX validation paymentok.php if advance rights 2022-07-30 15:32:18 +02:00
Laurent Destailleur
629689b13f Fix bad trans %n instead of %s 2022-07-29 18:06:49 +02:00
Laurent Destailleur
9393a51621 Clean code 2022-07-27 18:22:08 +02:00
Laurent Destailleur
a9c8c24e9b Disable building of doliwamp package on non windows 15.0.3 2022-07-27 02:34:47 +02:00
Laurent Destailleur
e50a5fd81c Update doliwamp package script 2022-07-27 02:31:55 +02:00
Laurent Destailleur
577ccf69bf Clean packager 2022-07-27 01:37:49 +02:00
Laurent Destailleur
d212209b4b Fix packaging for windows 2022-07-27 01:24:04 +02:00
Laurent Destailleur
f1d41a0807 Ignore 2022-07-27 00:58:08 +02:00
Laurent Destailleur
a891239013 Remove need for cat and sed 2022-07-27 00:57:07 +02:00
Laurent Destailleur
55e46e2f09 Prepare 15.0.3 2022-07-27 00:41:41 +02:00
Laurent Destailleur
3640e1b3a3 Fix spec file 2022-07-27 00:24:30 +02:00
Laurent Destailleur
00328a5221 Fix bad spec file 2022-07-27 00:22:16 +02:00
Laurent Destailleur
783d7bfe20 Fix makepack for windows 2022-07-27 00:12:20 +02:00
Laurent Destailleur
e2f60aebc1 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-07-27 00:09:08 +02:00
Laurent Destailleur
a77eba021b Fix makepack 2022-07-27 00:08:48 +02:00
atm-lena
54b90abd87 Delete Knowledge : categorie management 2022-07-26 13:50:53 +02:00
Laurent Destailleur
6d2363d0d6 Merge pull request #21572 from FHenry/15_fix_filter_status_on_peruser
fix: filter Status Not applicable into is not correctly manage on Agenda list
2022-07-25 19:41:55 +02:00
Florian HENRY
266b0213a5 fix: filter Status Not applicable into is not correctly manage on Agenda list 2022-07-25 13:18:03 +02:00
Laurent Destailleur
99c170882c Merge pull request #21512 from bugness-chl/15.0
FIX #20476 migration postgresql 13.0.x to 14.0.x packaging type
2022-07-24 20:19:41 +02:00
Laurent Destailleur
96b7735bbe Merge pull request #21567 from emheyarssi/15.0
FIX #21518
2022-07-24 20:08:11 +02:00
Laurent Destailleur
f032a89c49 Merge pull request #21566 from FHenry/15_fix_21553
fix: #21553, fourn prod Id is required to find packaging value
2022-07-24 15:50:17 +02:00
stickler-ci
bd88c9e0cd Fixing style errors. 2022-07-24 13:15:39 +00:00
marc
d8dfe360ec Fix #21518
delete old logo/photo from disk when load a new logo/photo
2022-07-24 15:03:32 +02:00
marc
9209c83054 Fix deleting logo/photo doesn't delete file from disk 2022-07-24 14:49:57 +02:00
Laurent Destailleur
505531c9d6 Merge pull request #21552 from spooky360/15.0
FIX : fourn/commande/card.php Added "$object" parameter to $formfile->showdocuments call
2022-07-24 11:39:00 +02:00
Laurent Destailleur
9463f24a73 Better fix 2022-07-24 11:35:56 +02:00
Laurent Destailleur
fbf70beedb Merge pull request #21557 from emheyarssi/15.0.2
Fix #21449
2022-07-24 11:35:24 +02:00
Laurent Destailleur
f20aaee731 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/product/inventory/inventory.php
2022-07-24 11:22:00 +02:00
Laurent Destailleur
58923ec3d7 Merge 2022-07-24 11:21:02 +02:00
Laurent Destailleur
f93a4ce0c0 Merge pull request #21560 from aspangaro/14p35
FIX Accountancy - Label of VAT account is empty
2022-07-24 11:13:44 +02:00
Laurent Destailleur
f0b21d2ba7 Merge pull request #21561 from bugness-chl/tmp-fix-20476-14.0
FIX #20476 migration postgresql 13.0.x to 14.0.x packaging type
2022-07-24 00:04:15 +02:00
Florian HENRY
3af167db6c fix: #21553, fourn prod Id is required to find emballage value 2022-07-23 13:54:07 +02:00
Chl
1dec64e320 FIX #20476 migration postgresql 13.0.x to 14.0.x packaging type
Taken from ff35bf8d47
2022-07-22 19:17:03 +02:00
Laurent Destailleur
6d8b5bcfac Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-07-22 17:39:08 +02:00
Laurent Destailleur
d9f7a3efd1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/product/inventory/inventory.php
2022-07-22 17:38:24 +02:00
Laurent Destailleur
50af2747a2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-07-22 17:35:03 +02:00
Alexandre SPANGARO
e9ae888fc7 FIX Accountancy - Label of VAT account is empty 2022-07-22 16:01:39 +02:00