Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 35 Branches 179 Tags 1.7 GiB
e3a0220658
Commit Graph

12406 Commits

Author SHA1 Message Date
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
Vincent Dieltiens
e58d783ced add comment to parameter 2022-01-06 11:14:13 +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
Vincent Dieltiens
9ef2735520 Adds import for customer invoices and invoices lines 2021-12-07 09:33:18 +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
03c24b2274 FIX: deposit payment terms: getDictvalue() renamed to getDictionaryValue() 2021-10-28 16:51:59 +02:00
Marc de Lima Lucio
668088a63f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2021-10-28 15:54:18 +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
Laurent Destailleur
da2ce063b3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/contact/card.php
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
	htdocs/product/card.php
	htdocs/public/emailing/mailing-unsubscribe.php
 2021-10-26 13:42:30 +02:00
Laurent Destailleur
fde44f2792 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
 2021-10-26 13:29:47 +02:00
Laurent Destailleur
181991ee47 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-10-26 13:10:23 +02:00
Scrutinizer Auto-Fixer
5567310e44 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-10-25 20:07:31 +00:00
Laurent Destailleur
ad2e567571 Fix bug huntr.dev 2021-10-25 15:32:10 +02:00
Frédéric FRANCE
b1555bc4fc
fix set categories for bank line 2021-10-24 17:06:37 +02:00
Frédéric FRANCE
71541fa299
fix warnings in bankentrie list 2021-10-24 16:52:02 +02:00
Frédéric FRANCE
f6cd0818b3
fix warnings in bankentrie list 2021-10-24 16:47:01 +02:00
Frédéric FRANCE
de312cf8b4
Update bankentries_list.php 2021-10-24 16:39:57 +02:00
Frédéric FRANCE
c21593a5ab
fix search 2021-10-24 16:28:18 +02:00
Frédéric FRANCE
ead9b396c6
fix warning 2021-10-24 16:02:59 +02:00
Laurent Destailleur
9cd59bf2c4
Merge pull request #18508 from henrynopo/patch-3 
NEW Additional reason for Customer's partial payment - bank fees
 2021-10-24 12:54:19 +02:00
Laurent Destailleur
f2cd7a7a56 Removed the div class="ficheaddleft" 2021-10-24 00:37:37 +02:00
Laurent Destailleur
6ad9eb8ef1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/class/api_products.class.php
	htdocs/recruitment/recruitmentcandidature_list.php
	htdocs/recruitment/recruitmentjobposition_list.php
 2021-10-24 00:02:15 +02:00
Laurent Destailleur
f1f00be99c
Merge pull request #19160 from frederic34/comptacashcontrol 
fix warnings
 2021-10-23 22:45:55 +02:00
Laurent Destailleur
321cfb3811
Update cashcontrol_list.php 2021-10-23 22:44:37 +02:00
Scrutinizer Auto-Fixer
f7a41f1848 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-10-23 20:22:10 +00:00
Frédéric FRANCE
b9075660af
fix warnings 2021-10-23 22:15:23 +02:00
Laurent Destailleur
ce4fe3f400 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-23 18:33:47 +02:00
Laurent Destailleur
6832893cb8
Merge pull request #19143 from andreubisquerra/develop 
TakePOS Split Sale fixes and improvements
 2021-10-23 17:25:53 +02:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Norbert Penel
e2ff96a096
FIX #18835 : addition of number + unsure string 
risky, may produce a warning
 2021-10-23 16:47:10 +02:00
andreubisquerra
85cc5851ef
BUG When load a draft invoice from history I can't add products 2021-10-23 16:07:47 +02:00
Laurent Destailleur
6ec19bca9d
Merge pull request #19128 from frederic34/warnfixes 
fix warnings
 2021-10-23 11:38:03 +02:00
Hystepik
67711bdea9
Merge branch 'develop' into develop#3 2021-10-23 10:59:36 +02:00
Lucas Marcouiller
0270d1c1b7 fix syntax 2021-10-23 10:57:21 +02:00
Lucas Marcouiller
953a56b08c Fix: PHP 8.0 Warnings 2021-10-23 10:57:03 +02:00
Frédéric FRANCE
cad2cf9b6f
fix warnings 2021-10-23 07:20:30 +02:00
Frédéric FRANCE
9bd31d2b85
fix warnings 2021-10-23 07:13:08 +02:00
Laurent Destailleur
67f5ef913e
Merge pull request #19037 from aspangaro/14p24 
FIX Accountancy simplified - Salaries are not present in report
 2021-10-22 22:54:23 +02:00
Laurent Destailleur
900d7512f2
Merge pull request #19121 from frederic34/fixrightswarning 
fix multiple warnings
 2021-10-22 22:47:28 +02:00
Frédéric FRANCE
46c4f28478
fix multiple warnings 2021-10-22 22:15:59 +02:00
Laurent Destailleur
c81bf68578 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/compta/cashcontrol/cashcontrol_list.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/modulebuilder/index.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/class/api_products.class.php
 2021-10-22 15:56:44 +02:00
Frédéric FRANCE
c789b12715 fix more than one extrafield cause bug sql 2021-10-22 11:07:38 +02:00
Florian HENRY
6c71cc1e14 better correction from modulebuilder source of #19081 2021-10-22 11:03:35 +02:00
Alexandre SPANGARO
0c8291b60f Fix INNER JOIN & Add urlencode() 2021-10-22 04:35:23 +02:00
Laurent Destailleur
6c870bb3d1
Merge pull request #19059 from FHenry/fix_introduced_scrutinizer 
fix: scrutinizer
 2021-10-21 22:52:20 +02:00
Florian HENRY
10a518749d fix: scrutinizer 2021-10-21 16:46:04 +02:00
Alexandre SPANGARO
d2b96fe0f6 Correct link to salary list with user search 2021-10-21 06:08:48 +02:00
Alexandre SPANGARO
a1c0e1ad1f Better fix with backward compatibility with old salary module 2021-10-21 05:45:37 +02:00
Alexandre SPANGARO
be7c1c8a23 Typo & translation 2021-10-21 05:18:56 +02:00
Alexandre SPANGARO
02bb39d438 FIX Accountancy simplified - Salaries are not present in report 2021-10-21 05:06:50 +02:00
JC Prieto
0756a01002
Fix card.php 
Error adding localtax
 2021-10-20 19:33:28 +02:00
Laurent Destailleur
e43b33028c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
 2021-10-20 15:06:10 +02:00
Laurent Destailleur
0cae464bfa Debug v15 2021-10-19 16:47:43 +02:00
Laurent Destailleur
c40a73162e Look and feel v15 2021-10-18 21:20:58 +02:00
Laurent Destailleur
bd73545d08
Merge pull request #18985 from henrynopo/patch-5 
Fix the rounding issue in case of multi-currency
 2021-10-17 13:50:35 +02:00
Laurent Destailleur
48f6ebc344
Merge pull request #18971 from javieralapps4up/develop 
Update factures.php
 2021-10-16 21:24:29 +02:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +02:00
Laurent Destailleur
bd52613331 Fix phpcs 2021-10-16 17:06:10 +02:00
Laurent Destailleur
7ff3e4253f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-16 13:01:27 +02:00
Laurent Destailleur
f8010dfcbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/reception/list.php
	htdocs/takepos/pay.php
 2021-10-16 13:01:03 +02:00
Laurent Destailleur
52890c64c1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/compta/facture/stats/index.php
	htdocs/compta/prelevement/create.php
 2021-10-16 12:53:57 +02:00
Laurent Destailleur
faf80b94e9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/stats/index.php
 2021-10-16 12:49:18 +02:00
Laurent Destailleur
07052196e2 Fix popup message on sepa creation 2021-10-16 12:33:19 +02:00
stickler-ci
fb79aaeb0c Fixing style errors. 2021-10-15 07:19:49 +00:00
Henry
0cb1972674
Update card.php 2021-10-15 15:07:48 +08:00
Laurent Destailleur
a6c3c6b7ec url 2021-10-14 15:56:01 +02:00
Laurent Destailleur
3875d26a2f Fix filter for supplierinvoice stats 2021-10-14 15:55:12 +02:00
Laurent Destailleur
db3d16f080 Fix filter tag for supplier invoice statistics 2021-10-14 15:43:35 +02:00
Laurent Destailleur
bc230dbfc2 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-10-14 12:00:33 +02:00
Laurent Destailleur
371c75e76a FIX list of categories in stats of supplier invoices 2021-10-14 11:58:21 +02:00
stickler-ci
d264bbca3c Fixing style errors. 2021-10-13 12:36:58 +00:00
javieralapps4up
230af38010
Update factures.php 
When the list is greater than $ conf-> liste_limit, no more pages are output
 2021-10-13 14:34:50 +02:00
