Commit Graph

655 Commits

Author SHA1 Message Date
Laurent Destailleur
2f269c75de Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/fr_FR/bills.lang
2022-07-07 20:12:23 +02:00
Laurent Destailleur
77b1bccea9 Restore old version to fix serious regressions and sql errors 2022-07-07 20:05:22 +02:00
Laurent Destailleur
e60c6ae96d Revert "FIX count elements in invoice list (Issue #21444)"
This reverts commit db863e4db6.
2022-07-07 20:00:03 +02:00
Laurent Destailleur
e10820a350 Revert "FIX sql order"
This reverts commit 3eb3c700b9.
2022-07-07 19:59:37 +02:00
Laurent Destailleur
f9d13290d5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/compta/facture/list.php
2022-07-07 19:15:58 +02:00
lvessiller
3eb3c700b9 FIX sql order 2022-07-06 18:28:40 +02:00
lvessiller
db863e4db6 FIX count elements in invoice list (Issue #21444) 2022-07-06 17:58:01 +02:00
Faustin
20fa31d814 NEW #20650 enabled checkcolumn on left for costumer invoice list 2022-06-24 13:07:28 +02:00
Alexandre SPANGARO
5f5cf4b291 Fix PHP8 2022-06-20 04:28:32 +02:00
Florian HENRY
77d129f79c fix: bad url param search for facrec filter on facture list 2022-06-16 15:05:45 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Laurent Destailleur
4c10c04f9f
Merge pull request #20495 from atm-john/new_fix_regression_select_extrafield_search
FIX : regression select extrafield search + fix function name
2022-05-24 21:55:33 +02:00
Laurent Destailleur
8bacb6c755 Fix name of var 2022-05-22 17:09:08 +02:00
Regis Houssin
28540a85f2 FIX php8 compatibility 2022-05-21 17:36:19 +02:00
Laurent Destailleur
fc718e68ee css 2022-05-10 11:38:56 +02:00
Laurent Destailleur
6592eb5d73 Debug for php 8.1 2022-05-08 18:25:22 +02:00
Laurent Destailleur
fa7254be9a Fix picto and perm 2022-05-03 17:05:14 +02:00
Laurent Destailleur
1a589c5f18
Merge pull request #20656 from FHenry/dev_20652
NEW: Add column template invoice in invoice list
2022-05-01 13:49:02 +02:00
Laurent Destailleur
c96e3bdddf PHP v8 compatibility 2022-04-30 19:50:20 +02:00
Laurent Destailleur
6a2526ae65 Responsive 2022-04-29 19:04:46 +02:00
Florian HENRY
dd85c22927 remove combox search box 2022-04-27 08:50:58 +02:00
Lenin Rivas
8caa45ee80
Show only code multicurrency in lists 2022-04-18 12:22:29 -05:00
Florian HENRY
292df417fe NEW: Add column template invoice in invoice list 2022-04-15 11:32:53 +02:00
Laurent Destailleur
091ca31b6c NEW Add method hintindex() in database handlers. 2022-04-06 17:32:56 +02:00
Laurent Destailleur
a528cd46bd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/bank/card.php
2022-04-06 15:17:29 +02:00
Laurent Destailleur
1988459aa8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-06 14:54:02 +02:00
Laurent Destailleur
9459971ba4 Removed the awful "group by" on list of invoices. Add index on datef. 2022-04-06 14:53:22 +02:00
Laurent Destailleur
c3ae63f587 FIX out of memory when more than 100 000 invoices. 2022-04-06 11:34:49 +02:00
Laurent Destailleur
a51c868a8e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
2022-04-01 14:40:50 +02:00
ATM john
75d7c439dd Merge branch '14.0_fix_regression_selct_extrafield_search' of github.com:atm-john/dolibarr into new_fix_regression_select_extrafield_search 2022-03-30 11:09:29 +02:00
Ferran Marcet
dd20907d53 Fix: Sales representative column crash on invoice list 2022-03-30 09:33:14 +02:00
ATM john
5e644ed0a4 Fix search degradation 2022-03-15 18:24:49 +01:00
Laurent Destailleur
358f21f06e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/customreports.php
2022-03-01 16:48:29 +01:00
Laurent Destailleur
2a48dd349e Fix #hunterb03d4415-d4f9-48c8-9ae2-d3aa248027b5 2022-03-01 16:38:06 +01:00
lvessiller
7e17167faf NEW total mark rate in list 2022-02-16 11:45:29 +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
lvessiller
241a65e2ae NEW add margin info in proposal and order list 2022-02-03 10:39:03 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +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
d80f83caf4 Clean code 2021-12-09 17:19:31 +01:00
lmarcouiller
b732d80ca5 Fix php 8.0 warnings 2021-12-02 15:56:34 +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
Frédéric FRANCE
dc15d09f12
remove duplicate code 2021-10-27 09:37:22 +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
andreubisquerra
85cc5851ef
BUG When load a draft invoice from history I can't add products 2021-10-23 16:07:47 +02:00
Frédéric FRANCE
9bd31d2b85
fix warnings 2021-10-23 07:13:08 +02:00
Frédéric FRANCE
46c4f28478
fix multiple warnings 2021-10-22 22:15:59 +02:00
Laurent Destailleur
2671eeb4e5 Responsive 2021-10-01 18:54:14 +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
0d6296e417
Merge pull request #18539 from GurvanKervern/undef4
Undef4
2021-09-05 01:57:16 +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
GurvanKervern
b242387c43 Fix undef4-2
PHP8 warnings
2021-08-29 22:46:39 +08:00
Laurent Destailleur
f825d3fda4 Trans 2021-08-28 13:27:55 +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
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
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
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
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
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
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
b552c6b4fe Fix status color 2021-07-14 14:32:05 +02:00
Laurent Destailleur
34cebe6aa3 Look and feel v14 2021-06-14 01:11:39 +02:00
Laurent Destailleur
f13dcb5376 Fix merge 2021-06-12 15:44:03 +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
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
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
ae6d2ba9b5 Fix missing user creation/modif of template invoice 2021-06-10 01:56:20 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
27018bd4b4 Fix group by 2021-06-04 14:25:32 +02:00
Laurent Destailleur
4b47611e23 Debug v14 2021-05-25 21:21:09 +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
Sylvain Legrand
a3d1b49c65 Error in list when using alias name of thirdparty 2021-05-19 19:08:58 +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