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

11936 Commits

Author SHA1 Message Date
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
aad292b41b
Merge pull request #20074 from altairisfr/fix_parentline_13.0 
More generic management of parentline
 2022-02-16 20:25:04 +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
lvessiller
7e17167faf NEW total mark rate in list 2022-02-16 11:45:29 +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
Frédéric FRANCE
eb77f10d7b
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-15 19:11:24 +01:00
Frédéric FRANCE
935482ee22
uniformize 2022-02-15 19:04:18 +01:00
Frédéric FRANCE
a613553f37
Merge branch 'hookgetnomurl' into patch-1 2022-02-15 18:44:06 +01:00
Frédéric FRANCE
0ba912b1e5
add missing global 2022-02-15 18:14:44 +01:00
Frédéric FRANCE
d546e11fba
Update chargesociales.class.php 2022-02-15 17:13:08 +01:00
Christophe Battarel
ebada46a07 fix context for createfromclone 2022-02-15 12:14:48 +01:00
Frédéric FRANCE
502aa1b14b
Update paiement.class.php 2022-02-15 11:21:40 +01:00
Frédéric FRANCE
710e970389
Update facture-rec.class.php 2022-02-15 11:13:22 +01:00
Christophe Battarel
01ef9b64ee fix parent line on create with no originid 2022-02-15 10:34:10 +01:00
Christophe Battarel
6c6c854eae fix parent line on create with origin 2022-02-15 10:23:43 +01:00
javieralapps4up
81c2631b00
FIX Andorra needs Code Banque 2022-02-14 20:06:42 +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
16e4e736fd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-10 16:28:29 +01:00
Laurent Destailleur
10d2e0cec0 Fix link to reconcile 2022-02-10 16:27:40 +01:00
Laurent Destailleur
b69beb98b8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-10 13:30:22 +01:00
Laurent Destailleur
c4c15fc105 Fix warnings 2022-02-10 13:16:51 +01:00
Laurent Destailleur
ff3fbd1cf8 Fix preselected field 2022-02-10 13:06:51 +01:00
Laurent Destailleur
21f0264683 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-10 13:02:48 +01:00
Laurent Destailleur
1d6a7ebe03 Fix pb with bulk payment feature 2022-02-10 13:01:47 +01:00
Laurent Destailleur
d69f9eca40 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2022-02-10 11:25:15 +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
3b18462a62 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
 2022-02-07 15:51:01 +01:00
Laurent Destailleur
02ec11ff64 css 2022-02-07 15:07:03 +01:00
lvessiller
241a65e2ae NEW add margin info in proposal and order list 2022-02-03 10:39:03 +01:00
Laurent Destailleur
ba77700619 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-02 17:58:09 +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
b55830d205 Fix missing information propagated to trigger 2022-02-02 14:03:09 +01:00
Laurent Destailleur
44bc197d03 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-01 13:25:45 +01:00
Laurent Destailleur
3a40078149 Fix length of list 2022-01-31 14:03:40 +01:00
Laurent Destailleur
adf8f3886b Merge 2022-01-28 18:07:56 +01:00
Laurent Destailleur
2686541156 Fix late picto 2022-01-28 17:59:58 +01:00
Gauthier PC portable 024
3abe391f65 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-01-28 15:08:02 +01:00
Alexandre SPANGARO
4693b9702b
Copyright 2022-01-27 06:20:11 +01:00
Alexandre SPANGARO
1ed096316a
Merge branch 'Dolibarr:develop' into fix_vat_report_by_month_and_rate_with_vat_src_code 2022-01-27 06:11:20 +01:00
Alexandre SPANGARO
5f0999665f FIX Invoice - Clone - Don't report contact on an another thirdparty 2022-01-27 02:27:36 +01:00
kamel
db57d1a99f Correction lien pour afficher le detail de la tva si la tva est présente coté client en fournisseur 2022-01-26 15:53:03 +01:00
kamel
83d80cc380 Correction recuperation de la vat_rate_show 2022-01-26 15:45:00 +01:00
Laurent Destailleur
512df3c580 Try to address a better solution for #19776 2022-01-26 15:12:42 +01:00
Laurent Destailleur
1b50350600
Merge pull request #19910 from atm-adrien/NEW_Add_Hooks_salaries_sociales 
NEW : Add hooks on salaries and sociales card
 2022-01-26 12:58:48 +01:00
Laurent Destailleur
5d176c75db
Merge pull request #19780 from aspangaro/16a7 
NEW Thirdparty - Add rules customer accountancy code is mandatory to validate invoice
 2022-01-25 15:00:47 +01:00
