Commit Graph

106809 Commits

Author SHA1 Message Date
Eric Seigne
d950533bdb fix #21118: undefined function getAttachments 2022-06-02 23:55:58 +02:00
Laurent Destailleur
6115461b30
Merge pull request #21102 from jyhere/patch-3
FIX errors in getLinesArray()
2022-06-02 14:50:40 +02:00
jyhere
f582814c0f
Update bom.class.php 2022-06-02 09:46:26 +02:00
Laurent Destailleur
958833484f Fix bad var 2022-06-01 22:01:03 +02:00
Laurent Destailleur
169ebdef10 FIX #21051 2022-06-01 21:46:07 +02:00
ptibogxiv
b5197a07c1 Fix API knowledgemanagement 2022-06-01 21:42:18 +02:00
Laurent Destailleur
62ee0ff29c
Merge pull request #21054 from frederic34/patch-1
force refresh css
2022-06-01 21:34:23 +02:00
Laurent Destailleur
8f33d91783
Merge pull request #21073 from fappels/15_fix_update_buyprice_packaging
FIX: sql error when PRODUCT_USE_SUPPLIER_PACKAGING enabled.
2022-06-01 21:01:19 +02:00
Laurent Destailleur
c55c150937
Merge pull request #21082 from manu8170/15.0
Fix a few CSS errors
2022-06-01 19:56:03 +02:00
Laurent Destailleur
edc8bebf10
Merge pull request #21090 from Hystepik/develop_v15#1
Fix #21037 : select extrafield in knowledgerecord_list
2022-06-01 19:33:20 +02:00
Laurent Destailleur
32f60e191f Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-01 15:57:35 +02:00
Laurent Destailleur
c3036d455a FIX #20902 2022-06-01 15:56:44 +02:00
lmarcouiller
67ac6b41f0 Fix #21037 : select extrafield in knowledgerecord_list 2022-06-01 15:07:14 +02:00
Manu
008396b3df Fix a few CSS errors 2022-06-01 09:18:54 +02:00
Francis Appels
74346c6480 Fix sql error when PRODUCT_USE_SUPPLIER_PACKAGING enabled. 2022-05-31 16:59:57 +02:00
Laurent Destailleur
64a683c8e7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/projet/tasks/task.php
2022-05-31 14:33:19 +02:00
Laurent Destailleur
72b36b5a69 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-31 14:31:20 +02:00
Laurent Destailleur
c9eda09964 FIX ODT generation of BOM document 2022-05-31 14:30:47 +02:00
Frédéric FRANCE
489aa22e56
force refresh css 2022-05-30 14:14:18 +02:00
Laurent Destailleur
f5da6ebfe2
Merge pull request #21036 from OPEN-DSI/14.0_fix_show_category_on_sellist_extrafields
FIX: Show sellist type of extrafield when none category selected
2022-05-29 11:24:35 +02:00
Laurent Destailleur
3080605139
Merge pull request #21032 from FHenry/14.0_fix_extrafeilds_bad_display_inline
fix: extrafields chkbxlst or checkbox or badly displayed in line object
2022-05-29 11:20:07 +02:00
Laurent Destailleur
94424c7c2f
Merge pull request #21047 from aspangaro/15p2
Merge problem
2022-05-29 10:49:53 +02:00
Alexandre SPANGARO
e315f2d503 Merge branch '15.0' of https://github.com/Dolibarr/dolibarr into 15.0 2022-05-29 03:37:18 +02:00
kamel
f1914ff66f FIX: Show sellist type of extrafield when none category selected 2022-05-25 18:02:18 +02:00
Florian HENRY
4e289741f9 fix: extrafields chkbxlst or checkbox or badly displayed in line object 2022-05-25 16:59:23 +02:00
Laurent Destailleur
1dd2ce0399
Merge pull request #21024 from atm-john/15.0_fix_btn_confirm_url
Fix btn confirm url
2022-05-25 16:56:54 +02:00
John BOTELLA
e07827a0be Fix btn confirm url 2022-05-25 10:03:08 +02:00
John BOTELLA
9d31d6448c Fix btn confirm url 2022-05-25 09:59:45 +02:00
Laurent Destailleur
3ce58c2337
Merge pull request #21011 from OPEN-DSI/14.0_fix_get_origin_when_add_supplier_proposal
FIX: Fix get origin from other than supplier proposal when add a new supplier proposal
2022-05-24 21:29:55 +02:00
Laurent Destailleur
1649f9c2f0
Merge pull request #21006 from aspangaro/15p1
Fix: Accountancy - typo in hook
2022-05-24 21:28:13 +02:00
Laurent Destailleur
62a210d2a2
Merge pull request #21012 from OPEN-DSI/14.0_fix_card_errors_managment
FIX: Fix show errors in card
2022-05-24 21:08:38 +02:00
Laurent Destailleur
34199cf0fb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/core/modules/modRecruitment.class.php
2022-05-24 16:31:45 +02:00
Laurent Destailleur
ab40634dcb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-05-24 16:28:32 +02:00
Laurent Destailleur
c1ef208c0f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/adherents/subscription.php
	htdocs/core/lib/security.lib.php
	htdocs/expensereport/card.php
2022-05-24 16:27:26 +02:00
kamel
79462c43fa FIX: Fix get origin from other than supplier proposal when add a new supplier proposal 2022-05-24 15:13:19 +02:00
kamel
192f273e27 FIX: Fix show errors in card 2022-05-24 15:02:35 +02:00
Alexandre SPANGARO
c5bbbd88af Merge problem 2022-05-24 07:14:22 +02:00
Alexandre SPANGARO
e437a53657 Typo 2022-05-23 21:40:47 +02:00
Laurent Destailleur
05d09f1ce9
Merge pull request #20981 from rycks/14_undef_ficheinter
14 undef ficheinter
2022-05-22 17:17:01 +02:00
Laurent Destailleur
460687504c
Update card.php 2022-05-22 17:16:48 +02:00
Laurent Destailleur
b5e0e57f9f
Merge pull request #20982 from rycks/14_fix_read_property_creer
14 fix read property creer
2022-05-22 17:15:56 +02:00
Laurent Destailleur
a193474fa3
Update card.php 2022-05-22 17:15:43 +02:00
Laurent Destailleur
85e2fe40b1
Merge pull request #20983 from atm-maxime/fix_delete_paiement
Fix delete customer payment
2022-05-22 17:13:01 +02:00
Laurent Destailleur
96867fac4f FIX ZATCA regression 2022-05-22 13:04:16 +02:00
Laurent Destailleur
8e2b082a21 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-22 12:39:23 +02:00
Laurent Destailleur
f65f63b562 FIX Zatca QR code must use company name/vat 2022-05-22 12:38:52 +02:00
Maxime Kohlhaas
c3fb7647c5 Fix delete customer payment 2022-05-22 02:30:35 +02:00
Eric Seigne
1ca1afd734 fix #18339 : Attempt to read property creer 2022-05-22 01:50:10 +02:00
Eric Seigne
45bc1ff287 fix #18339 : Attempt to read property creer 2022-05-22 01:50:01 +02:00
Eric Seigne
4a222fe5d5 fix potential warning ($conf->ficheinter->enabled) 2022-05-22 01:38:32 +02:00