Marc de Lima Lucio
29768a1c6e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2021-10-13 11:33:04 +02:00
Laurent Destailleur
f3c16ba490
Merge pull request #18905 from indelog/fix_origin_invoice_custom 
Fix creataing invoice originating for custom module object
 2021-10-11 15:26:07 +02:00
Laurent Destailleur
b29bd325fe
Update card.php 2021-10-11 15:25:25 +02:00
atm-florian
57052e2fba FIX PR#18931 Remove useless explicit call to dol_shutdown 2021-10-11 11:10:14 +02:00
Laurent Destailleur
da815476fd Fix edit field from tab bank transfer of invoice 2021-10-11 02:00:12 +02:00
Laurent Destailleur
dbf2c0be7e Fix warning 2021-10-11 01:49:50 +02:00
Laurent Destailleur
a57925b0b7 FIX edition of fields on credit transfer tab 2021-10-11 01:43:36 +02:00
Laurent Destailleur
977a596500 Fix edit link 2021-10-11 01:27:21 +02:00
Laurent Destailleur
7c1d955f6c Fix: avoid to show warning in some cases 2021-10-11 01:23:00 +02:00
atm-florian
2da16ade6c FIX: consistent UX when calling a tab from the invoice card with empty ref / id 2021-10-08 17:24:52 +02:00
lvessiller
be4a00213c FIX optional visibility on create card 2021-10-08 15:58:08 +02:00
Laurent Destailleur
2cb0edb5eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/project/suggestbooth.php
	htdocs/public/project/suggestconference.php
 2021-10-07 11:01:53 +02:00
Laurent Destailleur
9b5909300e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/card.php
	htdocs/fourn/facture/card.php
 2021-10-07 11:00:00 +02:00
Laurent Destailleur
efd44b0ec0 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-10-07 10:57:03 +02:00
Laurent Destailleur
5910d10021 Add hidden option to allow to fix corrupted situations 2021-10-07 10:43:50 +02:00
Laurent Destailleur
e004d39ed4 Fix status of supplier invoice 2021-10-06 19:30:37 +02:00
Laurent Destailleur
ff56415c00
Merge pull request #18903 from aspangaro/15a21 
HTML5 - <font> tag is deprecated, replace by <span>
 2021-10-05 16:51:41 +02:00
Marc de Lima Lucio
4059b64288 FIX: deposit payment terms: langs 2021-10-05 13:00:25 +02:00
Marc de Lima Lucio
cd1eb3b992 FIX: deposit payment terms: PHPDoc 2021-10-05 12:53:04 +02:00
Marc de Lima Lucio
fe62808595 NEW: deposit payment terms: hidden conf to detail lines imported from origin 2021-10-05 12:37:29 +02:00
stickler-ci
39cc2ca5b6 Fixing style errors. 2021-10-05 09:42:52 +00:00
Indelog
6c82b1d0e1 Fix creataing invoice originating for custom module 
This fix the invoice create form when we provide `origin` element in
url. The actual create form overide the value for origin field with
`$objectsrc->element`. This make creation of invoice originating from a custom
module module impossible because we need the module part to instantiate
the class for the custom module object.

This also modify Common Object::fetch Object Linked() to append the
module part for `$sourcetype` and `$targettype` if it not set and object
have module property and it not in core module.
 2021-10-05 11:35:43 +02:00
Alexandre SPANGARO
edf91ce77c HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:41:03 +02:00
Laurent Destailleur
950fccc186
Merge branch 'develop' into NEW_deposit_payment_terms 2021-10-04 19:06:42 +02:00
Marc de Lima Lucio
1b2494855d NEW: deposit payment terms: set required invoice fields + filter payment terms with deposits in select + UI 2021-10-04 18:09:24 +02:00
Marc de Lima Lucio
6580c2e308 FIX: deposit payment terms: correctly untag deposit as created from an origin 2021-10-04 15:07:27 +02:00
Laurent Destailleur
b6ec7ae77a Fix permissions on module PaymentByBankTransfer 2021-10-04 04:36:58 +02:00
Laurent Destailleur
b3cb56f2ef Clean css 2021-10-04 04:14:31 +02:00
Frédéric FRANCE
5c4b55fe7f
doxygen 
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
 2021-10-02 13:35:17 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Laurent Destailleur
2671eeb4e5 Responsive 2021-10-01 18:54:14 +02:00
Laurent Destailleur
673a2982a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/card.php
 2021-09-30 16:32:40 +02:00
Laurent Destailleur
3d4bb66853 Clean code 2021-09-30 15:59:47 +02:00
Laurent Destailleur
608b6f5fa3 Clean code 2021-09-30 15:24:57 +02:00
Laurent Destailleur
8ab9524d0d
Merge pull request #18849 from javieralapps4up/develop 
FIX: #18848 Add Andorra (AD) in the public function useDetailedBBAN () Feature request
 2021-09-30 13:30:02 +02:00
Marc de Lima Lucio
81ddc6c0f6 NEW: deposit payment terms: generate deposit from proposal 2021-09-30 12:41:07 +02:00
Marc de Lima Lucio
8cb6cdf1bc NEW: deposit payment terms: prefill deposit parameters if coming from an origin with the corresponding payment conditions 2021-09-30 11:48:32 +02:00
Laurent Destailleur
fca39d9179 css 2021-09-30 01:15:36 +02:00
javieralapps4up
f6c8932cfa
Update account.class.php 2021-09-28 17:25:31 +02:00
Laurent Destailleur
e15277bb6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-28 17:23:07 +02:00
javieralapps4up
b6bb27e0f7
FIX: #18848 2021-09-28 17:21:22 +02:00
Laurent Destailleur
d3e5e3071b css 2021-09-28 00:26:58 +02:00
Laurent Destailleur
0750d4bb6e Look and feel v14 2021-09-28 00:21:54 +02:00
Laurent Destailleur
338d5ac56e Look and feel v14 2021-09-27 22:12:08 +02:00
Laurent Destailleur
80165811e0 Clean code 2021-09-27 15:50:19 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
0176ab6057 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
 2021-09-27 11:40:47 +02:00
Laurent Destailleur
9b825df158 Clean code 2021-09-27 11:36:40 +02:00
lmarcouiller
f88d12f55d Fix #18809 : error on client tooltip 2021-09-24 11:16:34 +02:00
Laurent Destailleur
38b8ed9092
Merge pull request #18792 from cfoellmann/PR/minor-button-fixes 
another set of cleanup for action buttons
 2021-09-24 01:55:25 +02:00
Laurent Destailleur
27c41946b7
Merge pull request #18182 from atm-jpb/NEW_field_in_service_object 
NEW : field and behavior in product object
 2021-09-23 12:14:09 +02:00
Laurent Destailleur
d38c3028eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
 2021-09-23 02:41:53 +02:00
Laurent Destailleur
128f6d9a5c Fix combo box for thirdparties in invoice stats used bad component 2021-09-23 02:38:53 +02:00
Laurent Destailleur
51b6318f88 FIX Test when date of invoie is in future (pb with TZ and offset) 2021-09-23 02:14:01 +02:00
Laurent Destailleur
60c11725ae Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-23 02:11:11 +02:00
Laurent Destailleur
1e0a7e4342 FIX Test when date of invoie is in future (pb with TZ and offset) 2021-09-23 02:10:39 +02:00
Christian Foellmann
08b395e127 another set of cleanup for action buttons 2021-09-22 08:43:30 +02:00
Laurent Destailleur
e2c389a4a9 Fix delete invoice 2021-09-21 14:23:21 +02:00
Laurent Destailleur
b7105d572a Fix delete of invoice not complete (some fk_invoice still filled) 2021-09-21 14:20:01 +02:00
stickler-ci
d919ef9c4c Fixing style errors. 2021-09-20 17:57:10 +00:00
Yannick Warnier
c40b22facd Add turnover homepage box 2021-09-20 19:41:13 +02:00
Laurent Destailleur
deb1965cd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/compta/paiement/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_list.php
	htdocs/projet/tasks/task.php
	htdocs/public/payment/newpayment.php
 2021-09-20 17:15:12 +02:00
