Commit Graph

106774 Commits

Author SHA1 Message Date
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
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
Eric Seigne
c1473b5514 fix #18338: Undefined property $ficheinter 2022-05-22 01:28:14 +02:00
Laurent Destailleur
eee978fc4e
Merge pull request #20971 from atm-maxime/fix_pdf_watermark_overall
Fix PDF watermark over PDF text
2022-05-22 01:19:58 +02:00
Laurent Destailleur
bd3252011b
Merge pull request #20975 from atm-maxime/fix_jobcandidature_pdf_doesnt_exist
Fix no document available on job candidature
2022-05-22 01:18:16 +02:00
Maxime Kohlhaas
e5c38572d1 Fix no document available on job candidature 2022-05-22 00:23:16 +02:00
Maxime Kohlhaas
bf39a259ba Fix PDF watermark over PDF text 2022-05-22 00:05:03 +02:00
Laurent Destailleur
d99e2ea4eb
Merge pull request #20948 from inovea-conseil/FIX#20886
FIX#20886 : manage durations in list_print_total.tpl.php
2022-05-21 19:12:45 +02:00
IC-Ilies
f9ff16c6f3 fix psr2 2022-05-21 17:33:03 +02:00
Laurent Destailleur
812298f740
Merge pull request #20945 from atm-maxime/fix_default_value_boolean
Fix default value boolean
2022-05-21 17:28:39 +02:00
Laurent Destailleur
962f0e2aa2
Merge pull request #20953 from inovea-conseil/FIX_#17853
FIX missing morecss for multiselectarray
2022-05-21 17:27:00 +02:00
Laurent Destailleur
e09bc8ce9a
Merge pull request #20954 from inovea-conseil/FIX#20487
FIX #20487 missing letter D in constant THIRDPARTIES_DISABLE_RELATED_…
2022-05-21 17:26:41 +02:00
IC-Ilies
9ea12664f7 FIX #20487 missing letter D in constant THIRDPARTIES_DISABLE_RELATED_OBJECT_TAB 2022-05-21 17:14:26 +02:00
Laurent Destailleur
636548b746
Merge pull request #20951 from SylvainLegrand/missing-MULTI-CURRENCY-on-recurrent-invoices-#20664
missing MULTI CURRENCY on recurrent invoices #20664
2022-05-21 17:09:44 +02:00
Nicolas
d8a68d280e FIX missing morecss for multiselectarray 2022-05-21 17:06:36 +02:00
stickler-ci
bd42680e2c Fixing style errors. 2022-05-21 14:43:30 +00:00
Sylvain Legrand
3fc8adf13e missing MULTI CURRENCY on recurrent invoices #20664 2022-05-21 16:42:27 +02:00
IC-Ilies
1b6e0a9fc0 FIX#20886 : manage durations in list_print_total.tpl.php 2022-05-21 16:25:47 +02:00
Maxime Kohlhaas
9b2a543170 Fix phpcs too long line 2022-05-21 15:49:27 +02:00
Laurent Destailleur
dd505b5285
Merge pull request #20944 from atm-maxime/fix_box_ticket_labels
Fix labels in tickets widgets
2022-05-21 15:43:46 +02:00
Maxime Kohlhaas
4932f86a2d Fix default value for boolean extrafield 2022-05-21 15:41:34 +02:00
Maxime Kohlhaas
4c10ef8f4c Fix labels in tickets widgets 2022-05-21 15:36:04 +02:00
Laurent Destailleur
5ede88ef3c
Merge pull request #20943 from inovea-conseil/FIX_20621
FIX #20621 signature online with proposal with n page.
2022-05-21 15:34:48 +02:00
Nicolas
11da45646e FIX signature online with proposal with n page. 2022-05-21 15:30:52 +02:00
Laurent Destailleur
7c9d360019
Merge pull request #20937 from atm-maxime/fix_date_creation_visible
Fix : date_creation must have visible=-2
2022-05-21 10:34:01 +02:00
Laurent Destailleur
21c3f27e72
Merge pull request #20941 from inovea-conseil/FIX#20448
FIX#20448 missing preg_replace for vat rate when adding a free line
2022-05-21 10:33:41 +02:00
Laurent Destailleur
653e59ffeb
Merge pull request #20939 from atm-maxime/fix_select_project_on_event
Fix select projet on event creation
2022-05-21 10:28:35 +02:00
IC-Ilies
c12ae28ad7 FIX#20448 missing preg_replace for vat rate when adding a free line 2022-05-21 09:31:33 +02:00
Maxime Kohlhaas
0d7386ab89 Fix select projet on event creation 2022-05-21 01:23:39 +02:00
Laurent Destailleur
980c9874ab
Merge pull request #20895 from ATM-Consulting/FIX_15.0_unable_to_add_several_cron_jobs_with_same_method_and_different_parameters
FIX 15.0: modules cannot declare more than 1 cron job using the same method with different parameters
2022-05-21 01:17:28 +02:00
Laurent Destailleur
6aa4ce2acb
Merge pull request #20896 from marc-dll/13.0_FIX_new_membership_select_width
FIX: new member subscription: bank account and payment mode might be hidden
2022-05-21 00:48:58 +02:00
Laurent Destailleur
9a0e5c0591
Merge pull request #20898 from frederic34/patch-1
Update card.php
2022-05-21 00:45:36 +02:00
Laurent Destailleur
1196d6f48c
Merge pull request #20907 from atm-quentin/NEW_hook_format_address
FIX : hook for dol_format_address
2022-05-21 00:42:11 +02:00
Laurent Destailleur
fffd655442
Merge pull request #20933 from atm-maxime/fix_recruitment_missing_const
Fix missing const in recruitment module
2022-05-21 00:24:01 +02:00
Laurent Destailleur
e2c411b224
Merge pull request #20934 from atm-maxime/fix_er_right_to_pay
Fix wrong right test to show button
2022-05-21 00:23:51 +02:00
Maxime Kohlhaas
755bce9fe1 Fix : date_creation must have visible=-2 2022-05-21 00:22:47 +02:00
Maxime Kohlhaas
8231a9ea0f Fix wrong right test to show button 2022-05-20 23:29:35 +02:00