Commit Graph

94747 Commits

Author SHA1 Message Date
Laurent Destailleur
cee573cf96
Update ProductCombination.class.php 2021-10-31 17:42:43 +01:00
Gauthier PC portable 024
1e45b9b1cd FIX : We need a default price base type in variant creation case with multiprices when parent has been created with only one level price 2021-10-25 15:25:58 +02:00
Laurent Destailleur
b70f52a615
Merge pull request #19126 from atm-maxime/fix_product_api_subproducts
Fix #19070 : Api subproducts was returning false
2021-10-23 11:35:29 +02:00
Maxime Kohlhaas
604052d1a1 Fix #19070 : Api subproducts was returning false 2021-10-23 02:28:53 +02:00
Laurent Destailleur
f1565bb283
Merge pull request #18982 from atm-lena/13.0_FIX_updateExtrafield_EmptyValue
Function updateExtrafield : replace empty value to null
2021-10-21 23:41:30 +02:00
atm-lena
806c53d4c4 FIX Ret PR 2021-10-21 09:49:14 +02:00
Laurent Destailleur
b1e4e2699b
Merge pull request #18993 from atm-florianm/FIX_13.0_ticket_message_editing_requires_end_date
FIX 13.0: end date required to edit a ticket message
2021-10-19 19:05:36 +02:00
Laurent Destailleur
039e0ba89e
Merge pull request #19005 from atm-florianm/FIX_13.0_typo_in_firstname
FIX 13.0: sometimes firstname was mistyped as fistname
2021-10-18 19:28:16 +02:00
atm-florian
d0d5955fb1 FIX 13.0: sometimes firstname was mistyped as fistname 2021-10-18 12:09:33 +02:00
atm-florian
aff8d9c24a FIX 13.0 PR #18993: add comment on modified part 2021-10-18 09:46:20 +02:00
atm-florian
2ff75dfab4 FIX 13.0 feedback of PR #18993: make ticket messages punctual events with attr percentage = -1 2021-10-18 09:43:05 +02:00
Laurent Destailleur
759502829c
Merge pull request #18973 from atm-maxime/fix_member_from_third
Fix member creation from thirdparty extrafields
2021-10-16 21:23:47 +02:00
Laurent Destailleur
946bca3b62 Prepare 13.0.5 2021-10-16 13:26:39 +02:00
Laurent Destailleur
a0c81d6230 Prepare 13.0.5 2021-10-16 13:23:59 +02:00
Laurent Destailleur
faf80b94e9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/compta/facture/stats/index.php
2021-10-16 12:49:18 +02:00
Laurent Destailleur
a2733344e7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-10-16 12:33:32 +02:00
Laurent Destailleur
07052196e2 Fix popup message on sepa creation 2021-10-16 12:33:19 +02:00
atm-florian
bd7e3e57ca FIX 13.0: end date required to edit a ticket message 2021-10-15 16:56:38 +02:00
atm-lena
ff7727466a Function updateExtrafield : replace empty value to null 2021-10-14 17:13:44 +02:00
Laurent Destailleur
3875d26a2f Fix filter for supplierinvoice stats 2021-10-14 15:55:12 +02:00
Laurent Destailleur
db3d16f080 Fix filter tag for supplier invoice statistics 2021-10-14 15:43:35 +02:00
Laurent Destailleur
bc230dbfc2 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-10-14 12:00:33 +02:00
Laurent Destailleur
371c75e76a FIX list of categories in stats of supplier invoices 2021-10-14 11:58:21 +02:00
Maxime Kohlhaas
3c33770f00 Fix member creation from thirdparty extrafields 2021-10-13 15:30:49 +02:00
Laurent Destailleur
d75138b362
Merge pull request #18946 from atm-lena/13.0_FIX_HookCreateDictionaryFieldList_HTMLTRTag
Hook createDictionaryFieldList :  tr html tag to right place
2021-10-12 12:46:04 +02:00
Laurent Destailleur
6b69e64fb6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-10-11 20:18:08 +02:00
Laurent Destailleur
3a32787f15 Fix for backward compatibility 2021-10-11 16:14:34 +02:00
Laurent Destailleur
5fc0802eb1 Fix for backward compatibility 2021-10-11 16:13:55 +02:00
atm-lena
7c8bde885b hook createDictioaryFieldList : tr html tag to right place 2021-10-11 16:03:56 +02:00
Laurent Destailleur
68ac62d09c Fix phpcs 2021-10-07 11:05:06 +02:00
Laurent Destailleur
efd44b0ec0 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-10-07 10:57:03 +02:00
Laurent Destailleur
5910d10021 Add hidden option to allow to fix corrupted situations 2021-10-07 10:43:50 +02:00
Laurent Destailleur
e3032ef1c4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/fourn/facture/card.php
2021-10-06 16:06:25 +02:00
Laurent Destailleur
eba377cdf0
Merge pull request #18860 from FHenry/12_fix_selectline_from_supplier_order_to_supplier_invoice
fix: Supplier order => Supplier Invoice : line selector (checkbox) wasn't working
2021-10-06 15:31:14 +02:00
Laurent Destailleur
10f0434116
Update card.php 2021-10-06 15:30:19 +02:00
Laurent Destailleur
1c56f65c27 Fix missing migration instruction 2021-10-04 11:49:49 +02:00
Laurent Destailleur
157112758b Fix phpcs 2021-09-30 20:14:59 +02:00
Florian HENRY
6d00097c89 fix 2021-09-30 16:37:52 +02:00
Laurent Destailleur
44bb5ebf34 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
2021-09-30 16:23:34 +02:00
Laurent Destailleur
bb6399e12a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/product/card.php
2021-09-30 16:21:36 +02:00
Laurent Destailleur
fc4a16b356 Fix avoid error when trigger run on downgraded version. 2021-09-30 16:18:07 +02:00
Florian HENRY
d0508d557b fix: checkbox for line selection between supplier order and supplier invoice was infective 2021-09-30 14:56:02 +02:00
Laurent Destailleur
422191def1
Merge pull request #18858 from FHenry/12_fix_dict_tva
fix: search code on tva dict
2021-09-30 14:05:07 +02:00
Laurent Destailleur
620d7109b5
Update dict.php 2021-09-30 14:04:56 +02:00
Florian HENRY
332fa77d90 fix: search code on tva dict 2021-09-30 13:49:02 +02:00
Laurent Destailleur
c3d539abff
Merge pull request #18833 from marc-dll/12.0_FIX_product_extrafields_update
FIX: products/services card: hidden extrafields were overridden
2021-09-28 12:13:08 +02:00
Marc de Lima Lucio
6abe6462e6 FIX: products/services card: hidden extrafields were overridden 2021-09-27 14:33:57 +02:00
Laurent Destailleur
a3c8f2ed56
Merge pull request #18771 from laudeco/hotfix/receipt_html
Allow to edit the header of receipt by using HTML
2021-09-24 13:33:08 +02:00
Laurent De Coninck
70e66627fe
restrict the html 2021-09-22 20:14:47 +02:00
Laurent De Coninck
5e2d8eac2b
Allow to edit the header of receipt by using HTML
In the current version the WYSIWYG oesn't allow any HTML by thus fix you
can use any button from the wysiwyg and it displays on the receipe.

[see: X]
2021-09-20 22:51:43 +02:00