Laurent Destailleur
5c8fb38426 Fix add del* action into list of sensitive actions 2021-09-19 14:41:46 +02:00
Laurent Destailleur
d760686239 Fix case of newtoken() 2021-09-18 22:24:00 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +02:00
Laurent Destailleur
8bdc53f469 Fix Add action classify as sensitive actions 2021-09-18 20:49:24 +02:00
Laurent Destailleur
62b721a904 Add deletecontact as sentitive action 
Replace dol_buildpath with DOL_URL_ROOT
 2021-09-18 19:34:46 +02:00
Laurent Destailleur
3d9be1437a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/list.php
	htdocs/fourn/paiement/list.php
	htdocs/projet/tasks/time.php
 2021-09-17 12:29:58 +02:00
Laurent Destailleur
9a6f4bf6d9
Merge pull request #18708 from javieralapps4up/develop 
Fix #18707 $search_account and $search_paymenttype are not saved when sorting by any field
 2021-09-17 11:51:35 +02:00
Laurent Destailleur
5f5c659b76
Merge pull request #18710 from aspangaro/15a14 
NEW Customer invoice template list - Add input date from/to
 2021-09-17 11:50:29 +02:00
Christian Foellmann
fd1d4d9073 add missing css classes to buttons 2021-09-16 11:33:42 +02:00
Ferran Marcet
7a637104b2 Fix: Not filter by company when it is an external user 2021-09-15 11:29:12 +02:00
Alexandre SPANGARO
cb37c42b5e NEW Customer invoice template list - Add input date from/to 2021-09-14 04:50:05 +02:00
javieralapps4up
e1203d115a
Update list.php 2021-09-14 02:22:30 +02:00
javieralapps4up
0763846805
Bug: #18670 date, account and payment type are lost when sorting by any field 
Filtereds $date, $search_account and $search_paymenttype are not saved when sorting by any field
 2021-09-14 02:15:22 +02:00
javieralapps4up
d7126e8d24
Update list.php 
$search_account and $search_paymenttype are not saved when sorting by any field
 2021-09-14 01:49:24 +02:00
Alexandre SPANGARO
12eb16b8b6 Merge branch '15a12' of https://github.com/aspangaro/dolibarr into 15a12 2021-09-09 22:24:42 +02:00
Alexandre SPANGARO
3ea6314494 Remove $year 2021-09-09 22:24:24 +02:00
stickler-ci
dfe1576b8d Fixing style errors. 2021-09-09 20:18:47 +00:00
Alexandre SPANGARO
f31b7fa3c4 NEW Social Contributions - Add from/to on list 2021-09-09 22:14:26 +02:00
Laurent Destailleur
fa28621709 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/list.php
 2021-09-09 16:11:29 +02:00
Laurent Destailleur
a4d897f609
Merge pull request #18625 from jyhere/patch-1 
Fix : unable to create a direct debit if ics_transfer is empty
 2021-09-09 05:04:06 +02:00
Laurent Destailleur
034c5651c8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/eventorganization/class/conferenceorbooth.class.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/public/eventorganization/attendee_subscription.php
 2021-09-08 22:13:35 +02:00
Laurent Destailleur
4705d41ed2 FIX Relative discount with high nb of decimals 2021-09-08 22:00:16 +02:00
Laurent Destailleur
57a2ea3a53 Fix sql error 2021-09-08 19:49:24 +02:00
Laurent Destailleur
405beb77f5 Fix sql error 2021-09-08 19:45:55 +02:00
Laurent Destailleur
6089de568e Fix sort order 2021-09-07 23:15:06 +02:00
Laurent Destailleur
32a09e9494 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/salaries/paiement_salary.php
 2021-09-07 17:47:00 +02:00
stickler-ci
3537f68c7e Fixing style errors. 2021-09-06 13:24:22 +00:00
jyhere
18da6e6d6f
Update create.php 
Fix : unable to create a direct debit if ics and ics_transfer are empty even though ics_transfer is only used for bank transfer.
 2021-09-06 15:20:47 +02:00
jpb
65a2486f94 merge conflict 2021-09-06 09:43:52 +02:00
Laurent Destailleur
b782e5986a Fix css 2021-09-06 03:29:46 +02:00
Laurent Destailleur
0d6296e417
Merge pull request #18539 from GurvanKervern/undef4 
Undef4
 2021-09-05 01:57:16 +02:00
Laurent Destailleur
ee066ad725 Cast sql var 2021-09-03 21:25:43 +02:00
Laurent Destailleur
c4621f0433 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2021-09-03 18:04:14 +02:00
Laurent Destailleur
2e3b6b2fc8 Backport sql injection fix from develop 2021-09-03 18:00:28 +02:00
Laurent Destailleur
77e9f15360 Work on #18448 2021-09-02 22:52:17 +02:00
Laurent Destailleur
67db0f1bdb Add link "Now" on date selection when cloning social contribution 2021-09-02 19:15:21 +02:00
Laurent Destailleur
8600d8d00d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-01 22:50:06 +02:00
Laurent Destailleur
7c5621a2d4
Merge pull request #18552 from aspangaro/15a12 
NEW Invoice list - Use complete country select field with EEC or not
 2021-09-01 17:17:48 +02:00
Laurent Destailleur
9da82af74f
Merge pull request #18566 from Dolibarr/scrutinizer-patch-2 
Scrutinizer Auto-Fixes
 2021-09-01 13:36:20 +02:00
Laurent Destailleur
19f0db23df Fix scrutinizer bugs 2021-08-31 20:31:05 +02:00
Scrutinizer Auto-Fixer
312ca95feb Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-08-31 18:18:28 +00:00
Laurent Destailleur
0aa4868c34 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-31 13:14:01 +02:00
Alexandre SPANGARO
0132788266 NEW Invoice list - Use complete country select field with EEC or not 2021-08-30 13:56:31 +02:00
henrynopo
3240a3652d
Update card.php 2021-08-30 15:34:59 +08:00
GurvanKervern
b242387c43 Fix undef4-2 
PHP8 warnings
 2021-08-29 22:46:39 +08:00
Laurent Destailleur
81a8efd856 Restore error message 2021-08-28 20:14:23 +02:00
Laurent Destailleur
8870662200
Merge pull request #18475 from OPEN-DSI/v14-fix-invoice-fetch-not-found-syslog-level 
FIX invoice fetch not found syslog debug level instead of error
 2021-08-28 20:12:45 +02:00
Laurent Destailleur
fb8723d884
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons 
replace remaining SubmitCancel buttons
 2021-08-28 18:39:06 +02:00
Laurent Destailleur
5cd609e14e
Merge pull request #18507 from henrynopo/patch-5 
Customer Invoice - Multicurrency Remaining to Pay (updated)
 2021-08-28 17:36:01 +02:00
henrynopo
11497d4bf0
Update card.php 2021-08-28 22:38:17 +08:00
Laurent Destailleur
f825d3fda4 Trans 2021-08-28 13:27:55 +02:00
Laurent Destailleur
51a4d7630f Clean code 2021-08-28 00:56:37 +02:00
Laurent Destailleur
2dd91bf312 Clean code 2021-08-27 23:36:06 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
3b6559b1a6 Clean code by adding cast int. 2021-08-27 18:53:45 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
henrynopo
a79abfd4e0
Update card.php 2021-08-26 10:37:03 +08:00
stickler-ci
bafe22ff77 Fixing style errors. 2021-08-26 02:29:45 +00:00
henrynopo
f6daad4480
Update card.php 2021-08-26 10:25:32 +08:00
Christian Foellmann
f094b4c70c fix up most of the remaining submit inputs 2021-08-24 17:04:17 +02:00
Laurent Destailleur
07ab352877 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
 2021-08-24 16:37:18 +02:00
lvessiller
a4a44faa7f FIX change LOG_DEBUG with LOG_WARNING in syslog and remove sql error in syslog (already done) 2021-08-24 16:21:55 +02:00
Laurent Destailleur
8aa262f302
Merge pull request #18453 from aspangaro/14p15 
FIX #18353 Invoice list translation issue
 2021-08-24 15:29:32 +02:00
Laurent Destailleur
22339a3ed3
Merge pull request #18451 from cfoellmann/PR/form-buttons-function 
improve forms - buttonsSaveCreate()
 2021-08-24 15:26:03 +02:00
Laurent Destailleur
15da97f1da Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/compta/facture/card.php
	htdocs/product/price.php
 2021-08-24 15:05:14 +02:00
Laurent Destailleur
591059847e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/price.php
 2021-08-24 15:00:35 +02:00
