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

11740 Commits

Author SHA1 Message Date
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
ca236c556a FIX Blocking situation when a payment was deleted in bank. 
FIX Missing or bad permissions
 2022-02-28 19:45:53 +01:00
Regis Houssin
9cf5bccf43 FIX options should not exists on invoices 2022-02-28 18:13:29 +01:00
Alexandre SPANGARO
18a8eac1cd Modify fix 2022-02-26 07:17:44 +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
atm-lena
ed6f4b4ee1 Display Salary Paiement on compta report 2022-02-23 15:33:51 +01:00
Alexandre SPANGARO
0510d84263 FIX Invoice - When you create an invoice and defined a thirdparty, fk_account is not retrieved from company card 2022-02-23 06:08:20 +01:00
Laurent Destailleur
bd58cf1b37 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-18 21:52:18 +01:00
Laurent Destailleur
b0f538387e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
 2022-02-18 21:50:08 +01:00
Laurent Destailleur
28d8a28be6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-18 21:45:54 +01:00
Laurent Destailleur
959aa0ce59 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-02-18 21:44:34 +01:00
Laurent Destailleur
f295fa8ad4
Merge pull request #20108 from atm-maxime/fix_15_missing_hooks 
Fix : add missing formobjectoptions hook on 3 cards
 2022-02-18 20:23:09 +01:00
Laurent Destailleur
3d9cdbf136 FIX Debug v15 2022-02-18 16:24:11 +01:00
Maxime Kohlhaas
7a457478d5 Fix : add missing formobjectoptions hook on 3 cards 2022-02-18 08:23:12 +01:00
Laurent Destailleur
d19aca7192 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-02-17 20:50:03 +01:00
Laurent Destailleur
f1d84f5728
Merge pull request #20060 from hregis/fix_missing_default_or_current_value 
FIX missing default or current value
 2022-02-17 19:43:29 +01:00
Laurent Destailleur
2a18bce2f3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/api/index.php
	htdocs/langs/en_US/productbatch.lang
	htdocs/langs/fr_FR/productbatch.lang
	htdocs/ticket/list.php
 2022-02-16 20:31:55 +01:00
Laurent Destailleur
e0563d2bef Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-16 20:27:07 +01:00
Laurent Destailleur
7029bb7000
Merge pull request #20077 from AlexisLaurier/bugfix/paymentByBankTransfertIndexTabEntity 
add missing entity check on list of withdraws on index of paymentbyba…
 2022-02-16 20:26:39 +01:00
Laurent Destailleur
a33ca21151
Merge pull request #20079 from AlexisLaurier/bugfix/fixPrelevmentLineDetails-ForBankPaymentTransfert 
manage details of prelevment line for bank transfer
 2022-02-16 20:22:54 +01:00
Alexis LAURIER
ff8dcdc4b7 manage details of prelevment line for bank transfer 2022-02-16 10:52:20 +01:00
Alexis LAURIER
8b0280a9d2 add missing entity check on list of withdraws on index of paymentbybanktransfert 2022-02-16 10:26:44 +01:00
Regis Houssin
15b7f37027 FIX missing default or current value 2022-02-14 09:14:06 +01:00
Quentin VIAL-GOUTEYRON
d819d427c3 FIX sort amount ht 2022-02-10 16:46:19 +01:00
Laurent Destailleur
10d2e0cec0 Fix link to reconcile 2022-02-10 16:27:40 +01:00
Laurent Destailleur
ff3fbd1cf8 Fix preselected field 2022-02-10 13:06:51 +01:00
Laurent Destailleur
1d6a7ebe03 Fix pb with bulk payment feature 2022-02-10 13:01:47 +01:00
Laurent Destailleur
a295725368 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-10 11:23:45 +01:00
Laurent Destailleur
06fe8c391e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
	htdocs/install/mysql/tables/llx_propaldet.sql
 2022-02-10 10:23:42 +01:00
