lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
106,793 Commits 43 Branches 150 Tags 886 MiB
64a683c8e7
Commit Graph

106793 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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