lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
117,307 Commits 43 Branches 150 Tags 886 MiB
5bbfdbb775
Commit Graph

274 Commits

Author SHA1 Message Date
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Laurent Destailleur
d4b67a6cef Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/contrat/list.php
	htdocs/core/lib/functions.lib.php
 2020-03-06 14:19:30 +01:00
Laurent Destailleur
aaf9aef5c8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/contrat/list.php
 2020-03-06 14:17:21 +01:00
ATM-Nicolas
a9d7bbc2ed FIX : Remove unexisting link 2020-03-06 09:52:19 +01:00
Laurent Destailleur
ef9fe73d96 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/index.php
 2020-02-26 17:02:23 +01:00
gauthier
01b9c42670 FIX : timezone must be tzserver and not tzuser as well as on contract card 2020-02-26 15:02:42 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
c85e54b08c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-12 08:46:08 +00:00
Laurent Destailleur
6e591d2be0 Fix css 2019-11-04 18:25:32 +01:00
Laurent Destailleur
11500fb8d9 FIX confusion between permto... and permisstionto... 2019-11-04 15:33:49 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Laurent Destailleur
e07e01580d Replace deprecated code with new one 2019-10-16 03:34:32 +02:00
Frédéric FRANCE
ae62d3d60a
Update list.php 2019-10-08 18:43:22 +02:00
Laurent Destailleur
43a70e5548 Clean code to use the new $extrafields->attributes array 2019-10-08 09:28:50 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
b28cd1bb57
Merge pull request #11972 from aspangaro/11.0_fa_icon 
NEW Add fa_icon on load_fiche_titre
 2019-09-30 15:26:28 +02:00
Alexandre SPANGARO
aec50d3ac9 NEW Add fa_icon on load_fiche_titre 2019-09-30 10:14:55 +02:00
Laurent Destailleur
6966651d51 Standardize code to use dolSqlDateFilter 2019-09-28 13:22:05 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
2286cc2a5f Fix autojump when 1 record found 2019-09-18 20:16:39 +02:00
Laurent Destailleur
a269082d70 Replace deprecated code with new one 2019-09-02 03:58:00 +02:00
Laurent Destailleur
7de92070d7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/contrat/card.php
	htdocs/contrat/class/contrat.class.php
 2019-06-29 16:46:16 +02:00
Laurent Destailleur
adb3062a9f Work on nblignes -> nblines 2019-06-29 16:38:14 +02:00
Laurent Destailleur
a68d9fc5e6 Fix css 2019-06-25 23:31:29 +02:00
Laurent Destailleur
11fea03074
Merge pull request #11026 from atm-john/new_look_and_feel_title_button 
NEW : look and feel title button
 2019-05-18 16:04:47 +02:00
Laurent Destailleur
c1ec7454a1
Merge branch 'develop' into clean_10_beta 2019-05-16 21:21:51 +02:00
Laurent Destailleur
ac1bab1711 Fix sanitize params 2019-05-16 12:28:57 +02:00
Francis Appels
79a347ab11 Fix PHPCS contract list 2019-05-13 22:49:43 +02:00
Laurent Destailleur
75646e365d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/contrat/services_list.php
	htdocs/expensereport/list.php
	htdocs/product/list.php
	htdocs/product/reassort.php
	htdocs/product/reassortlot.php
	htdocs/projet/list.php
 2019-05-13 12:28:16 +02:00
Laurent Destailleur
9242c1a630 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	ChangeLog
	htdocs/contrat/services_list.php
	htdocs/core/lib/files.lib.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
 2019-05-13 12:22:14 +02:00
Juanjo Menent
f4ca6916cd Merge remote-tracking branch 'upstream/7.0' into 8.0 
# Conflicts:
#	htdocs/contrat/services_list.php
#	htdocs/expensereport/list.php
#	htdocs/projet/list.php
 2019-05-11 17:31:23 +02:00
