Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
72,480 Commits 36 Branches 189 Tags
84ec39f043c3d807519b8e4cb1570a01eb47d848
Commit Graph

15786 Commits

Author SHA1 Message Date
bomuux
9c5a4e303c SQL error in box_project.php 
Corrected a bug : for an internal user with no rights to see all
projects, the project box on home cause an error in log.
Finally a lot of simplification because
Project::getProjectsAuthorizedForUser do most of the filtering.

Conflicts:
	htdocs/core/boxes/box_project.php
 2019-02-27 01:44:15 +01:00
Laurent Destailleur
fb2b7a6c09 Merge pull request #10693 from atm-quentin/NEW_field_tasklist 
add data elem on task list
 2019-02-27 01:14:07 +01:00
Laurent Destailleur
e0c7c32fae Fix preselection when key is '0' 2019-02-26 11:44:44 +01:00
atm-quentin
35762c0d4e add data elem on task list 2019-02-26 11:25:40 +01:00
Cristian Torres
c781eeb17d [FIX] ORDER BY before custom filters for where 
When filtering data "and cac.libelle" would be appended after ORDER BY
 2019-02-24 20:55:27 +01:00
ptibogxiv
47f5ff3303 Fix declare functions2.lib.php for donations API 2019-02-24 20:51:00 +01:00
Laurent Destailleur
ad7b8371da FIX Mark credit note as available for credit note in other currency 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/core/class/discount.class.php
 2019-02-18 18:30:15 +01:00
Laurent Destailleur
07d1559802 FIX Mark credit note as available for credit note in other currency 2019-02-18 18:27:06 +01:00
Frédéric FRANCE
b017213131 selectMulticurrency avoid malformed empty value 2019-02-17 20:59:39 +01:00
Laurent Destailleur
89050da856 Merge 2019-02-14 15:27:31 +01:00
Laurent Destailleur
d2ee00d4bb Update security.lib.php 
Avoid regression on test of restrictArea
 2019-02-14 15:21:01 +01:00
Regis Houssin
359318392f FIX missing entity filter in function "build_filterField()" (export) 2019-02-14 10:47:07 +01:00
Regis Houssin
aa4c5ae839 FIX missing access security checking with multicompany 2019-02-14 10:12:15 +01:00
Laurent Destailleur
a689f8dc3f Code comment 2019-02-13 23:34:28 +01:00
Laurent Destailleur
f60940a141 Merge pull request #10560 from Toumaniere/9.0 
Fix #10551 : MailmanSpip & Adherent : add and remove mailman list
 2019-02-13 16:31:32 +01:00
Timoté Fallais
9a28c12781 reform MEMBER_VALIDATE and MEMBER_MODIFY code correctly 2019-02-13 14:57:37 +01:00
Timoté Fallais
a115b1da7f Fix MailmanSpip bad adherent type after update 2019-02-13 14:45:51 +01:00
Laurent Destailleur
affbd20cdb FIX Bad link in menu manager 2019-02-12 18:56:32 +01:00
Timoté Fallais
6c08cc6b6a MailmanSpip & Adherent : add and remove mailman list 2019-02-12 17:45:26 +01:00
Laurent Destailleur
2d4ccec309 Fix document generation of modulebuilder 2019-02-09 14:12:36 +01:00
Laurent Destailleur
a916708068 Fix missing disable dependency 2019-02-08 19:01:47 +01:00
Laurent Destailleur
1611c613f5 Fix phpcs 2019-02-08 12:19:51 +01:00
Laurent Destailleur
ec686a8f79 Fix phpcs 2019-02-08 11:30:20 +01:00
Laurent Destailleur
fe1188c4ea Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/filefunc.inc.php
 2019-02-08 10:44:45 +01:00
Laurent Destailleur
1c129a78ae Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-02-08 10:22:55 +01:00
Laurent Destailleur
679a13e48c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
 2019-02-08 10:22:36 +01:00
Laurent Destailleur
3318baa664 Merge pull request #10522 from atm-ph/fix_8.0_crabe_payment_table 
Fix display payment table on multiple pages
 2019-02-08 10:08:46 +01:00
Laurent Destailleur
471f11dace Merge pull request #10502 from hregis/9.0_merge 
FIX wrong merged conflict
 2019-02-08 09:34:49 +01:00
Laurent Destailleur
e5d7a862b4 Merge pull request #10527 from atm-ph/fix_8.0_psql_search_insensitive_accent 
Fix psql search insensitive accent
 2019-02-08 09:29:59 +01:00
Laurent Destailleur
8d82135033 Fix missing \n 2019-02-07 19:39:23 +01:00
Laurent Destailleur
89af7b0e98 Add doctype to web site 2019-02-07 19:38:36 +01:00
atm-ph
51515a487e Fix search unaccent from left menu search box 2019-02-07 17:58:25 +01:00
atm-ph
ec7ef265b7 Fix psql search insensitive accent 2019-02-07 17:47:17 +01:00
atm-ph
8e6a567b09 Fix display payment table on multiple pages 2019-02-07 12:36:22 +01:00
florian HENRY
95cc9faf7e fix php warning 2019-02-06 09:01:24 +01:00
Marc de Lima Lucio
428efa9227 FIX: line edit template: keep fk_parent_line 2019-02-05 12:02:49 +01:00
Regis Houssin
8860eab6b1 FIX wrong merged conflict 2019-02-05 07:40:50 +01:00
Laurent Destailleur
efe5cd3dd8 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-03 21:13:06 +01:00
Laurent Destailleur
72f78ecf3b FIX #10460 compatibility with MariaDB 10.4 2019-02-03 20:02:05 +01:00
Laurent Destailleur
4d41b1b33c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-03 19:45:45 +01:00
Laurent Destailleur
f8b10e9c3d Doxygen 2019-02-03 18:47:55 +01:00
Laurent Destailleur
75845a990f FIX Missing province in export of invoice 2019-02-01 22:55:28 +01:00
Laurent Destailleur
ebe30f7a0e FIX error report not returned 2019-02-01 19:19:23 +01:00
Laurent Destailleur
a2ab6348ed Fix bad menu leading on a development page 2019-02-01 17:06:34 +01:00
Laurent Destailleur
35f65a571c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/modules/facture/mod_facture_mars.php
	htdocs/core/modules/facture/mod_facture_terre.php
	htdocs/fourn/commande/list.php
 2019-02-01 16:05:43 +01:00
Laurent Destailleur
dee2a373c1 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2019-02-01 16:01:18 +01:00
Laurent Destailleur
ae81bbac93 Better var name 2019-02-01 13:49:07 +01:00
Laurent Destailleur
b14a16a119 Code comment 2019-02-01 13:48:09 +01:00
Laurent Destailleur
849b3b640b Code comment 2019-02-01 13:41:23 +01:00
Laurent Destailleur
189323ad58 Fix when using image into description 2019-01-31 18:12:34 +01:00