Commit Graph

275 Commits

Author SHA1 Message Date
Laurent Destailleur
57e359cd40 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/agenda.lang
2018-09-24 10:18:13 +02:00
Laurent Destailleur
dbb75e35a1 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/agenda.lang
2018-09-24 10:14:38 +02:00
Laurent Destailleur
3662ebe3a3 Fix syntax error 2018-09-12 18:05:20 +02:00
Maxime Kohlhaas
c94689e9a9 FIX remain to pay for credit note was wrong on invoice list 2018-09-12 11:53:57 +02:00
Laurent Destailleur
aad6a0871f FIX Lose filter on payment type or category after a sort on invoice list
Conflicts:
	htdocs/compta/facture/list.php
2018-09-12 10:59:53 +02:00
Laurent Destailleur
7bea9f5ffb FIX Lose filter on payment type or category after a sort on invoice list 2018-09-12 10:57:09 +02:00
Laurent Destailleur
9042d341f0 FIX #9316 Error when listing invoices 2018-09-04 11:19:31 +02:00
Laurent Destailleur
e7d2bcc34c FIX #9316 Error when listing invoices 2018-09-04 11:17:08 +02:00
Laurent Destailleur
0a1c6e7194 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/list.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
2018-08-12 20:08:20 +02:00
Laurent Destailleur
30b4d88428 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/product/reassort.php
	htdocs/societe/list.php
2018-08-12 19:23:45 +02:00
gauthier
80ff7fa86f FIX : case when we valid form with keyboard 2018-07-11 15:18:30 +02:00
gauthier
103c7e6d06 FIX : page must always be 0 when we search (to avoid case : when we're on page 3 and we're looking for a precise thirdparty, we stay on page 3 and nothing's displaied) 2018-07-11 09:51:36 +02:00
Laurent Destailleur
ed6ec8138d Fix filter on invoice status 2018-07-06 16:06:15 +02:00
Laurent Destailleur
969b272576 Rename menu entries and report title for better understanding 2018-06-26 11:18:31 +02:00
Laurent Destailleur
7daee6dc6b A lot of fix of css and look and feel v8 2018-06-23 00:07:56 +02:00
Laurent Destailleur
27a27e02a1 Fix css 2018-06-22 22:53:53 +02:00
Laurent Destailleur
910652eb6d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/admin.lang
2018-06-13 23:07:30 +02:00
Laurent Destailleur
4a5fd35e11 Look and feel v8 2018-06-13 22:57:41 +02:00
Marc de Lima Lucio
e992187f4c FIX: handle sortorder on multiple columns + potential SQL field mismatch 2018-06-12 16:00:16 +02:00
Regis Houssin
7ce2ebf1a9 Fix: wrong var name 2018-06-07 16:25:47 +02:00
Frédéric FRANCE
4d5c28b597 loadlangs 2018-05-27 09:27:09 +02:00
Laurent Destailleur
182abfdb5b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/societe/card.php
2018-05-25 15:02:24 +02:00
Laurent Destailleur
8a64ee2297 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/commande/list.php
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/list.php
	htdocs/societe/card.php
2018-05-25 13:14:58 +02:00
atm-quentin
eb224e43a5 FIX missing filters during ordering 2018-05-24 10:41:24 +02:00
Laurent Destailleur
97f161b276 Update list.php 2018-05-05 14:25:44 +02:00
Abbes Bahfir
17b8de2cdd New : Option INVOICE_CAN_REMOVE_DRAFT_ONLY to delete draft invoices with precedence over INVOICE_CAN_ALWAYS_BE_REMOVED 2018-05-05 12:57:29 +01:00
atm-quentin
21b387a4c4 NEW thirdparty categ filter on lists 2018-05-02 15:01:32 +02:00
Laurent Destailleur
461ae46cc4 FIX When on a high page and searching for a small result, list was not
visible.
2018-04-24 11:37:57 +02:00
Laurent Destailleur
ccd9aa8059 Fight against dolibarr warnings 2018-04-21 12:16:12 +02:00
Laurent Destailleur
bbfc4a3e17 NEW Look and feel v8 - Show Picto "+" on all links "Add record" 2018-04-18 03:26:15 +02:00
Laurent Destailleur
8fbde88872 Look and feel v8 2018-04-15 17:37:49 +02:00
Laurent Destailleur
187cc35786 Look and feel v8 2018-04-14 22:23:56 +02:00
Laurent Destailleur
99ed9c4589 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/compta/facture/list.php
2018-04-08 13:10:10 +02:00
Laurent Destailleur
79af10fc83 Fix search filters 2018-04-08 13:01:42 +02:00
Laurent Destailleur
9d9f3ddf85 Merge pull request #8502 from ATM-Marc/NEW_create_from_list
NEW: generalize use of button to create new element from list
2018-04-05 16:40:15 +02:00
Laurent Destailleur
43f8834b28 Uniformize code with the new module builder framework 2018-03-31 18:48:27 +02:00
Marc de Lima Lucio
0366e645d5 NEW: generalize button to create object from list, for most of the lists 2018-03-30 16:54:38 +02:00
Alexandre SPANGARO
6e27da605a Add label project in tooltip in customer/supplier list 2018-03-27 21:41:25 +02:00
Laurent Destailleur
d8d13a7348 Merge branch 'develop' into 7.0_fix_invoicelist 2018-03-09 22:37:20 +01:00
florian HENRY
164ca682d5 fix add "late" invoice into "save last search/backtolist" feature 2018-03-09 17:23:43 +01:00
Regis Houssin
82057b3523 Fix: use code instead id 2018-03-09 08:11:02 +01:00
Laurent Destailleur
fe45e82e99 Fix use of table llx_c_paiement (param showempty was not used/set) 2018-03-07 19:00:38 +01:00
Laurent Destailleur
c1497b065c CSS 2018-03-07 14:13:55 +01:00
Laurent Destailleur
1ca5c7083a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
2018-03-07 11:54:48 +01:00
Laurent Destailleur
1e6a55745c CSS 2018-03-06 11:54:05 +01:00
Laurent Destailleur
003827eb06 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-25 15:01:19 +01:00
Regis Houssin
b216249214 Fix: missing hook parameters 2018-02-24 15:01:29 +01:00
Laurent Destailleur
72c1357c9b NEW Section of files generated by mass action not visible if empty 2018-02-21 11:02:45 +01:00
Laurent Destailleur
30ba1c1702 FIX #8174 2018-02-12 14:02:51 +01:00
Laurent Destailleur
975608b9d3 FIX #8174 2018-02-12 03:21:04 +01:00