Laurent Destailleur
8b2c82dd23 Fix position of fields 2021-08-24 14:27:18 +02:00
Alexandre SPANGARO
efb78d7431 FIX Invoice list - Wrong name for column total_tva 2021-08-24 14:22:36 +02:00
Alexandre SPANGARO
7b829bc899 FIX Field already present in SQL request 2021-08-24 14:22:21 +02:00
Laurent Destailleur
4a32788bff
Merge pull request #18463 from aspangaro/14p14 
FIX Invoice list - Wrong name for column total_tva
 2021-08-24 14:20:57 +02:00
lvessiller
4efe2a0e09 FIX invoice fetch not found syslog debug level instead of error 2021-08-24 08:20:40 +02:00
Laurent Destailleur
a6ddc90d5b Fix responsive 2021-08-23 23:53:58 +02:00
Laurent Destailleur
dc006b0ebb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-08-23 19:44:02 +02:00
Laurent Destailleur
8485fee5f9 Cast numeric into on sql request 2021-08-23 19:33:24 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Alexandre SPANGARO
56c23b79e0 FIX Invoice list - Wrong name for column total_tva 2021-08-22 14:02:33 +02:00
Alexandre SPANGARO
dd51e24afc FIX Field already present in SQL request 2021-08-22 14:01:29 +02:00
Alexandre SPANGARO
8bdf58b942 FIX #18353 Invoice list translation issue 2021-08-20 21:42:43 +02:00
Christian Foellmann
d706c3b1ec use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination 2021-08-20 14:41:30 +02:00
Laurent Destailleur
84073c6373
Merge branch 'develop' into patch-169 2021-08-17 19:31:30 +02:00
Laurent Destailleur
95721d36ab
Merge pull request #17687 from FHenry/dev_massaction_paid_custom_invoice 
NEW : mass action paid customer invoice
 2021-08-17 19:10:49 +02:00
Laurent Destailleur
794db94178
Update list.php 2021-08-17 19:08:55 +02:00
Laurent Destailleur
22e595e572
Merge pull request #18420 from henrynopo/patch-1 
Customer Invoice - Multicurrency Remaining to Pay
 2021-08-17 15:26:36 +02:00
Laurent Destailleur
92d6ad9597 Removed old simple POS module ('cashdesk' module) 2021-08-17 04:57:53 +02:00
Laurent Destailleur
352b413a17 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 02:12:22 +02:00
Laurent Destailleur
eba87ab295 FIX filter on status Draft in modulebuilder 2021-08-17 02:09:38 +02:00
stickler-ci
b92fe38bc0 Fixing style errors. 2021-08-16 01:47:49 +00:00
henrynopo
9a65cbeab7
Customer Invoice - Multicurrency Remaining to Pay 
Added the remainder to be paid in multicurrency mode.
 2021-08-16 09:39:09 +08:00
Laurent Destailleur
896cdf4845
Update list.php 2021-08-11 22:24:07 +02:00
Laurent Destailleur
f9f1440226
Merge branch 'develop' into salesrepresentativeinorderandinvoicelist 2021-08-11 22:22:26 +02:00
Laurent Destailleur
bf72143823 Fix phpcs 2021-08-11 21:04:03 +02:00
Laurent Destailleur
06b50051f1
Merge pull request #18356 from altairisfr/iban 
NEW: add constant MAIN_IBAN_IS_NEVER_MANDATORY
 2021-08-11 21:02:51 +02:00
Marc de Lima Lucio
08f21e3fc4 FIX: invoice validation: when checking if any vat rate has a negative amount, prevent false positives with -1E-14 amounts 2021-08-10 10:23:56 +02:00
Laurent Destailleur
591b4c6793 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-09 16:49:16 +02:00
Laurent Destailleur
6e4fb8dd8b Fix debited instead of credited for bank transfer sepa status 2021-08-09 16:48:36 +02:00
Christophe Battarel
cbc7589559 NEW: add constant MAIN_IBAN_NOT_MANDATORY 2021-08-06 16:35:49 +02:00
Laurent Destailleur
c0c46fb704 FIX Link of download main doc on vat list 2021-08-06 12:20:12 +02:00
Laurent Destailleur
6cefd0a756 FIX Link of download main doc on vat list 2021-08-06 12:18:51 +02:00
jpb
f99ba2c1e1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_field_in_service_object 2021-08-04 17:26:23 +02:00
Laurent Destailleur
0de10cea39 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-04 15:21:31 +02:00
Laurent Destailleur
a9ced1098d Fix lang loaded 2021-08-04 13:51:54 +02:00
Laurent Destailleur
928a2154b3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-04 13:22:55 +02:00
Laurent Destailleur
23ea8d2907 Fix link into message 2021-08-04 13:22:24 +02:00
Laurent Destailleur
354b8aab01 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-04 13:18:33 +02:00
Laurent Destailleur
de228c5687 Fix bad link. Can't delete SEPA bank transfer request 2021-08-04 13:18:03 +02:00
Laurent Destailleur
6a31d4657b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-04 13:12:46 +02:00
Laurent Destailleur
bec87f5739 Fix translation ICS 2021-08-04 13:12:07 +02:00
Laurent Destailleur
a84c994368 Fix no tooltip on link in error message 2021-08-04 12:43:36 +02:00
Laurent Destailleur
bf49309d58 Fix css 2021-08-04 12:41:27 +02:00
Laurent Destailleur
ce0d9f3b17 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-04 12:38:56 +02:00
Laurent Destailleur
aaefb7b324 Fix css 2021-08-04 12:38:28 +02:00
Laurent Destailleur
6dc8024d87 Fix title 2021-08-04 12:30:48 +02:00
Laurent Destailleur
d1af127c81 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-04 12:29:11 +02:00
Laurent Destailleur
4dfc8bab93 Fix bad title 2021-08-04 12:28:13 +02:00
Marc de Lima Lucio
9d234a8541 FIX: multicurrency: fields in discount unitialized when creating deposit 2021-08-03 18:32:22 +02:00
Laurent Destailleur
ede571dcfe Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2021-08-03 17:08:49 +02:00
Laurent Destailleur
1c981ccb9d Fix look and feel v14 2021-08-03 17:03:34 +02:00
Laurent Destailleur
d0c57dac34 FIx #18217 - Salary - link 'salary' of bank_url not managed 2021-08-03 15:02:09 +02:00
Laurent Destailleur
0058e32207 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-02 19:03:38 +02:00
Laurent Destailleur
eced1c824a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/core/class/html.form.class.php
	htdocs/projet/tasks/time.php
 2021-08-02 18:47:09 +02:00
Laurent Destailleur
d822421e10 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/accountancy/tpl/export_journal.tpl.php
	htdocs/projet/tasks/time.php
 2021-08-02 18:31:26 +02:00
Laurent Destailleur
61e3a57de7 Fix label 2021-08-02 18:23:05 +02:00
Laurent Destailleur
8077fae42e Code comment 2021-08-02 17:56:58 +02:00
Alexandre SPANGARO
262dd1600b FIX: Invoice - Missing button to reopen an abandoned situation invoice 2021-07-29 06:23:12 +02:00
stickler-ci
2f0ba41a53 Fixing style errors. 2021-07-20 13:35:10 +00:00
jpb
1237c5ba55 add msg to formconfirm on propal invoice and commande 2021-07-20 14:46:56 +02:00
BENKE Charlene
1a23cfc6f9
Update list.php 2021-07-19 10:01:11 +02:00
Laurent Destailleur
638a66fbb9 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/main.lang
 2021-07-14 14:49:06 +02:00
Laurent Destailleur
b552c6b4fe Fix status color 2021-07-14 14:32:05 +02:00
Laurent Destailleur
af99cab839 CSS 2021-07-13 13:46:20 +02:00
Laurent Destailleur
d91051488c
Merge pull request #18125 from fr69400/develop 
NEW add hookmanager on note pages
 2021-07-11 20:25:16 +02:00
stickler-ci
a8752bf097 Fixing style errors. 2021-07-11 07:46:34 +00:00
fr69400
c7ad0a59c9
Update note.php 2021-07-11 09:45:38 +02:00
stickler-ci
4272f93aa4 Fixing style errors. 2021-07-09 16:41:41 +00:00
fr69400
e45d5c1d0d NEW add hookmanager on note pages 2021-07-09 18:36:21 +02:00
Laurent Destailleur
af8c973050 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-09 13:35:08 +02:00
Laurent Destailleur
b7c42c70ef Fix date for planned entries 2021-07-09 13:33:37 +02:00
Laurent Destailleur
f286017cab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-06 19:03:55 +02:00
Laurent Destailleur
82e96016cd
Merge pull request #18092 from fappels/14_fix_php8_part3 
Fix php8 warning
 2021-07-06 18:52:05 +02:00
