lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
73,875 Commits 43 Branches 150 Tags 886 MiB
c5d252fa2e
Commit Graph

73875 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frédéric FRANCE
c5d252fa2e
Merge remote-tracking branch 'origin/Squiz.Scope.MethodScope.Missing' into Squiz.Scope.MethodScope.Missing 2019-02-27 17:56:13 +01:00
Frédéric FRANCE
089875b8a2
add visibility 2019-02-27 17:53:52 +01:00
Laurent Destailleur
b3fb0eaf5b
Merge branch 'develop' into Squiz.Scope.MethodScope.Missing 2019-02-27 15:48:31 +01:00
Laurent Destailleur
2448d1deaa fk_projet -> fk_project 2019-02-27 15:32:18 +01:00
Laurent Destailleur
3bffa69f1d Remove deprecated code 2019-02-27 15:23:56 +01:00
Laurent Destailleur
ee3dd016e7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-27 14:47:23 +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
fb726b99c7 Fix css 2019-02-27 14:28:46 +01:00
Frédéric FRANCE
739d8f82a5
merge fix 2019-02-27 14:22:25 +01:00
Frédéric FRANCE
49cbaed569
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-27 14:21:15 +01:00
Laurent Destailleur
70744a8ca0 CSS 2019-02-27 13:58:26 +01:00
Laurent Destailleur
29cfa03fa4 Fix font awesome 5 regressions 2019-02-27 13:54:39 +01:00
Laurent Destailleur
c4e96e9f74 Fix language 2019-02-27 13:48:13 +01:00
Laurent Destailleur
727c4b787b
Merge pull request #10617 from wdammak/patch-29 
NEW Add Default Warehouse to user record (if module stock is on)
 2019-02-27 13:38:55 +01:00
Laurent Destailleur
e873608d84
Update card.php 2019-02-27 13:37:53 +01:00
Laurent Destailleur
836eff1233
Merge pull request #10698 from wdammak/patch-32 
Add parent establishment
 2019-02-27 13:34:50 +01:00
Laurent Destailleur
24a8bd12fe
Update admin_establishment.php 2019-02-27 13:33:34 +01:00
Laurent Destailleur
ca1fa7b89b
Merge pull request #10701 from ptibogxiv/patch-135 
NEW ADD document's product support in API
 2019-02-27 13:30:30 +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
231f0db9b3
Merge pull request #10702 from frederic34/patch-1 
phpcs fix
 2019-02-27 13:28:50 +01:00
Laurent Destailleur
825705179c Fix phpcs 2019-02-27 12:49:44 +01:00
ptibogxiv
096bc4750c
Update api_documents.class.php 2019-02-27 11:23:33 +01:00
Frédéric FRANCE
d9300e7803
phpcs fix 2019-02-27 08:28:13 +01:00
Frédéric FRANCE
5a4ac82880
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-27 08:23:29 +01:00
Laurent Destailleur
bcf1d57456 Fix default page is not always index.php 2019-02-27 04:21:12 +01:00
Laurent Destailleur
4634312306 Fix phpcs 2019-02-27 04:18:25 +01:00
wdammak
b1782f0fc8
rename function select_establishments to selectEstablishments 2019-02-27 04:05:02 +01:00
wdammak
64bd995978
Fix camelCase syntax and remove disabling of phpcs 2019-02-27 04:02:11 +01:00
Laurent Destailleur
61b7564664 Fix syntax error 2019-02-27 02:29:14 +01:00
Laurent Destailleur
97b51ec647 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-27 02:27:42 +01:00
Laurent Destailleur
401f587868 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/boxes/box_project.php
 2019-02-27 02:27:33 +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
b33b3698c8
Merge pull request #10691 from aspangaro/develop 
NEW: Add graphic option for ACCOUNTANCY_COMBO_FOR_AUX
 2019-02-27 02:18:20 +01:00
Laurent Destailleur
a6e9da192c
Update accountancy.lang 2019-02-27 02:18:00 +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
Laurent Destailleur
62dbf15ba1
Merge pull request #10633 from ptibogxiv/patch-119 
NEW options for alternative method
 2019-02-27 02:02:53 +01:00
Laurent Destailleur
5f1087b9ce
Merge pull request #10625 from aspangaro/10.0_accountancy2 
NEW: Add accounting account for result
 2019-02-27 01:51:10 +01:00
Laurent Destailleur
7618a7348f
Merge branch 'develop' into 10.0_accountancy2 2019-02-27 01:51:01 +01:00
Laurent Destailleur
0b1821dabb
Merge pull request #10694 from ptibogxiv/patch-131 
UPDATE support maximal fee in connect mode
 2019-02-27 01:46:21 +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
64f81e8f65
Merge pull request #10628 from bomuux/patch-4 
FIX: sql error in box_project.php
 2019-02-27 01:38:03 +01:00
Laurent Destailleur
d6651f3998
Update box_project.php 2019-02-27 01:37:20 +01:00
Laurent Destailleur
014c199173 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/tpl/extrafields_list_print_fields.tpl.php
 2019-02-27 01:28:12 +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
69cccfe897
Merge pull request #10685 from aspangaro/10.0_linkedin 
NEW: Add LinkedIn field
 2019-02-27 01:16:28 +01:00