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

94777 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
fdf5d457a8
Merge pull request #19196 from atm-gauthier/FIX_default_price_base_type_with_variants 
FIX : We need a default price base type in variant creation case with…
 2021-10-31 17:42:58 +01:00
Laurent Destailleur
cee573cf96
Update ProductCombination.class.php 2021-10-31 17:42:43 +01:00
Laurent Destailleur
0e4c113e7f Fix phpcs 2021-10-31 17:11:23 +01:00
Laurent Destailleur
ca8dab36a3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.formticket.class.php
	htdocs/core/modules/modAdherent.class.php
	htdocs/core/modules/modProjet.class.php
 2021-10-31 14:33:44 +01:00
Laurent Destailleur
01c6de1085 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-10-31 14:24:53 +01:00
Laurent Destailleur
6d918ad1c7 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-10-31 14:24:19 +01:00
Laurent Destailleur
ff696e0dad
Merge pull request #19236 from marc-dll/11.0_FIX_invoice_creation_blocked 
FIX: URGENT: impossible to create an invoice
 2021-10-31 14:03:11 +01:00
Laurent Destailleur
3dcd1aa05d
Update info.php 2021-10-31 14:02:34 +01:00
Laurent Destailleur
8dfe4fe05f
Update note.php 2021-10-31 14:02:14 +01:00
Laurent Destailleur
65d59405da
Update document.php 2021-10-31 14:01:56 +01:00
Laurent Destailleur
0e2e8fe27f
Update contact.php 2021-10-31 14:01:40 +01:00
Laurent Destailleur
7232e38dbe
Merge pull request #19248 from fmarcet/12.0 
Fix: Import don't work if extrafield is separator
 2021-10-31 13:54:31 +01:00
Laurent Destailleur
f2c282305e
Merge pull request #19260 from aspangaro/12p21 
FIX Ticket - Duplicate field project when we create ticket from project
 2021-10-31 13:53:58 +01:00
Alexandre SPANGARO
54b81312b5 FIX Ticket - Duplicate field project when we create ticket from project 2021-10-30 22:49:32 +02:00
Ferran Marcet
1336d3e791 Fix: Import don't work if extrafield is separator 2021-10-29 12:25:50 +02:00
Marc de Lima Lucio
eb8d7f92c3 FIX: invoice: inpossible to create an invoice because of very bad check + warnings when trying to print tabs for invoice with no ID 2021-10-28 15:26:40 +02:00
Laurent Destailleur
7393abea8f Fix phpcs 2021-10-26 14:42:26 +02:00
Laurent Destailleur
fde44f2792 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
 2021-10-26 13:29:47 +02:00
Laurent Destailleur
181991ee47 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-10-26 13:10:23 +02:00
Laurent Destailleur
d82cbf6636 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-10-26 13:09:15 +02:00
Laurent Destailleur
e87e354bd5 Fix: can't reset country of origin 2021-10-26 13:08:22 +02: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
c8bcd01a10
Merge pull request #19162 from atm-maxime/fix_no_mail_in_now_unsubscribe 
Fix #18961 : no_email field has been replaced by mailing_unsubscribe table
 2021-10-24 00:42:48 +02:00
Maxime Kohlhaas
983e28691b Use a subselect instead of a join 2021-10-24 00:02:55 +02:00
Maxime Kohlhaas
29950a6afa Replace != by <> in SQL requests 2021-10-23 22:27:29 +02:00
Maxime Kohlhaas
00b617d17f Fix #18961 : no_email field has been replaced by mailing_unsubscribe table 2021-10-23 22:22:45 +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
fc0c4295bd
Merge pull request #19118 from atm-florianm/FIX_12.0_tcpdf_issue_315_roman_numeral_bomb_vulnerability 
FIX tcpdf roman numeral rendering bomb, cf. tecnickom/TCPDF PR 315
 2021-10-22 19:10:13 +02:00
atm-florian
17773f8414 FIX tcpdf vulnerability to roman numeral bomb, cf. tecnickom/TCPDF issue #315 2021-10-22 18:26:23 +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
e1af439a6d
Merge pull request #18931 from atm-florianm/FIX_11.0_consistent_UX_for_invoices_when_no_id_or_ref 
FIX: consistent UX when calling a tab from the invoice card with empty ref/id
 2021-10-17 13:52:30 +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
bd52613331 Fix phpcs 2021-10-16 17:06:10 +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