Laurent Destailleur
adec77e449 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-05 18:47:24 +02:00
Laurent Destailleur
abb1ad6bf0 Fix sql injection 2021-07-05 18:46:27 +02:00
Francis Appels
1333ca3660 Fix php 8 warning on not set field keys 2021-07-05 14:51:34 +02:00
Laurent Destailleur
5779a56ae0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-04 21:23:53 +02:00
Laurent Destailleur
7013f01a41 Fix look and feel v14 2021-07-04 21:14:46 +02:00
Laurent Destailleur
f6efe51032 Fix trouble with product id = -1 2021-07-04 21:02:02 +02:00
Laurent Destailleur
0cccfb1cee Fix phpcs v14 2021-07-04 19:23:04 +02:00
Laurent Destailleur
ab1ba5bc6a css 2021-07-03 19:26:04 +02:00
Laurent Destailleur
9b7c0a9246 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2021-07-03 18:32:31 +02:00
Laurent Destailleur
6ae1d192e4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/card.php
 2021-07-02 16:14:12 +02:00
Laurent Destailleur
01cf608ef4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-07-02 16:06:48 +02:00
Laurent Destailleur
a7f850dafb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-07-02 16:05:51 +02:00
Laurent Destailleur
6cb5ea6ec2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-30 17:27:20 +02:00
Laurent Destailleur
bda36337cd Prepare fix #yogosha6443 2021-06-30 17:22:36 +02:00
Laurent Destailleur
7c2121c439 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/tpl/objectline_edit.tpl.php
 2021-06-30 15:06:16 +02:00
Laurent Destailleur
51456741d9 FIX Can't edit replacement invoice 
FIX Status of invoice when making a replacement invoice
 2021-06-30 12:43:44 +02:00
atm-arnaud
8772c53723 FIX deposit can create credit note in payment conf 2021-06-30 12:37:21 +02:00
Laurent Destailleur
02a5755876 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/langs/nl_NL/main.lang
 2021-06-29 19:59:51 +02:00
Laurent Destailleur
04148dd5fb
Merge pull request #17789 from aspangaro/14b10 
NEW Add field date from/to in customer payment list
 2021-06-29 19:54:12 +02:00
Laurent Destailleur
56787bc292
Update card.php 2021-06-29 19:14:03 +02:00
Francis Appels
1b7b45d72a Merge remote-tracking branch 'Dolibarr/14.0' into 14_fix_php8_part2 2021-06-29 16:56:48 +02:00
Francis Appels
e4f61d430f Invoice php 8 issue and warnings. 
Seems if ("" < 0) is true in php 8
 2021-06-29 16:33:24 +02:00
Laurent Destailleur
d788e58f67
Merge pull request #18036 from frederic34/codesample 
remove unused code
 2021-06-29 15:47:03 +02:00
lmarcouiller
923a015aac Fix #18014 : update of compta/facture/card.php 2021-06-28 11:38:34 +02:00
Frédéric FRANCE
58701bef5d
remove unused code 2021-06-26 21:10:59 +02:00
Laurent Destailleur
67e7556f70
Merge pull request #18032 from OPEN-DSI/new-invoice-create-from-clone-errors 
NEW get errors on create invoice from clone
 2021-06-26 11:53:45 +02:00
Laurent Destailleur
bc816f253c Fix tooltip 2021-06-26 02:07:18 +02:00
Laurent Destailleur
12d591b848 css 2021-06-26 00:18:46 +02:00
Laurent Destailleur
ccffb36a37 CSS 2021-06-26 00:14:53 +02:00
Laurent Destailleur
6e3647af2c Debug v14 2021-06-26 00:08:19 +02:00
Laurent Destailleur
d2485033d7 Fix deletion of template invoice 2021-06-25 23:10:42 +02:00
lvessiller
24acc82ca6 NEW get errors on create invoice from clone 2021-06-25 16:40:39 +02:00
Laurent Destailleur
a657fe2fca Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-23 13:31:40 +02:00
Laurent Destailleur
6db44e66d6 FIX #18006 2021-06-23 13:30:00 +02:00
Laurent Destailleur
acce226c05 Debug cash fence feature (missing report per vat rate) 2021-06-23 13:00:50 +02:00
Laurent Destailleur
11a71d8d2f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
 2021-06-23 11:41:30 +02:00
Laurent Destailleur
034906a129 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
	htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
 2021-06-23 11:30:44 +02:00
Laurent Destailleur
c9d4ccd40a
Merge pull request #17845 from atm-gauthier/fix_libstatus_invoice_in_linked_objects_block 
FIX : need to add payment sum to getlibstatus function in object linked block (bug still exists in 13.0)
 2021-06-23 10:48:22 +02:00
Laurent Destailleur
56212508e7
Update linkedobjectblock.tpl.php 2021-06-23 10:47:23 +02:00
Laurent Destailleur
68b8a6a916 css 2021-06-20 16:35:49 +02:00
Laurent Destailleur
7046791377 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-19 14:16:39 +02:00
Laurent Destailleur
53295a0cb1 Fix phpcs 2021-06-18 01:06:28 +02:00
Laurent Destailleur
88ff0e4795 Fix PHPCS 2021-06-18 00:59:18 +02:00
Laurent Destailleur
834fc289b6 Fix look and feel v14 2021-06-16 20:35:55 +02:00
Frédéric FRANCE
cf9c595568
fix unknown right 
supprimer doesn't exists
 2021-06-16 12:01:52 +02:00
Laurent Destailleur
adfbb9d7d5 Fix VAT column missing 2021-06-15 17:53:25 +02:00
Gauthier PC portable 024
564a3b66c2 FIX : method exists 2021-06-14 17:08:16 +02:00
Scrutinizer Auto-Fixer
55c9f37ffa Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-06-14 13:37:02 +00:00
Laurent Destailleur
3cacad795f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-14 14:26:07 +02:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
Laurent Destailleur
046215f64a Fix PHP8 2021-06-14 02:08:28 +02:00
Laurent Destailleur
aceeb9558f css 2021-06-14 01:13:46 +02:00
Laurent Destailleur
34cebe6aa3 Look and feel v14 2021-06-14 01:11:39 +02:00
Frédéric FRANCE
791e4ab056
fix warning 2021-06-13 15:59:22 +02:00
Laurent Destailleur
a8401ca30d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-12 15:47:18 +02:00
Laurent Destailleur
f13dcb5376 Fix merge 2021-06-12 15:44:03 +02:00
Laurent Destailleur
306b7779ff
Merge branch 'develop' into 11p1 2021-06-11 19:55:37 +02:00
Laurent Destailleur
dd1f49b4b0
Merge pull request #17794 from atm-quentin/FIX_jointure_cabyprod 
Fix jointure cabyprod
 2021-06-11 19:12:29 +02:00
Laurent Destailleur
756786f717 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/fourn/facture/card.php
	htdocs/holiday/list.php
	htdocs/paybox/admin/paybox.php
	htdocs/paypal/admin/paypal.php
	htdocs/product/price.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/permonth.php
	htdocs/projet/activity/perweek.php
	htdocs/stripe/admin/stripe.php
 2021-06-11 19:05:05 +02:00
Laurent Destailleur
eefc6ddf83 Fix phpcs 2021-06-11 18:44:01 +02:00
Laurent Destailleur
4cde4f6162
Merge pull request #17875 from OPEN-DSI/new-doactions-hook-on-bank-card 
NEW do actions hook on bank card
 2021-06-11 18:18:06 +02:00
Frédéric FRANCE
86eea2c4fc
Update list.php 2021-06-10 20:55:00 +02:00
Frédéric FRANCE
3f40a65f26
fix warnings 2021-06-10 20:53:29 +02:00
Laurent Destailleur
1bf63c7862 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/lib/functions.lib.php
 2021-06-10 16:53:09 +02:00
