Commit Graph

63311 Commits

Author SHA1 Message Date
Marc de Lima Lucio
b96ac794e9 FIX: actioncomm export: ORDER BY clause is in wrong export property + event type filter does not work 2019-02-28 16:15:32 +01:00
gauthier
786c114026 FIX : project_title for display of getNomUrl() 2019-02-28 16:13:45 +01:00
Laurent Destailleur
429da47d68 Fix default language of reminders 2019-02-28 13:11:14 +01:00
Laurent Destailleur
c9d240cb73 Merge pull request #10671 from hregis/8.0_mc
FIX could not create several superadmin in transversal mode
2019-02-28 12:24:50 +01:00
Laurent Destailleur
855aaaffd8 Better fix for type of discount 2019-02-28 11:44:10 +01:00
Laurent Destailleur
92259810c1 Merge pull request #10712 from atm-florian/8.0
fix relative discount for prospect and supplier
2019-02-28 11:26:50 +01:00
Laurent Destailleur
cefaeb583f Update xinputfile.modules.php 2019-02-28 11:24:43 +01:00
Laurent Destailleur
85d46a5270 Update xinputfile.modules.php 2019-02-28 11:24:07 +01:00
florian HENRY
4ebf4780c2 fix relative discount for prospect and supplier 2019-02-28 09:09:06 +01:00
gauthier
1237a6d3e9 FIX : same thing here 2019-02-27 14:58:10 +01:00
gauthier
49e03b009f FIX : if empty error message, we just see "error" displayed 2019-02-27 14:50:01 +01:00
Laurent Destailleur
513fc8f410 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-27 14:46:41 +01:00
Laurent Destailleur
10e3badb0a Fix closing tr 2019-02-27 14:46:23 +01:00
Laurent Destailleur
0d99bfbf1c Merge pull request #10686 from hregis/9.0_merge
FIX wrong feature2 when user rights "group_advance" is used
2019-02-27 13:29:16 +01:00
Laurent Destailleur
cbaa57b1e2 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-27 02:25:42 +01:00
Laurent Destailleur
86e2ffe323 Merge pull request #10390 from glu000/8.0
Fix #10278
2019-02-27 02:24:55 +01:00
Laurent Destailleur
238894a7e4 Merge pull request #10624 from frederic34/patch-2
selectMulticurrency avoid malformed empty value
2019-02-27 02:06:24 +01:00
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
6f0d5fcf3f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/variants/combinations.php
2019-02-27 01:25:25 +01:00
Laurent Destailleur
a48e9fdba4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-02-27 01:23:26 +01:00
Laurent Destailleur
8bdf1cd1b6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-27 01:22:37 +01:00
Laurent Destailleur
da826c4bc7 Fix bad var name 2019-02-27 01:22:26 +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
Laurent Destailleur
3ba69fc93a Fix missing ; after sql request 2019-02-25 15:06:55 +01:00
Laurent Destailleur
1be1ee1670 Remove duplicate record 2019-02-25 14:56:28 +01:00
Laurent Destailleur
c0be66b5e5 FXI Remove duplicate record before trying to create unique key 2019-02-25 14:55:29 +01:00
Regis Houssin
6fa016dc85 FIX wrong feature2 when user rights "group_advance" is used 2019-02-25 10:44:22 +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
6fdd0191f4 Merge pull request #10676 from frederic34/patch-5
fix #10656
2019-02-24 20:45:13 +01:00
Laurent Destailleur
3f078203b9 Fix phpcs 2019-02-24 20:29:01 +01:00
Laurent Destailleur
5e6797f39d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-24 20:28:18 +01:00
Laurent Destailleur
2f300ae63f Standardize code with customer invoices 2019-02-24 20:26:54 +01:00
Laurent Destailleur
f41d504ba1 Merge pull request #10518 from atm-greg/8.0_FIX_bad_values_in_fourn_credit_note
FIX positive values IN supplier credit notes creating diff on addline rounding
2019-02-24 20:21:22 +01:00
Frédéric FRANCE
2ad91213b2 Update combinations.php 2019-02-24 12:09:57 +01:00
Frédéric FRANCE
ca2eba866c Update list.php 2019-02-24 11:56:17 +01:00
Frédéric FRANCE
435b416f93 fix #10656 2019-02-24 11:50:06 +01:00
Regis Houssin
0ea7bf3b0b FIX could not create several superadmin in transversal mode 2019-02-24 08:21:56 +01:00
Laurent Destailleur
0081d3c25d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-23 16:02:10 +01:00
Laurent Destailleur
4e19a83f1b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-02-23 16:01:38 +01:00
Laurent Destailleur
af6c482f26 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-02-23 16:01:30 +01:00
ptibogxiv
d7ffcca59b FIX fetch module / pos source 2019-02-23 16:00:07 +01:00
Laurent Destailleur
9ba6e3f8f5 FIX #10638 2019-02-23 15:57:57 +01:00
Cristian Torres
8ca6935f8b [FIX] Variable $i is already declared
It was preventing displaying of the other accounts
2019-02-23 14:08:11 +01:00
Francis Appels
c38b0c4dbe FIX fk_default_warehouse missing in group by 2019-02-22 12:17:34 +01:00
Laurent Destailleur
6cdf5c5673 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-21 22:28:25 +01:00
gauthier
58d82eb477 FIX : function sendEmailsReminder isn't completely developed, then MAIN_FEATURES_LEVEL must be 2 to "use" it 2019-02-21 11:08:55 +01:00
Laurent Destailleur
7fdf4be7dd Bad return of error 2019-02-19 14:02:17 +01:00