Laurent Destailleur
30811e9b1a
Merge branch 'develop' into NEW_Add_Hooks_salaries_sociales 2022-01-25 14:45:51 +01:00
Laurent Destailleur
37338f9a60
Update card.php 2022-01-25 14:03:29 +01:00
Laurent Destailleur
9f377b7fe4 Better responsive on small screen 2022-01-24 23:58:16 +01:00
stickler-ci
6cb97b1346 Fixing style errors. 2022-01-24 15:13:40 +00:00
Adrien Raze
c131bdcbd3 NEW : Add hooks on salaries and sociales card 2022-01-24 16:06:02 +01:00
Laurent Destailleur
0a996f44be
Merge pull request #19819 from OPEN-DSI/new-invoice-propagate-extrafields-on-credit-note 
NEW pre-filled extra fields with slected credit note
 2022-01-23 20:58:45 +01:00
Alexandre SPANGARO
573d45fec8 Merge remote-tracking branch 'upstream/develop' into 15a14 2022-01-21 10:47:27 +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
Alexandre SPANGARO
22e4ea63ea Merge remote-tracking branch 'upstream/develop' into 15a14 2022-01-13 22:30:05 +01:00
Alexandre SPANGARO
6d1f5e1ef1 NEW Add possibility to create contract from invoice 2022-01-13 22:29:48 +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
lvessiller
2d9c46ed3a NEW pre-filled extra fields with slected credit note 2022-01-12 12:22:43 +01:00
Gauthier PC portable 024
6799d48944 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-01-11 09:59:25 +01:00
Gauthier PC portable 024
1910423684 FIX : conf name is MAIN_ADD_LINE_AT_POSITION 2022-01-11 09:54:27 +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
Alexandre SPANGARO
960aaded8e NEW Thirdparty - Add rules customer accountancy code is mandatory to validate invoice 2022-01-09 21:08:06 +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
Laurent Destailleur
7665b9d505 FIX Debug report 2021-12-18 21:13:22 +01:00
Laurent Destailleur
6be499e921 Fix report 2021-12-18 20:06:27 +01:00
Laurent Destailleur
9a253d50c9 Fix report 2021-12-18 19:23:03 +01:00
Laurent Destailleur
bf441dda14 Fix report of expense-income must be without tax in debt 2021-12-18 18:11:28 +01:00
Laurent Destailleur
9db9c5eecd Fix tooltip 2021-12-18 15:34:12 +01:00
Laurent Destailleur
3cf59ba67f Fix missing button to create new record (Look and feel) 2021-12-18 14:55:35 +01:00
Laurent Destailleur
e4dede7aba
Merge pull request #19605 from atm-jpb/14_fix_bank_restrictedArea 
Fix : add  info for acces right  on compta/ bank / info
 2021-12-16 17:35:31 +01:00
Laurent Destailleur
15b85258e8
Merge pull request #19634 from atm-gregr/FIX_Info_Tab_returns_Record_not_found 
FIX :  info tab on customer invoice record not found
 2021-12-16 17:05:22 +01:00
Laurent Destailleur
e9b7fd0ef8
Update info.php 2021-12-16 17:05:12 +01:00
Laurent Destailleur
dc1118a3df
Update info.php 2021-12-16 17:04:25 +01:00
Laurent Destailleur
9465edd8ec Add warning making payment if pending direct debit or credit trans 2021-12-16 14:09:56 +01:00
Laurent Destailleur
f1af5a41bf Fix several pb with down payments 2021-12-16 12:53:46 +01:00
Laurent Destailleur
43e682b56f Fix several pb with down payments 2021-12-16 12:33:45 +01:00
Jay Yeo
41e4e70c6e Fix author searching include first and last name 2021-12-16 16:28:45 +07:00
atm-gregr
cc12baed57 fix info tab on customer invoice record not found 2021-12-16 10:19:42 +01:00
javieralapps4up
aeb16d69d1
FIX: When creating an invoice, extrafields with visibility = 4 are displayed 
When creating an invoice, extrafields with visibility = 4 are displayed
 2021-12-14 17:15:18 +01:00
Laurent Destailleur
d0bc32047d FIX Create and clone negative social contribution 2021-12-13 18:11:17 +01:00
jpb
ac8538a812 add info for acces right 2021-12-13 16:53:34 +01:00
Laurent Destailleur
9624b9aa59 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-12-09 18:03:38 +01:00
Laurent Destailleur
eacc5f0f0a Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/repair.php
 2021-12-09 18:03:27 +01:00
Laurent Destailleur
e3932377a6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
 2021-12-09 17:58:57 +01:00