Laurent Destailleur
1950e50c89 Fix test 2021-06-10 16:31:28 +02:00
Laurent Destailleur
c8c9fb7700 FIX #17847 2021-06-10 16:29:30 +02:00
lvessiller
ed53301cec NEW do actions hook on bank card 2021-06-10 16:18:20 +02:00
Alexandre SPANGARO
08186fdff1 Fix warning - search_societe is already present 2021-06-10 06:28:09 +02:00
Alexandre SPANGARO
b216c81c60 FIX Customer invoice list - Pagination lost search_date_xxx information 2021-06-10 06:22:03 +02:00
Laurent Destailleur
53af424a3d Fix total tva 2021-06-10 02:12:29 +02:00
Laurent Destailleur
5f925d9e3b Fix total -> total_ht 2021-06-10 02:10:58 +02:00
Laurent Destailleur
ae6d2ba9b5 Fix missing user creation/modif of template invoice 2021-06-10 01:56:20 +02:00
Laurent Destailleur
4c89a1146c Fix popup 2021-06-10 01:13:50 +02:00
Laurent Destailleur
9afe8e54a7 Fix 2021-06-10 00:41:15 +02:00
Laurent Destailleur
7b31ef0ff3 Fix warnings 2021-06-10 00:00:49 +02:00
Laurent Destailleur
16f1210e8a Fix phpcs 2021-06-09 17:51:22 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
cfa268e0d3 Fix we must add total vat on cash fence receipts (Ticket Z) 2021-06-09 04:13:57 +02:00
Laurent Destailleur
f17e7a6979 Add more info 2021-06-09 03:54:19 +02:00
Laurent Destailleur
27f803cab0 Fix receipt of cash fence must contains more legal information 2021-06-09 03:35:22 +02:00
Laurent Destailleur
fa4786a3f6 Fix permission 2021-06-08 16:19:21 +02:00
Laurent Destailleur
1aeb91eb9a FIX entry menus that has been lost in v13 
Look and feel v14
 2021-06-08 13:44:11 +02:00
Frédéric FRANCE
0ea0966b09
Update card.php 2021-06-08 12:01:05 +02:00
Frédéric FRANCE
b1c3a7cf48
avoid fatal error 2021-06-08 10:38:34 +02:00
Gauthier PC portable 024
e64c27e1c3 FIX : need to add payment sum to getlibstatus function in object linked block 2021-06-08 10:27:33 +02:00
Quentin VIAL-GOUTEYRON
2a4f6882c5 Merge branch 'FIX_jointure_cabyprod' of github.com:atm-quentin/dolibarr into FIX_jointure_cabyprod 2021-06-07 10:11:19 +02:00
Quentin VIAL-GOUTEYRON
af913cd29f remove and 2021-06-07 10:10:42 +02:00
stickler-ci
98aa374185 Fixing style errors. 2021-06-07 08:10:05 +00:00
Quentin VIAL-GOUTEYRON
80af5e2216 keep where but remove join 2021-06-07 10:05:24 +02:00
Alexandre SPANGARO
ffb1b232d4 Fix Withdraw - link is missing in llx_bank_url when the debit is rejected 2021-06-06 21:27:48 +02:00
Alexandre SPANGARO
c1757bdbd8 Remove warning 2021-06-06 06:28:38 +02:00
Alexandre SPANGARO
a92bd31ce1 Fix search_datexxx 2021-06-05 07:39:15 +02:00
Alexandre SPANGARO
6922359114 Merge remote-tracking branch 'upstream/develop' into 14b10 2021-06-05 07:22:38 +02:00
Laurent Destailleur
39adaec7eb Fix var not found 2021-06-05 01:29:24 +02:00
Laurent Destailleur
2182e7fd54 Look and feel v14 2021-06-04 14:36:52 +02:00
Laurent Destailleur
27018bd4b4 Fix group by 2021-06-04 14:25:32 +02:00
Laurent Destailleur
bcd028c040
Merge pull request #17739 from fbosman/patch-6 
Update card.php
 2021-06-04 12:57:51 +02:00
Laurent Destailleur
8b5922a0df
Update card.php 2021-06-04 12:57:43 +02:00
Laurent Destailleur
43be7cf996
Update card.php 2021-06-04 12:56:40 +02:00
Laurent Destailleur
292d5f6a15
Update card.php 2021-06-04 12:55:03 +02:00
Laurent Destailleur
b674835d89
Merge pull request #17813 from frederic34/patch-25 
fix warning
 2021-06-04 08:39:20 +02:00
Frédéric FRANCE
0b28587e65
fix warnings 2021-06-03 15:28:47 +02:00
Frédéric FRANCE
e83e399cb6
fix warning 2021-06-03 15:19:54 +02:00
Quentin VIAL-GOUTEYRON
b8b30a9af6 wrong where cabyprodserv 2021-06-02 10:53:04 +02:00
Quentin VIAL-GOUTEYRON
89f6b66c2a wrong join, request too long 2021-06-02 10:32:30 +02:00
Alexandre SPANGARO
3744ccdd28 Look & feel v14 2021-06-01 22:50:55 +02:00
Alexandre SPANGARO
b5904e49a0 NEW Add field date from/to in customer payment list 2021-06-01 22:43:43 +02:00
stickler-ci
dfb2e54750 Fixing style errors. 2021-05-27 14:25:42 +00:00
Frans Bosman
fd2d10d443
Update card.php 2021-05-27 16:23:33 +02:00
stickler-ci
c31530e7ed Fixing style errors. 2021-05-27 10:24:18 +00:00
Frans Bosman
61753791b4
Update card.php 
Add Batchinfo on invoice detail lines if hidden feature INCUDE_BATCHINFO_ON_INVOICE is set
 2021-05-27 12:20:42 +02:00
Laurent Destailleur
4b47611e23 Debug v14 2021-05-25 21:21:09 +02:00
Laurent Destailleur
cfd035e1de css 2021-05-20 21:25:36 +02:00
Laurent Destailleur
91f85abb7e Fix only comment to understand code are allowed 2021-05-20 14:55:37 +02:00
Florian HENRY
d70bbe29b5 fix 2021-05-20 14:03:18 +02:00
Florian HENRY
7a9102ac60 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_massaction_paid_custom_invoice 2021-05-20 14:02:05 +02:00
Florian HENRY
4d7b09ff2a done 2021-05-20 14:00:43 +02:00
Laurent Destailleur
afd9c09c8f
Merge pull request #17685 from FHenry/dev_fix_search_filter_company_Var 
fix: change societe by company varaible name in all file
 2021-05-20 13:54:01 +02:00
Florian HENRY
5e6d6ccf67 same bug on invoie list 2021-05-20 13:45:52 +02:00
Florian HENRY
7c6ac86d32 ongoing 2021-05-20 13:41:23 +02:00
Florian HENRY
62bc6e9e1f on going 2021-05-20 13:15:32 +02:00
Florian HENRY
7874be6e37 bad comment remove 2021-05-20 12:48:18 +02:00
Florian HENRY
d93cf0beb7 fix: change societe by company varaible name in all file 2021-05-20 12:36:26 +02:00
Laurent Destailleur
dbd7292cd6 Replace doubleval into floatval 2021-05-20 09:22:55 +02:00
Sylvain Legrand
a3d1b49c65 Error in list when using alias name of thirdparty 2021-05-19 19:08:58 +02:00
Laurent Destailleur
217ee260c2 css 2021-05-19 15:11:47 +02:00
Laurent Destailleur
cf0da5cee7 css 2021-05-19 15:00:44 +02:00
Anthony Berton
c02e3eed6b checked 2021-05-18 18:45:07 +02:00
Laurent Destailleur
8e39eff180 Look and feel v14 2021-05-18 18:18:00 +02:00
Laurent Destailleur
74f35177ff Fix group by 2021-05-18 13:20:14 +02:00
Laurent Destailleur
2ef713bd5f
Merge branch 'develop' into look_feel_user_author_list 2021-05-18 12:27:30 +02:00
Laurent Destailleur
a34401aacb
Merge pull request #17646 from aspangaro/14b10 
FIX Social contrib. - Missing language file
 2021-05-18 12:16:14 +02:00
Laurent Destailleur
7b9161ec63
Merge pull request #17644 from bb2a/thirdparty_infos_list 
Add popup thirdparty info in list
 2021-05-18 12:15:51 +02:00
Alexandre SPANGARO
9b0988e7be FIX Social contrib. - Missing language file 2021-05-18 08:40:28 +02:00
Laurent Destailleur
b6dbe45242 Fix permissions on page to move position of file 2021-05-18 01:58:54 +02:00
Anthony Berton
70a062e2c1 change position 2021-05-17 23:59:42 +02:00
Anthony Berton
6fe9fe330d delete fetch 2021-05-17 23:54:31 +02:00
Anthony Berton
58db723502 thirdparty info popup list 2021-05-17 23:27:33 +02:00
Anthony Berton
31cd71d8a3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into look_feel_user_author_list 2021-05-17 18:34:41 +02:00
Anthony Berton
68130ec637 Merge branches 'develop' and 'develop' of https://github.com/Dolibarr/dolibarr into salesrepresentativeinorderandinvoicelist 2021-05-17 18:34:20 +02:00
Anthony Berton
09ab930806 sale_representative_order_invoice_list 2021-05-17 18:31:19 +02:00
Anthony Berton
0b7f474dd3 look_feel user author in list 2021-05-17 18:04:21 +02:00
Laurent Destailleur
608e4e8891
Merge pull request #17601 from ptibogxiv/patch-426 
NEW report contact/adresses on credit note from invoice
 2021-05-17 09:12:12 +02:00
