lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
72,229 Commits 43 Branches 150 Tags 886 MiB
10e3badb0a
Commit Graph

72229 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
10e3badb0a Fix closing tr 2019-02-27 14:46:23 +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
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
7fb6c3194a
Merge pull request #10678 from frederic34/patch-7 
phpcs fix in 9.0
 2019-02-24 20:49:11 +01:00
Laurent Destailleur
c1fa48889e
Merge pull request #10677 from frederic34/patch-6 
fix #10385
 2019-02-24 20:46:04 +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
46a6bbe62c
phpcs fix in 9.0 2019-02-24 14:16:29 +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
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
Laurent Destailleur
f2a73eecf2
Merge pull request #10645 from atm-gauthier/7.0_fix_feature_not_finished 
FIX : function sendEmailsReminder isn't completely developed, then MA…
 2019-02-23 15:01:44 +01:00
Laurent Destailleur
4c32aed2f4
Merge pull request #10650 from fappels/8.0_fix_dispatch 
FIX fk_default_warehouse missing in group by
 2019-02-23 14:08:28 +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
Laurent Destailleur
226b1e2488 Fix error management 2019-02-19 14:01:08 +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
Laurent Destailleur
75b875ae55 Fix origin currency not visible in absolute discount view 2019-02-18 17:38:15 +01:00
Laurent Destailleur
b2e0b1216e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-18 17:05:03 +01:00
Laurent Destailleur
b2ec340a48 FIX Show button POS Ticket only if invoice was generated by POS 2019-02-18 17:04:53 +01:00
Frédéric FRANCE
b017213131
selectMulticurrency avoid malformed empty value 2019-02-17 20:59:39 +01:00
Laurent Destailleur
c0b22e86c2
Merge pull request #10619 from atm-gauthier/8.0_fix_cant_reopen_fourn_creditnote 
FIX : we want to be able to reopen fourn credit note
 2019-02-15 15:32:38 +01:00
Laurent Destailleur
d2fc756014
Merge pull request #10618 from frederic34/patch-28 
Form::select_comptes return void
 2019-02-15 15:31:22 +01:00
Laurent Destailleur
b018c5d263
Merge pull request #10614 from andreubisquerra/9.0 
Update TakePOS in Dolibarr 9
 2019-02-15 15:21:35 +01:00