Laurent Destailleur
290ce46948
Merge pull request #19584 from javieralapps4up/develop 
FIX In the card of a direct debit, if you change the limit, it gets disordered and vice versa
 2021-12-09 17:36:21 +01:00
Laurent Destailleur
d80f83caf4 Clean code 2021-12-09 17:19:31 +01:00
Laurent Destailleur
9462481e83 Doc 2021-12-09 14:51:35 +01:00
Laurent Destailleur
6b9636c3b8 FIX deletion of direct debit or credit transfer 2021-12-09 12:54:18 +01:00
Laurent Destailleur
ecf98530bb Debug SEPA payment module 2021-12-09 12:42:04 +01:00
stickler-ci
93356d9dc4 Fixing style errors. 2021-12-09 10:25:58 +00:00
javieralapps4up
0c2dce372f
FIX In the card of a direct debit 
FIX In the card of a direct debit, if you change the limit, it gets disordered and vice versa
 2021-12-09 11:24:03 +01:00
Laurent Destailleur
7ce6009958 Removed deprecated option 2021-12-09 09:53:32 +01:00
Maxime Kohlhaas
1123bf3cde Fix #18586 : special char "…" not allowed in XML file and added by dol_trunc 2021-12-09 09:34:00 +01:00
Laurent Destailleur
22c271966d Fix the existing method dolEscapeXML should be enough. 2021-12-08 19:14:02 +01:00
Laurent Destailleur
7c2fbe4923
Merge pull request #19558 from yaslama/sepa_illegal_chars 
Remove illegal characters in SEPA XML
 2021-12-08 18:57:06 +01:00
Laurent Destailleur
69cd7ae2ab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/don/card.php
	htdocs/public/test/badges.php
	htdocs/public/test/test_exec.php
 2021-12-08 18:27:03 +01:00
Laurent Destailleur
c3bfd5caa4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/adherents/type.php
	htdocs/asset/type.php
	htdocs/categories/edit.php
	htdocs/comm/action/card.php
	htdocs/compta/bank/card.php
	htdocs/contact/card.php
	htdocs/contact/list.php
	htdocs/core/class/extrafields.class.php
	htdocs/don/card.php
	htdocs/product/stock/card.php
	htdocs/projet/card.php
	htdocs/projet/tasks/task.php
	htdocs/user/group/card.php
 2021-12-08 18:21:20 +01:00
Laurent Destailleur
f1dac82a53 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/adherents/card.php
	htdocs/categories/edit.php
	htdocs/contact/card.php
	htdocs/core/class/extrafields.class.php
	htdocs/product/stock/card.php
 2021-12-08 17:56:05 +01:00
Laurent Destailleur
106b8ceec5
Merge pull request #19574 from Hystepik/develop#5 
Fix php8.0 warnings
 2021-12-08 14:36:42 +01:00
Laurent Destailleur
b4de28f1db
Update index.php 2021-12-08 14:36:34 +01:00
Laurent Destailleur
6886cca1fa CSS 2021-12-07 02:35:46 +01:00
Laurent Destailleur
1caaa335d1 Fix missing section with files on social contribution page 2021-12-06 18:18:31 +01:00
Yaacov Akiba Slama
990081ce21 Remove illegal characters in SEPA XML 2021-12-06 16:54:08 +02:00
Quentin VIAL-GOUTEYRON
826bde0656 FIX set optional from post 2021-12-06 11:19:12 +01:00
Laurent Destailleur
075faded47 FIX list of categories in stats of supplier invoices 
Conflicts:
	htdocs/compta/facture/stats/index.php
 2021-12-02 18:48:15 +01:00
lmarcouiller
b732d80ca5 Fix php 8.0 warnings 2021-12-02 15:56:34 +01:00
Laurent Destailleur
10e126eb69 Clean code on pdf templates 2021-12-02 10:43:44 +01:00
Laurent Destailleur
bacf569e0b Fix phpcs 2021-12-01 17:33:26 +01:00
Laurent Destailleur
c6a071622a Avoid a useless select 2021-12-01 15:26:53 +01:00
Laurent Destailleur
259418d1dd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-12-01 12:10:14 +01:00
Laurent Destailleur
8bace4c64e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-11-30 16:24:42 +01:00
Laurent Destailleur
a298a845f1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/memory.lib.php
	htdocs/langs/en_US/holiday.lang
	htdocs/ticket/card.php
 2021-11-30 16:24:18 +01:00
Laurent Destailleur
3de3adad74 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/ajax/objectonoff.php
 2021-11-30 16:11:12 +01:00