Juanjo Menent
91ae365588 Fix: missing GETPOST params 2019-05-11 16:58:00 +02:00
Laurent Destailleur
3def11d5c9 Standardize translation 2019-05-10 19:32:46 +02:00
ATM john
07e6ce5460 Appli function to links 2019-04-15 21:33:31 +02:00
Laurent Destailleur
d7f980fda0 NEW Add picto of deletion on mass action combo lists 2019-04-09 01:22:59 +02:00
Nicolas ZABOURI
0ab6b15779 FIX missing hook printFieldListFooter 2019-03-28 17:27:30 +01:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Laurent Destailleur
82381533dd Better responsive 2019-03-25 09:14:28 +01:00
Frédéric FRANCE
bf1e1d6a57
replace html by html5 in contrat 2019-03-03 09:37:43 +01:00
Laurent Destailleur
56d921ea52 CSS 2019-03-02 12:57:07 +01:00
Philippe GRAND
f24356ae10 update with html5 compliant code 2019-02-19 17:08:35 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Laurent Destailleur
3cca0df28e Support getFormatedCustomerRef into contract list 2019-01-22 10:39:06 +01:00
Laurent Destailleur
83efdee7d3
Merge branch 'develop' into new_mass_generate 2018-12-14 15:44:46 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Maxime Kohlhaas
d4d921b1cc Add massaction generate on main lists 2018-10-14 16:27:59 +02:00
Laurent Destailleur
d776fc423e Fix search criterai of contract 2018-10-08 00:52:21 +02:00
Laurent Destailleur
9f5e44c568 Fix search criterai of contract 2018-10-08 00:51:08 +02:00
Laurent Destailleur
adc36e7d63 Clean code 2018-10-01 00:20:47 +02:00
Frédéric FRANCE
a0a5d33641
test include 2018-07-26 17:30:53 +02:00
Laurent Destailleur
27a27e02a1 Fix css 2018-06-22 22:53:53 +02:00
Laurent Destailleur
758e5a51a5 Fix contextpage was not saved in forms 2018-06-08 19:35:53 +02:00
Laurent Destailleur
eb9321f2b8 css 2018-06-08 17:53:13 +02:00
Laurent Destailleur
034ce7e55d CSS 2018-06-02 10:36:22 +02:00
Frédéric FRANCE
30a3b95368
loadlangs 2018-05-26 20:32:23 +02:00
Laurent Destailleur
82a8513aed Standardize code 2018-04-29 19:52:14 +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
Ferran Marcet
6ced1a3264 New: Add same parameters on 'printFieldListTitle' hooks 2018-04-20 10:38:16 +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
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
Laurent Destailleur
6ef1dbbe0f FIX auto open contract if one result found 2018-03-24 18:28:06 +01:00
Laurent Destailleur
132ee2c788 CSS 2018-03-01 16:48:12 +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
af1028576d Fix on search all (trim search + search from smartphone). 2017-12-12 11:31:30 +01:00
Laurent Destailleur
8d20473ffd Fix date of extrafields 2017-12-09 23:19:29 +01:00
Laurent Destailleur
f22e7ee24a Fixes 2017-12-09 17:29:19 +01:00
florian HENRY
94285ae494 factorization of extrafeild into list 2017-11-27 15:24:29 +01:00
Laurent Destailleur
9c22b5f335 Replace deprecated dol_print_graph with DolGraph 2017-11-23 20:24:05 +01:00
Laurent Destailleur
f68b2bdeca Use the confirmation when deleting from mass action everywhere. 2017-11-15 11:39:11 +01:00
Laurent Destailleur
836f6bf3c9 Fix search filter when using extrafields 'links' 2017-11-12 12:39:23 +01:00
Laurent Destailleur
d1860b87f8 NEW Add a confirmation for all mass action 'delete' 2017-11-11 16:34:11 +01:00
Laurent Destailleur
14a43ba4d2 FIX sort on a date that is result of a MIN with mysql 2017-11-07 13:33:24 +01:00
Laurent Destailleur
d569218162 Fix 'separate' extrafields must be visible by default. 
Sandardize name of list pages (must end with _list.php)
 2017-10-29 11:23:20 +01:00
Scrutinizer Auto-Fixer
165741517e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-13 11:28:26 +00:00
Laurent Destailleur
8c5cf9ea45 Fix date output 2017-10-12 18:04:47 +02:00
Laurent Destailleur
c771ce524f Fix lose filter 2017-10-07 18:25:04 +02:00
Laurent Destailleur
5d24aa4830 Fix sql 2017-10-07 14:54:31 +02:00
Laurent Destailleur
ad57a8480f Merge pull request #7462 from tysauron/patch-15 
NEW Adding Field "First date of expire" + filter on contract list
 2017-10-07 14:16:31 +02:00