Laurent Destailleur
4768729c09 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/core/class/rssparser.class.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
	htdocs/expedition/list.php
 2021-05-17 07:57:32 +02:00
Laurent Destailleur
6bf66adff0 Fix remove some $_REQUEST 2021-05-17 07:27:02 +02:00
stickler-ci
50d4d28c14 Fixing style errors. 2021-05-14 11:54:50 +00:00
Ferran Marcet
ce6df0ee4a FIX: Filter of the dates in the lists is lost 2021-05-14 13:50:12 +02:00
stickler-ci
05ea8761a1 Fixing style errors. 2021-05-13 08:28:14 +00:00
ptibogxiv
b9336570ff
NEW report contact/adresses on credit note from invoice 
keep same contact/adresses from source invoice (ir: usefull for correct notifications)
 2021-05-13 10:26:09 +02:00
Laurent Destailleur
ba6e675273 css 2021-05-12 22:21:20 +02:00
Laurent Destailleur
b5a43c8d1d FIX #17502 2021-05-11 21:31:43 +02:00
Laurent Destailleur
52d4e7e2a8
Merge pull request #17535 from frederic34/uniformizecode 
uniformize supplier cards
 2021-05-11 19:25:26 +02:00
Laurent Destailleur
bccd1b9a41
Update prelevement.php 2021-05-11 19:21:08 +02:00
Frédéric FRANCE
23858f0ab1
fix php8 warning 2021-05-11 18:25:20 +02:00
Frédéric FRANCE
680092cb8a
Merge remote-tracking branch 'upstream/develop' into uniformizecode 2021-05-11 18:09:05 +02:00
Laurent Destailleur
73972bcbd0 More complete log 2021-05-11 10:30:46 +02:00
Frédéric FRANCE
1d38dc11c6
uniformize supplier cards 2021-05-07 21:28:35 +02:00
Laurent Destailleur
907ea1a8bd Fix sql error 2021-05-07 18:21:11 +02:00
Frédéric FRANCE
7897469963
Update account.class.php 2021-05-06 20:34:45 +02:00
Laurent Destailleur
bd5e141d26 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
	htdocs/societe/consumption.php
 2021-05-06 17:07:44 +02:00
Laurent Destailleur
7386a223e8
Update account.class.php 2021-05-06 16:38:34 +02:00
Laurent Destailleur
f2e61ff807 Fix substitution into topic 2021-05-04 18:04:09 +02:00
Florian HENRY
c4e0d8da42 FIX: merge thirparty also work for bank URL entry 2021-05-04 17:28:20 +02:00
Laurent Destailleur
526235d020 Fix substitution of mix html/nohtml 
Fix send email reminder for past due date of invoices
More PHPUnit test
 2021-05-04 13:33:18 +02:00
Laurent Destailleur
c82317c8af Fix missing include 2021-05-04 11:06:24 +02:00
Laurent Destailleur
6e32efdb40 Fix phpcs 2021-05-03 20:22:36 +02:00
Laurent Destailleur
9973085613 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/comm/propal/card.php
	htdocs/compta/bank/releve.php
	htdocs/compta/paiement/rapport.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/reception/card.php
	htdocs/societe/societecontact.php
 2021-05-03 19:36:49 +02:00
Laurent Destailleur
17ea41660f
Merge pull request #17469 from indelog/fix_order_payreport 
Fix show table of pdf payments repports in file order
 2021-05-03 19:19:00 +02:00
Laurent Destailleur
1d2f8b09d9
Update releve.php 2021-05-03 18:55:25 +02:00
WimpyMan
706545081c FIX #17476 releve.php: Fix SQL statement 
Single quotes `'` should be uses instead of double quotes `"` for
string values.
 2021-05-03 18:29:53 +02:00
Indelog
c18848c944 Fix: simplify code with dol_dir_list() 2021-05-03 17:17:44 +02:00
Indelog
dba9b17275 Fix forgot payment filter on file name 2021-05-03 16:00:14 +02:00
Laurent Destailleur
1c95e2b7c7 FIX #17453 2021-05-03 14:58:29 +02:00
Laurent Destailleur
b22f2dd2c8
Merge pull request #17415 from Hystepik/develo#2 
Close #17271 : Replacement of 2 graphes in /compta/index.php
 2021-05-03 13:56:44 +02:00
Laurent Destailleur
d1f11d2e65
Merge pull request #17429 from fr69400/develop 
FIX formAddObjectLine cant be overloaded by hook
 2021-05-03 13:16:45 +02:00
Indelog
9727768192 Fix show table of pdf payments repports in file order 
Use scandir() rather opendir() and readdir() to get a sorted list of
files.
 2021-05-03 09:46:51 +02:00
Laurent Destailleur
e99355a0c2 Clean html 2021-04-30 15:22:17 +02:00
Laurent Destailleur
5a1f2db024 Clean sql 2021-04-30 10:57:21 +02:00
Laurent Destailleur
8e1ba67928 css 2021-04-29 18:04:10 +02:00
Laurent Destailleur
66103303eb Fix html tag 2021-04-29 18:02:24 +02:00
fr69400
96baa1ef49 wrong variable name 2021-04-29 17:36:45 +02:00
fr69400
d9e25c61bb formAddObjectLine cant be overloaded by hook 2021-04-29 15:32:15 +02:00
Laurent Destailleur
655056ed31 Debug v14 2021-04-29 12:10:55 +02:00
lmarcouiller
799d1de830 Update incoice.lib.php and index.php match eldy's requests 2021-04-29 09:31:49 +02:00
Laurent Destailleur
75a8dc28ea
Merge pull request #17261 from aspangaro/14a39 
Maxi debug of societe/product per entity
 2021-04-28 17:06:45 +02:00
Laurent Destailleur
c946e1ad8a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-28 15:25:19 +02:00
Laurent Destailleur
4926ac1e24 Fix make protected method not visible 2021-04-28 15:25:06 +02:00
stickler-ci
762378c044 Fixing style errors. 2021-04-28 11:12:01 +00:00
Gauthier PC portable 024
c25b044da5 FIX : several fixes on salary and vat 2021-04-28 11:56:07 +02:00
lmarcouiller
be22d43c60 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develo#2 2021-04-28 09:24:18 +02:00
Laurent Destailleur
b1d8ca0701 Fix phpcs 2021-04-27 17:45:13 +02:00
lmarcouiller
97633e34f2 Fix : Bug facture.class.php 2021-04-27 16:47:27 +02:00
lmarcouiller
52bf0f0359 Close #17271 : Replament of 2 graph in compta/index.php 2021-04-27 16:02:46 +02:00
Laurent Destailleur
4b204301a9 Enhance logs 2021-04-27 03:25:49 +02:00
Laurent Destailleur
0c1f8b96ef Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-27 02:55:07 +02:00
Laurent Destailleur
0a0b3f414a Fix phpcs 2021-04-27 02:54:33 +02:00
Laurent Destailleur
ea19747bc6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-04-27 02:16:16 +02:00
Laurent Destailleur
2e9cf8d00b Fix phpcs 2021-04-27 02:15:58 +02:00
Laurent Destailleur
c7f38c4cf0 Fix bad var 2021-04-27 02:10:52 +02:00
Laurent Destailleur
098582d7a7 Fix bad merge 2021-04-27 02:09:43 +02:00
Laurent Destailleur
27aa7cdb48 Fix bad merge 2021-04-27 02:08:36 +02:00
Laurent Destailleur
d6cdfcdd8c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/public/members/new.php
 2021-04-27 02:07:48 +02:00
Laurent Destailleur
12a4bc64ad Remove $_REQUEST 2021-04-27 02:01:46 +02:00
Laurent Destailleur
48a50f3b10 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php
 2021-04-27 01:58:19 +02:00
Laurent Destailleur
804eac55e9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-04-27 01:46:04 +02:00
Laurent Destailleur
e82965090f
Merge pull request #17395 from Robin-Yann/13-fix-combo-prospect 
13 fix combo prospect
 2021-04-27 01:18:57 +02:00