Laurent Destailleur
87a66c7bf0 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-11-30 15:57:14 +01:00
Laurent Destailleur
d84d09556c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-11-30 15:55:57 +01:00
Laurent Destailleur
7937a798b7
Merge pull request #18331 from marc-dll/12.0_FIX_invoice_multicurrency_discount 
FIX: multicurrency: fields in discount unitialized when creating deposit
 2021-11-30 14:23:37 +01:00
Christian Foellmann
6608f5f0d8 update all script tags to be uniform. language="javascript" removed 
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
 2021-11-29 15:09:18 +01:00
Laurent Destailleur
1fa3e9f37d Look and feel v15 2021-11-29 01:13:43 +01:00
Laurent Destailleur
81e7483911 css 2021-11-28 23:51:20 +01:00
Frédéric FRANCE
308998e21c
Merge remote-tracking branch 'upstream/develop' into productmerge 2021-11-28 21:14:12 +01:00
Laurent Destailleur
2d92130c1e External backups can be downloaded from the "About info page". 2021-11-28 19:25:58 +01:00
Laurent Destailleur
bf1dfac629 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/errors.lang
	htdocs/product/stock/movement_list.php
 2021-11-25 21:54:06 +01:00
Laurent Destailleur
971c892d98 Fix filter on recurrig field 2021-11-25 14:20:31 +01:00
Laurent Destailleur
78f94b1c76 Fix css and label for recurring invoices 2021-11-25 14:17:20 +01:00
Quentin VIAL-GOUTEYRON
632147ad88 object->id is always empty 2021-11-24 12:04:18 +01:00
Frédéric FRANCE
99cddfa235
can merge products but experimental 2021-11-23 22:36:14 +01:00
Frédéric FRANCE
d601f62194
can merge products but experimental 2021-11-23 21:38:29 +01:00
Gauthier PC portable 024
2c2f456827 Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-23 11:10:01 +01:00
Gauthier PC portable 024
74f5c092dc FIX : use $linecount = count($this->lines); 2021-11-23 10:44:43 +01:00
Frédéric FRANCE
dc3bfcfb87
can modify tooltip by reference 2021-11-22 19:57:26 +01:00
Gauthier PC portable 024
e02405edc9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2021-11-22 16:23:26 +01:00
Gauthier PC portable 024
9840c1e0fa Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-22 16:17:55 +01:00
Gauthier PC portable 024
e75b6ae0b4 FIX : it's better with an input number 2021-11-22 16:13:46 +01:00
Laurent Destailleur
e8f7b755f1 Standardize code 2021-11-22 12:18:15 +01:00
Laurent Destailleur
441af6b6fb Fix add rel="noopener noreferrer" 2021-11-22 02:35:55 +01:00
lvessiller
cdde6ecf94 NEW add form confirm hook in paiement card 2021-11-18 12:17:02 +01:00
lvessiller
ef447bacbf NEW add form confirm hook in paiement card 2021-11-18 12:12:30 +01:00
Gauthier PC portable 024
23249751d5 FIX : reorder all lines when delete document line everywhere 2021-11-17 12:10:12 +01:00
Gauthier PC portable 024
72614ecc0d Merge branch 'NEW/addline_with_position_choice_develop' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-16 16:43:01 +01:00
Gauthier PC portable 024
375dcf7028 FIX : dev name 2021-11-16 16:42:48 +01:00
stickler-ci
19171d4f8e Fixing style errors. 2021-11-16 15:15:55 +00:00
Gauthier PC portable 024
f664a977c6 Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-16 16:05:17 +01:00
Gauthier PC portable 024
c55008e8af NEW : insert_discount() functions handle 2021-11-16 16:02:55 +01:00
Gauthier PC portable 024
9d41c1390d Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-16 14:20:24 +01:00
Gauthier PC portable 024
1e0d7d92a9 NEW : addline with position choice when MAIN_VIEW_LINE_NUMBER is enabled 2021-11-16 14:09:18 +01:00
Laurent Destailleur
47f32ef19b NEW Can modify amount when cloning a social contribution 2021-11-15 19:40:26 +01:00
Alexandre SPANGARO
15115a133d Merge remote-tracking branch 'upstream/develop' into 15a30 2021-11-15 04:26:30 +01:00
Alexandre SPANGARO
ce8b94a625 Translation 2021-11-15 04:26:14 +01:00
Laurent Destailleur
55e089118c Fix trans 2021-11-13 15:19:03 +01:00
Laurent Destailleur
21c2dba922 Fix phpcs 2021-11-11 19:06:55 +01:00
Laurent Destailleur
32185beec5
Merge pull request #19338 from aspangaro/15a30 
GNU version 3
 2021-11-11 14:39:43 +01:00