Laurent Destailleur
6271c90904 Update list.php 2017-10-07 14:15:47 +02:00
Laurent Destailleur
9d6498f2a4 NEW Search filters in lists are restored when using "back to list" 2017-10-03 14:50:52 +02:00
Laurent Destailleur
f007f9e7e5 NEW Add new property visible dy default on lists on extrafields 2017-09-29 13:26:44 +02:00
Laurent Destailleur
6d7db96359 NEW Option "one email per recipient" when using bulk actions emails. 2017-09-22 16:31:05 +02:00
tysauron
e6e3e8ca68 Adding Field "First date of expire" + filter 
Ajout d'une colonnes "1er date de fin" avec filtre par mois année et choix "<" ou ">" 
Le filtre exclue toutes les lignes fermé.
Permet de voir les contrat a renouvelé prochainement
Présélection du mois encours.
 2017-09-22 02:43:42 +02:00
Laurent Destailleur
8dfa87fcf6 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-19 19:30:28 +02:00
Laurent Destailleur
0536d6cbed FIX #7330 2017-09-18 15:46:17 +02:00
Laurent Destailleur
aea7318fae Fix search on ref customer 2017-09-18 00:07:00 +02:00
Laurent Destailleur
0fec777d0e NEW On bulk email from a list, can uncheck "Join main document". 
NEW Show direct preview link on contract
 2017-09-16 18:31:30 +02:00
Laurent Destailleur
630dc92a13 NEW Mass PDF Merging is available on contracts 2017-09-16 15:39:52 +02:00
Laurent Destailleur
0873260b8a USe second parameter in GETPOST 2017-09-15 10:50:50 +02:00
Laurent Destailleur
bde293af22 Fix filter on extrafield with type sellist 2017-09-07 15:34:25 +02:00
Laurent Destailleur
5b1f5b0f20 Fix translation done twice into field title of array 2017-08-02 13:31:53 +02:00
Laurent Destailleur
25b107defb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/contrat/list.php
	htdocs/fichinter/list.php
 2017-07-23 19:09:00 +02:00
Laurent Destailleur
f6060b976d Update list.php 2017-07-18 14:48:18 +02:00
phf
885fc3c5b7 Fix lost search value in list if come from thirdparty card 2017-07-17 11:04:48 +02:00
Laurent Destailleur
2870798d07 Fix remove warnings 2017-07-13 00:35:10 +02:00
Laurent Destailleur
bb2d27280b Fix sort link must be disabled for computed field 2017-06-19 14:31:08 +02:00
Laurent Destailleur
1b56e4a01c Fix look and feel v6 2017-06-14 11:28:42 +02:00
Laurent Destailleur
7c0de18ac1 Fix code comment 2017-06-10 12:56:28 +02:00
Laurent Destailleur
b441c62e1d Fix syntax error 2017-06-08 14:55:12 +02:00
Laurent Destailleur
b1f93ccb0c Fix security 2017-06-08 14:33:46 +02:00
Regis Houssin
bfd6116e5b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2017-06-06 15:03:36 +02:00
Laurent Destailleur
02b5d9e6f7 FIX #6945 2017-06-06 10:53:53 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
b3dc73e611 Look and feel v6 2017-05-21 02:43:51 +02:00
Alexandre SPANGARO
93554b7e30 Typo searchpicto 2017-05-14 21:06:33 +02:00
Laurent Destailleur
e5c898e0d6 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	build/makepack-dolibarr.pl
	htdocs/fichinter/list.php
	htdocs/product/list.php
	htdocs/projet/tasks/list.php
 2017-05-10 00:48:27 +02:00