Laurent Destailleur
efbed70286
Update card.php 2021-04-27 01:17:26 +02:00
Laurent Destailleur
f54d14bfd6 Add method checkValForAPI to clean data from API input 2021-04-27 01:05:14 +02:00
Laurent Destailleur
fde4beb3b6
Merge pull request #17396 from atm-gauthier/fix_disable_delete_if_payments 
FIX : We must not be able to delete sociale charge, vat or salary if there are payments
 2021-04-26 21:08:29 +02:00
Laurent Destailleur
d138e7410b Clean code 2021-04-26 19:12:23 +02:00
stickler-ci
6387b929cc Fixing style errors. 2021-04-26 12:30:44 +00:00
Robin-Yann
9fc0416664
Update card.php 2021-04-26 14:28:43 +02:00
Robin-Yann
c1f3626cd7
Update card.php 2021-04-26 14:11:24 +02:00
Alexandre SPANGARO
d95be3e08b Merge remote-tracking branch 'upstream/develop' into 14a39 2021-04-26 13:53:16 +02:00
Gauthier PC portable 024
ae1586fcc6 FIX : We must not be able to delete sociale charge, vat or salary if there are payments 2021-04-26 10:48:50 +02:00
Laurent Destailleur
c9d6bc70e8 Clean code 2021-04-26 10:22:28 +02:00
Robin-Yann
676067eafc
Update card.php 2021-04-26 10:21:25 +02:00
stickler-ci
ebd3b00016 Fixing style errors. 2021-04-26 07:24:00 +00:00
Robin-Yann
836b811449
Merge branch 'develop' into 13-fix-combo-prospect 2021-04-26 09:21:32 +02:00
Laurent Destailleur
73c482ca64 Fix escape 2021-04-25 19:36:48 +02:00
Laurent Destailleur
a8939377de Escape string 2021-04-25 19:31:19 +02:00
Laurent Destailleur
389b71bc7e Clean API 2021-04-25 19:21:48 +02:00
Laurent Destailleur
fd2d317b4a Fix #yogosha5881 2021-04-25 15:55:36 +02:00
Laurent Destailleur
6c2d9d3b3c Fix permission to reopen invoice. 2021-04-25 13:17:47 +02:00
Laurent Destailleur
42938ffe31 FIX #yogosha5879 2021-04-24 21:15:09 +02:00
Laurent Destailleur
9f03054fc4 Fix #yogosha5877 2021-04-24 20:52:48 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
Laurent Destailleur
48c26fd614 Fix add option INVOICE_DISALLOW_REOPEN to lock problematic feature 2021-04-24 18:43:24 +02:00
Marc de Lima Lucio
ce022ab36c FIX: payment validation: invoices PDF were no re-generated, make it with correct display options 2021-04-22 15:57:06 +02:00
Marc de Lima Lucio
ee96fb6470 FIX: payment creation: re-generate invoice PDF with correct display options 2021-04-22 15:56:12 +02:00
Alexandre SPANGARO
d27030df3f Merge remote-tracking branch 'upstream/develop' into 14a39 2021-04-20 04:43:14 +02:00
Alexandre SPANGARO
d66540bf00 Revert "Split mod fournisseur" 
This reverts commit 78dbf4f7ff.
 2021-04-20 04:42:51 +02:00
Laurent Destailleur
4797c137e8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-19 21:12:19 +02:00
Laurent Destailleur
294cf6cc31
Merge pull request #17312 from prietojc/patch-16 
Update bonprelevement.class.php
 2021-04-19 21:12:06 +02:00
Laurent Destailleur
d6df32eee9 Add invoice id into EndToEnd to guarantee unicity of value. 2021-04-19 21:10:53 +02:00
Laurent Destailleur
7988aaf88f
Update bonprelevement.class.php 2021-04-19 21:02:29 +02:00
Laurent Destailleur
61df76dd9a Fix pb in date format %a %b when using a negative timezone 
Enhance date management and unit tests.
 2021-04-19 12:48:08 +02:00
Laurent Destailleur
23b11491d2 Can filter also on payment mode 2021-04-19 11:11:01 +02:00
JC Prieto
4329b6b99b
Update bonprelevement.class.php 
Change facture reference by supplier reference
 2021-04-19 11:04:50 +02:00
Laurent Destailleur
83b5a325df Load of template before the loop. 2021-04-19 10:47:12 +02:00
Laurent Destailleur
a74b237a7b Add a schedule dtask to send reminder by email on date due. 2021-04-19 10:35:19 +02:00
Alexandre SPANGARO
78dbf4f7ff Split mod fournisseur 2021-04-17 07:49:19 +02:00
Laurent Destailleur
ce9d707040
Merge pull request #17269 from bb2a/picto_massactions 
Next picto mass actions
 2021-04-16 20:40:19 +02:00
Laurent Destailleur
aec2212b44
Merge pull request #17293 from cmfpmatik/cmfpmatik-patch-16042021 
Update facture list.php
 2021-04-16 20:39:23 +02:00
Oarces DEV
593e23220d
Update list.php 
Add filter for "Bill Short Status Draft" and "Bill Short Status Draft", that they has can be viewed together.
Secretaries appreciate having this overall visibility.
 2021-04-16 14:34:23 +02:00
Laurent Destailleur
db5dcd3e52 NEW When a doc file is shared, link is visible from main page of doc. 2021-04-15 17:56:55 +02:00
Laurent Destailleur
f1d55d38ba Show link to shared file if it exists. 2021-04-15 17:09:15 +02:00
Laurent Destailleur
754b0e9853 Debug v14 2021-04-15 15:30:02 +02:00
Laurent Destailleur
37fa8f4c19 Fix method not found 2021-04-15 15:07:06 +02:00
Laurent Destailleur
bd1aa38c64 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
 2021-04-15 12:04:08 +02:00
Laurent Destailleur
5e2bec9cad Look and feel v14 2021-04-15 02:09:29 +02:00
Laurent Destailleur
e7d64d073a Look and feel v14 2021-04-14 23:14:38 +02:00
Anthony Berton
a612831e28 next_change 2021-04-14 14:45:55 +02:00
Laurent Destailleur
9154e07689 Fix picto for tags 2021-04-14 12:33:53 +02:00
Laurent Destailleur
dcf460e248 Use css on img_picto 2021-04-14 12:28:01 +02:00
Anthony Berton
707bf5adca picto_mass_actions 2021-04-14 10:20:34 +02:00
Alexandre SPANGARO
2f31720896 Maxi debug of societe/product per entity 2021-04-14 04:45:17 +02:00
Laurent Destailleur
4dfc90f8cb
Merge pull request #17256 from OGPayet/fix/ComptaFactureDateClosingOptionPosition 
fix date closing option position
 2021-04-13 23:03:02 +02:00
Laurent Destailleur
358bb87ae2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/projet/card.php
	htdocs/public/payment/newpayment.php
	htdocs/societe/list.php
	htdocs/ticket/document.php
 2021-04-13 20:19:05 +02:00
Pierre Payet
75ed5e45f2 fix date closing option position 2021-04-13 17:21:51 +02:00
Alexandre SPANGARO
44133166de Merge remote-tracking branch 'upstream/develop' into 14a36 2021-04-12 21:35:03 +02:00
Alexandre SPANGARO
4b9bf40a8f move include_once to include when it's a tpl 2021-04-12 21:25:58 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Laurent Destailleur
a68378da3f Fix #yogosha5840 2021-04-12 10:32:41 +02:00
Laurent Destailleur
97ace5e3bb Look and feel v14 2021-04-12 10:19:38 +02:00
Alexandre SPANGARO
80995c34b5 FIX Write right on document 2021-04-12 07:13:05 +02:00
Alexandre SPANGARO
80c6458faa Work on split module fournisseur 2021-04-11 22:25:45 +02:00
Laurent Destailleur
0ab31a8680 Look and feel v14 2021-04-11 13:30:30 +02:00
Laurent Destailleur
2d771704d0 Better suggestion for data after clone of social contribution 2021-04-09 00:36:08 +02:00
Laurent Destailleur
667481acd5 Fix #yogosha5832 - Missin test on permission for /index routes on APIs 2021-04-08 19:05:28 +02:00
Laurent Destailleur
fcc6431896
Merge pull request #17136 from aspangaro/14a35 
NEW: Add deposit on supplier invoice (& somes ajustments)
 2021-04-07 02:51:32 +02:00
Laurent Destailleur
2e862f815a Fix field total_ht 2021-04-07 00:44:01 +02:00
Laurent Destailleur
e23ddb383e css 2021-04-06 23:38:52 +02:00
Laurent Destailleur
7c27ab6121 Fix css 2021-04-06 23:35:30 +02:00