Regis Houssin
3eabeb2380 FIX broken feature, wrong div name again 2022-02-10 10:18:06 +01:00
Laurent Destailleur
d5d34930a8
Update card.php 2022-02-10 09:58:08 +01:00
Regis Houssin
8dffa020b4 FIX broken feature, wrong div name 2022-02-10 09:54:09 +01:00
Laurent Destailleur
02ec11ff64 css 2022-02-07 15:07:03 +01:00
Laurent Destailleur
e813de1595 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-02 14:08:54 +01:00
Laurent Destailleur
5a89da8876 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-02 14:08:19 +01:00
Laurent Destailleur
815dd74de0 Fix missing information propagated to trigger 2022-02-02 14:07:31 +01:00
Laurent Destailleur
3a40078149 Fix length of list 2022-01-31 14:03:40 +01:00
Alexandre SPANGARO
5f0999665f FIX Invoice - Clone - Don't report contact on an another thirdparty 2022-01-27 02:27:36 +01:00
Laurent Destailleur
60b90056c4 Fix #yogosha8450 2022-01-19 15:20:10 +01:00
Laurent Destailleur
91b2d59458 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-14 10:37:41 +01:00
Laurent Destailleur
53e65095a7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/commande/card.php
	htdocs/expedition/card.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/card.php
 2022-01-14 10:36:46 +01:00
Laurent Destailleur
9dde80dd52 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/expedition/card.php
	htdocs/fourn/commande/list.php
 2022-01-14 10:30:39 +01:00
Laurent Destailleur
dbc2631d6a Fix scrutinizer warnings 2022-01-13 19:19:36 +01:00
Laurent Destailleur
b9b45fb506 Fix #hunterf1d1ce3e-ca92-4c7b-b1b8-934e28eaa486 
Conflicts:
	test/phpunit/CodingPhpTest.php
 2022-01-13 18:46:29 +01:00
Laurent Destailleur
4fe3650736 Fix #hunterf1d1ce3e-ca92-4c7b-b1b8-934e28eaa486 2022-01-13 18:34:15 +01:00
Laurent Destailleur
dbce3cbfbe Clean code 2022-01-13 16:00:39 +01:00
Laurent Destailleur
054116900a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-13 11:59:05 +01:00
Laurent Destailleur
cb03f88fbc Fix link 2022-01-13 11:58:10 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
f51720879b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-13 11:05:57 +01:00
Laurent Destailleur
620a88b8d6 Fix param sortfield/order 2022-01-13 11:05:21 +01:00
Laurent Destailleur
dc3670bc91 Clean search_status 2022-01-13 11:00:52 +01:00
Laurent Destailleur
b9915800cf Fix bad warning 2022-01-11 01:30:24 +01:00
Laurent Destailleur
cde290c78a
Merge pull request #19402 from atm-gauthier/fix_reorder_lines_after_delete_line_everywhere 
FIX : reorder all lines when delete document line everywhere (4 documents were missing)
 2022-01-10 21:23:23 +01:00
Laurent Destailleur
1cc16f73d8 FIX #19761 2022-01-10 19:28:57 +01:00
Laurent Destailleur
cfec02aaae Debug v15 2022-01-10 14:27:43 +01:00
Laurent Destailleur
423a4ea104 Debug v15 2022-01-09 19:48:38 +01:00
Laurent Destailleur
144a8af438 Debug v15 2022-01-07 14:28:58 +01:00
Laurent Destailleur
bdac615cba Fix empty column 2022-01-07 14:01:15 +01:00
Laurent Destailleur
51a36040f1 Fix special char in sepa file on address 2022-01-07 13:03:03 +01:00
Laurent Destailleur
500b0e0218 FIX Sepa payment with company name with accent 2022-01-07 12:43:41 +01:00
Laurent Destailleur
26e8496c46 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/card.php
 2022-01-06 16:15:58 +01:00
Laurent Destailleur
2d0f4cab51
Merge pull request #19705 from atm-maxime/fix_supplier_credit_transfer 
Fix supplier credit transfer
 2022-01-06 16:10:53 +01:00
Laurent Destailleur
1e467c60f3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/compta/facture/list.php
	htdocs/product/stock/movement_list.php
 2022-01-06 11:15:28 +01:00
Laurent Destailleur
708f5e5cf1 FIX #19751 2022-01-06 10:54:19 +01:00
Laurent Destailleur
4ac7213707 Fix tooltip 2022-01-05 22:23:25 +01:00
Laurent Destailleur
30897df240 css 2022-01-05 22:14:24 +01:00
Laurent Destailleur
ae6ce0127b css 2022-01-05 22:07:58 +01:00
Laurent Destailleur
a887e41600 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/bankentries_list.php
	htdocs/compta/bank/info.php
	htdocs/compta/bank/line.php
	htdocs/compta/bank/releve.php
	htdocs/compta/bank/various_payment/card.php
	htdocs/fourn/class/fournisseur.product.class.php
 2022-01-04 09:45:31 +01:00
