2
0
forked from Wavyzz/dolibarr
Commit Graph

106147 Commits

Author SHA1 Message Date
Laurent Destailleur
2e38caa950 phpunit 2022-03-01 18:22:09 +01:00
Laurent Destailleur
883f13b388 Fix regression verifCond 2022-03-01 18:14:24 +01:00
Laurent Destailleur
b79ad197ec FIX Missing the field date start/end in export supplier invoice/order 2022-03-01 17:29:22 +01:00
Laurent Destailleur
237b6fc922 Fix value recommended 2022-03-01 17:07:28 +01:00
Laurent Destailleur
2a48dd349e Fix #hunterb03d4415-d4f9-48c8-9ae2-d3aa248027b5 2022-03-01 16:38:06 +01:00
Laurent Destailleur
d76e002822 Fix explanation on setup page 2022-03-01 15:17:03 +01:00
Laurent Destailleur
bd288f980d FIX On large proposal or invoice, fix n(n+1) sql into a n sql. 2022-03-01 14:52:47 +01:00
Laurent Destailleur
dfba29b3c6 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/api/class/api.class.php
	htdocs/compta/facture/card.php
	htdocs/reception/list.php
2022-02-28 22:30:17 +01:00
Laurent Destailleur
20a35147d4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-28 22:22:46 +01:00
Laurent Destailleur
df9fa39d34 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-02-28 22:22:10 +01:00
Laurent Destailleur
d101a457c1 Trans 2022-02-28 22:21:40 +01:00
Laurent Destailleur
81e0eb3af0 Merge pull request #20128 from atm-greg/FIX_14.0_missing_hook_receptionlist
fix missing hooks and line total for totalizable extrafields
2022-02-28 22:14:11 +01:00
Laurent Destailleur
c1268a3e39 Merge pull request #20151 from aspangaro/14p34
FIX Invoice - When you create an invoice and defined a thirdparty, fk_account is not retrieved from company card
2022-02-28 21:38:07 +01:00
Laurent Destailleur
b7d20ff20b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-28 21:34:17 +01:00
Laurent Destailleur
548cad0508 FIx #20110 2022-02-28 21:30:12 +01:00
Laurent Destailleur
0bdf720ed4 Merge pull request #20224 from atm-greg/Fix_extrafields_view_and_perms_on_list
Fix extrafields view and perms on list
2022-02-28 21:17:19 +01:00
Laurent Destailleur
47ce7ef5ae Merge pull request #20199 from fappels/15_fix_fk_shipping_method
FIX: shipping list, e.shipping_method_id should be e.fk_shipping_method.
2022-02-28 21:07:52 +01:00
Laurent Destailleur
253622acf6 Merge pull request #20206 from fappels/15_fix_product_photo_on_cornas_model
FIX: Show product photo on Supplier order Cornas model.
2022-02-28 21:03:20 +01:00
Laurent Destailleur
e69b5ba086 Merge pull request #20223 from hregis/fix_no_special_code_option_for_invoice
FIX options should not exists on invoices
2022-02-28 20:36:36 +01:00
Laurent Destailleur
ca236c556a FIX Blocking situation when a payment was deleted in bank.
FIX Missing or bad permissions
2022-02-28 19:45:53 +01:00
stickler-ci
c2047f1f5d Fixing style errors. 2022-02-28 17:46:20 +00:00
atm-greg
bc8ea7571b perms can be an expression and must be evaluated 2022-02-28 18:38:37 +01:00
atm-greg
5eef80750a fiw visibility can be an expression and can return 0 2022-02-28 18:37:47 +01:00
Regis Houssin
9cf5bccf43 FIX options should not exists on invoices 2022-02-28 18:13:29 +01:00
Laurent Destailleur
8866d447c7 Fix error message 2022-02-28 16:01:07 +01:00
Laurent Destailleur
40d67d70d2 Fix module partnership 2022-02-28 12:37:56 +01:00
Laurent Destailleur
32f2eb8c94 Debug v15 2022-02-28 12:13:06 +01:00
Laurent Destailleur
b9649632fa Fix update 2022-02-28 11:53:29 +01:00
Laurent Destailleur
2ce50b6c00 CSS 2022-02-26 19:30:46 +01:00
Laurent Destailleur
5d0408f7af Fix filter on member list 2022-02-26 19:15:40 +01:00
Francis Appels
3e41c9cb97 FIX: Show product photo on Supplier order Cornas model. 2022-02-26 11:13:02 +01:00
Alexandre SPANGARO
18a8eac1cd Modify fix 2022-02-26 07:17:44 +01:00
Laurent Destailleur
fb0e2f9c6c FIX #yogosha9095 2022-02-26 01:00:22 +01:00
Laurent Destailleur
eba20957f3 Fix CSS
Conflicts:
	htdocs/projet/list.php
2022-02-25 21:47:25 +01:00
Laurent Destailleur
488049c6a6 FIX bad position of extrafields for interventions 2022-02-25 20:36:40 +01:00
Laurent Destailleur
f8a5749fc4 # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-25 19:00:10 +01:00
Laurent Destailleur
b989c257ad Fix report on salaries 2022-02-25 18:53:21 +01:00
Francis Appels
c242a0561b Fix shipping list, e.shipping_method_id should be e.fk_shipping_method.
Disabled searchall for shipping method, does not work.
2022-02-25 16:11:16 +01:00
Laurent Destailleur
a6a6c588db Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-25 14:37:28 +01:00
Laurent Destailleur
ac67a5a2bb Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-25 14:34:25 +01:00
Laurent Destailleur
a70d45b3ab Merge pull request #20148 from marc-dll/12.0_FIX_medias_blocked_when_logged_with_multicompany
FIX: viewimage.php blocks requests with multicompany from other enties
2022-02-25 14:32:49 +01:00
Laurent Destailleur
def0c76ec6 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-25 14:31:37 +01:00
Laurent Destailleur
971c0fc764 Merge pull request #20147 from Hystepik/develop_safe_v14
Fix : fix error of permission in holiday
2022-02-25 14:30:05 +01:00
Laurent Destailleur
6dadfc9d0d Merge pull request #20149 from marc-dll/13.0_FIX_pdf_deposit_detail
FIX: invoice pdf: lines originating from deposits were not detailed anymore
2022-02-25 14:29:33 +01:00
Laurent Destailleur
84db3437bd Add missing ' in command 2022-02-25 14:13:42 +01:00
Laurent Destailleur
eb6383ff1d Merge pull request #20165 from atm-lena/FIX_SalaryPaiement_RapportCompta
Display Salary Paiement on compta report
2022-02-25 14:02:32 +01:00
Laurent Destailleur
a2dea71b4d Merge pull request #20172 from Dolibarr/atm-maxime-patch-1
Fix #20171 permissiontoadd
2022-02-25 14:00:13 +01:00
Laurent Destailleur
f4f75e1d0e Merge pull request #20175 from bloxera/15.0
Fix #20141 generation of intervention
2022-02-25 13:44:03 +01:00
Laurent Destailleur
3eca04e85b Merge pull request #20178 from thomas-Ngr/14.0_fix_bookmark_info_bubble
fix bookmarks info bubble
2022-02-25 13:34:01 +01:00
Laurent Destailleur
8c6f005ea1 Merge pull request #20195 from Dolibarr/revert-20193-14.0
Revert "NEW : accoutancy : subleger label input automatic filling when selecting subleger account in select2 list"
2022-02-25 13:22:10 +01:00