Laurent Destailleur
6d01bd712d FIX Better sanitizing of search all parameter. 2017-05-09 19:36:10 +02:00
Laurent Destailleur
be439f6252 Work on look and feel v6 2017-04-07 16:16:44 +02:00
Laurent Destailleur
d99b0461c7 Extrafields multilanguage support. 2017-04-03 10:56:28 +02:00
Laurent Destailleur
54b03a3552 Work on 6.0 new look and feel 2017-03-29 11:03:13 +02:00
Laurent Destailleur
31bde1ae74 Code for 6.0 new look and feel 2017-03-28 17:12:15 +02:00
Laurent Destailleur
5842d1ee41 Fix link to notes ko for contracts. 2017-03-02 13:24:56 +01:00
florian HENRY
a333a328d8 FIX #6338 2017-01-26 16:32:36 +01:00
Laurent Destailleur
d14e4dbaba Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on 2017-01-15 20:49:20 +01:00
Laurent Destailleur
6c4f15df63 Fix lot of fix in css look to match v5 rules. 2016-12-11 16:11:42 +01:00
Laurent Destailleur
bd8f923cee Several fixes in filter on lists 2016-11-29 22:52:16 +01:00
Laurent Destailleur
e4a8342aef Fix div-table-form balance on all lists (solve responsive design) 2016-11-27 11:41:10 +01:00
Laurent Destailleur
9ff1809f85 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/card.php
	htdocs/product/stock/class/productlot.class.php
	htdocs/theme/eldy/style.css.php
 2016-09-12 02:05:38 +02:00
Laurent Destailleur
1fbf233f95 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/contact/list.php
	htdocs/contrat/list.php
	htdocs/expedition/list.php
	htdocs/expensereport/list.php
	htdocs/fichinter/list.php
	htdocs/fourn/commande/list.php
	htdocs/product/reassort.php
	htdocs/product/reassortlot.php
	htdocs/product/stock/list.php
	htdocs/societe/list.php
	htdocs/supplier_proposal/list.php
	htdocs/theme/eldy/style.css.php
 2016-09-12 01:50:38 +02:00
Ferran Marcet
b5db70342b Fix: Search all is lost on lists when pagination or when the columns are sorted 2016-09-09 13:58:41 +02:00
Laurent Destailleur
b52e2f404c NEW Can select fields/extrafields on contract list + Mass delete action. 2016-09-02 14:47:59 +02:00
Laurent Destailleur
2afc567a53 Fix fiter on contract date 2016-08-17 11:58:55 +02:00
Laurent Destailleur
86f576f8d3 Fix strict sql 2016-08-02 13:45:35 +02:00
Laurent Destailleur
c787e7f2a1 FIX Clear of filter should also reset categories and extrafields filter 
FIX Filter on categories should depends on context
 2016-07-13 12:03:30 +02:00
Laurent Destailleur
5db6bcd4a8 Fix contextpage lost on submitting form or sorting 2016-06-07 14:06:00 +02:00
Laurent Destailleur
b57476153f Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/admin/menus/edit.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/societe/consumption.php
 2016-06-04 01:14:36 +02:00
Laurent Destailleur
085fa6902b Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/contrat/list.php
	htdocs/fourn/ajax/getSupplierPrices.php
 2016-06-04 00:58:16 +02:00
Laurent Destailleur
e2e95641a3 FIX Search supplier ref on contract 2016-05-23 12:27:02 +02:00
Laurent Destailleur
1d700cd286 Keep empty if field value has no value. 2016-04-04 13:26:48 +02:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Laurent Destailleur
630f5a632d Revert "Corrected non-static usages of Form::selectarray function" 
This reverts commit 87cd6e1e40.
 2016-03-25 15:34:37 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
87cd6e1e40 Corrected non-static usages of Form::selectarray function 2016-03-20 14:15:17 +01:00
Laurent Destailleur
d4c3258385 Fix missing field 
Fix bad value for default value of next date
 2016-02-15 07:36:45 +01:00
Laurent Destailleur
158906455a NEW Can change dynamically number of records visible into lists. 2016-02-11 20:40:33 +01:00
Laurent Destailleur
9da0164d90 Uniformize code for lists 2016-02-07 15:50:48 +01:00
Laurent Destailleur
c71bb9d67c Fix filter on contract not visible 2016-02-07 12:33:40 +01:00
Laurent Destailleur
ed3f0ce86b Fix totalnboflines not correctly managed 2015-12-28 00:20:48 +01:00
Laurent Destailleur
db7a98f0ef Fix: When a payment mode was disabled, it was not visible on old 
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
 2015-12-21 13:56:59 +01:00
Laurent Destailleur
374480043e Add maxwidth300 on combo list for users and sale representatives 2015-12-06 00:37:58 +01:00
Laurent Destailleur
88e76dcf64 Fix utf8 encoded twice 2015-11-28 14:40:23 +01:00