Laurent Destailleur
807f2841d4 FIX Navigation on bank transaction list 2022-01-04 09:33:52 +01:00
Laurent Destailleur
64c7472965 Fix link to account id 2022-01-03 22:01:08 +01:00
Laurent Destailleur
cecb11bb1c Debug v15 2022-01-03 12:28:42 +01:00
Laurent Destailleur
e8408141e2
Merge pull request #19716 from jyhere/patch-2 
FIx : addline() $type default value is misleading
 2021-12-30 19:28:44 +01:00
Laurent Destailleur
9b14c68411
Update facture.class.php 2021-12-30 19:28:25 +01:00
Laurent Destailleur
809c8f993b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/modPropale.class.php
	htdocs/filefunc.inc.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
 2021-12-30 19:03:46 +01:00
jyhere
ddb8b406a0
FIx : addline() $type default value is misleading 
It should refer to a Product type, not an Invoice type.
 2021-12-30 10:17:03 +01:00
stickler-ci
537965c7b7 Fixing style errors. 2021-12-28 17:34:11 +00:00
Maxime Kohlhaas
f9f1c7e3f8 Fix action protection 2021-12-28 18:32:02 +01:00
Maxime Kohlhaas
f27fda33e8 Fix prelevement action right management 2021-12-28 18:26:42 +01:00
Maxime Kohlhaas
1e848f0ebb Fix prelevement right management and action buttons 2021-12-28 18:17:57 +01:00
Maxime Kohlhaas
2237c09d64 Remove unused set_credit function 2021-12-28 17:59:41 +01:00
Maxime Kohlhaas
93393b82a3 Fix nav + translations on supplier invoice credit transfer 2021-12-28 17:40:25 +01:00
Maxime Kohlhaas
12880f1716 Fix : replace old filters by new ones 2021-12-28 16:02:51 +01:00
Maxime Kohlhaas
1d20694f33 Fix #19667 : bankentries wrong SQL parenthesis + missing filter 2021-12-28 15:47:46 +01:00
Henry
559b0b4bfa
Fix - Currency of Account Statement 2021-12-28 17:12:12 +08:00
Laurent Destailleur
00b43be7e6 Code comment 2021-12-23 10:20:01 +01:00
Laurent Destailleur
fee64f57d4 FIX Can't close a down payment if paid with credit notes. 2021-12-23 10:09:20 +01:00
Laurent Destailleur
6c84a128f6 Look and feel 2021-12-22 18:35:06 +01:00
Laurent Destailleur
bb436e556d Fix warnings 2021-12-21 15:23:56 +01:00
Laurent Destailleur
86b6f9c742 Fix warning 2021-12-21 15:01:41 +01:00
Laurent Destailleur
2de5db83a9 Fix iban_prefix 2021-12-21 14:51:57 +01:00
Laurent Destailleur
0387b9922e FIX error message on sqlfilter in API 2021-12-20 20:49:32 +01:00
Laurent Destailleur
f09e603bf4 Try for FIX #19562 2021-12-19 20:43:24 +01:00
Laurent Destailleur
fbce09f21b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/compta/facture/card.php
	htdocs/reception/card.php
 2021-12-19 00:36:22 +01:00
Laurent Destailleur
98ddfbf792 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/compta/facture/info.php
	htdocs/compta/facture/list.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/fourn/facture/list.php
	htdocs/mrp/mo_movements.php
	htdocs/product/stock/movement_card.php
	htdocs/product/stock/movement_list.php
	htdocs/product/stock/replenishorders.php
	htdocs/reception/card.php
	htdocs/supplier_proposal/list.php
 2021-12-19 00:17:37 +01:00
Laurent Destailleur
8925a8041a Fix trforbreak 2021-12-18 23:16:46 +01:00
Laurent Destailleur
7b1b02ab16 css 2021-12-18 22:23:12 +01:00
Laurent Destailleur
ab7f118949 Add info to help debug report 2021-12-18 21:59:46 +01:00
Laurent Destailleur
d43c632c33 Add info to help debug report 2021-12-18 21:51:44 +01:00