Laurent Destailleur
8997368e76
Merge pull request #19347 from frederic34/patch-1 
error display
 2021-11-11 14:39:06 +01:00
Laurent Destailleur
28aa17e4fd FIX calculation of balance in conciliation page on desc sorting. 2021-11-11 14:27:17 +01:00
Laurent Destailleur
67baaeb5de Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-11-11 13:51:19 +01:00
Laurent Destailleur
0443302c3d FIX calculation of balance in conciliation page on desc sorting. 2021-11-11 13:49:21 +01:00
Laurent Destailleur
fd3fd9d945 Fix getpost 2021-11-11 13:46:58 +01:00
Frédéric FRANCE
06e6479a12
Update cashcontrol_card.php 2021-11-10 12:24:53 +01:00
Frédéric FRANCE
005254ad34
Update cashcontrol_card.php 2021-11-10 12:21:03 +01:00
Frédéric FRANCE
e5d40bf464
error display 2021-11-10 12:06:39 +01:00
Alexandre SPANGARO
d611b99d95 GNU version 3 2021-11-09 03:01:48 +01:00
Laurent Destailleur
9f8e21bc2c Fix filter on dates 2021-11-08 20:39:52 +01:00
Laurent Destailleur
d28edae460 Fix idate must be jdate 2021-11-08 20:11:32 +01:00
Laurent Destailleur
ebdcff3b49 FIX filter for export of accounting documents 2021-11-08 20:07:03 +01:00
Laurent Destailleur
cb65903537 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/langs/en_US/bills.lang
 2021-11-08 03:09:30 +01:00
Laurent Destailleur
e8b3875e2e FIX bad sign of amount stored for multicurrency columns on credit notes 2021-11-08 02:57:21 +01:00
Laurent Destailleur
2b6d296e63 Rename var 2021-11-05 13:58:11 +01:00
kamel
d91c24233c NEW: Can show Paid button if invoice or supplier invoice has no payments with global INVOICE_CAN_FORCE_PAID_WHEN_NO_PAIEMENTS and SUPPLIER_INVOICE_CAN_FORCE_PAID_WHEN_NO_PAIEMENTS 2021-11-02 16:43:09 +01:00
Laurent Destailleur
1d1e75683d
Merge pull request #19183 from frederic34/patch-5 
fix warning
 2021-10-31 17:47:23 +01:00
Laurent Destailleur
216eb7bd5a
Merge pull request #19185 from frederic34/bankentrieslist 
fix warnings in bankentries list
 2021-10-31 17:47:14 +01:00
Laurent Destailleur
43b4a783a5
Merge pull request #19184 from frederic34/patch-7 
fix search
 2021-10-31 17:47:05 +01:00
Laurent Destailleur
a635dc6df3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/bookmarks/card.php
 2021-10-31 16:50:34 +01:00
Laurent Destailleur
c73c962459
Merge pull request #19220 from frederic34/patch-4 
remove duplicate code
 2021-10-31 16:47:33 +01:00
Laurent Destailleur
d891dd8ddc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/stocks.lang
	htdocs/product/stats/card.php
	htdocs/projet/element.php
	htdocs/salaries/card.php
 2021-10-31 16:19:10 +01:00
Laurent Destailleur
da4fe03be7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/html.formticket.class.php
	htdocs/ticket/card.php
 2021-10-31 14:37:33 +01:00
Laurent Destailleur
ca8dab36a3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.formticket.class.php
	htdocs/core/modules/modAdherent.class.php
	htdocs/core/modules/modProjet.class.php
 2021-10-31 14:33:44 +01:00
Laurent Destailleur
6d918ad1c7 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-10-31 14:24:19 +01:00
Laurent Destailleur
3dcd1aa05d
Update info.php 2021-10-31 14:02:34 +01:00
Laurent Destailleur
8dfe4fe05f
Update note.php 2021-10-31 14:02:14 +01:00
Laurent Destailleur
65d59405da
Update document.php 2021-10-31 14:01:56 +01:00
Laurent Destailleur
0e2e8fe27f
Update contact.php 2021-10-31 14:01:40 +01:00
Laurent Destailleur
fe7e1d4118 Look and feel v15 2021-10-29 09:40:38 +02:00
Marc de Lima Lucio
eb8d7f92c3 FIX: invoice: inpossible to create an invoice because of very bad check + warnings when trying to print tabs for invoice with no ID 2021-10-28 15:26:40 +02:00
Frédéric FRANCE
dc15d09f12
remove duplicate code 2021-10-27 09:37:22 +02:00
Laurent Destailleur
e9ba9fc103 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
 2021-10-26 13:52:00 +02:00