lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
65,573 Commits 43 Branches 150 Tags 886 MiB
84605bc59b
Commit Graph

65573 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
84605bc59b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-09 16:59:47 +02:00
Laurent Destailleur
430f833222
Merge pull request #9626 from OPEN-DSI/fix_product_margin 
FIX Product margin tab and credit note
 2018-10-09 16:57:08 +02:00
Laurent Destailleur
bd8cf3d81e
Merge pull request #9704 from atm-gauthier/7.0_fix_userlist 
FIX : when we're just admin and not super admin, if we create new use…
 2018-10-09 16:17:49 +02:00
Laurent Destailleur
67e7736eb2
Merge pull request #9698 from Dolibarr/atm-maxime-patch-1 
Fix request on project overview
 2018-10-09 12:40:51 +02:00
gauthier
021f9552dd FIX : when we're just admin and not super admin, if we create new user with transverse mode, we don't see it then we can't add him in usergroup 2018-10-08 15:41:31 +02:00
Maxime Kohlhaas
320ca3db67
Fix request on project overview 
Fixes #9220
 2018-10-06 22:53:28 +02:00
Laurent Destailleur
e165dce908
Merge pull request #9689 from ATM-Marc/FIX_6.0_facture_stats_situation 
FIX: invoice stats: situation invoices were not counted
 2018-10-06 12:46:25 +02:00
Laurent Destailleur
a97dafc1f2
Merge pull request #9688 from atm-florian/7.0_fix9161 
7.0 fix9161
 2018-10-06 12:40:42 +02:00
Marc de Lima Lucio
82651cd920 FIX: invoice stats: situation invoices were not counted 2018-10-05 12:12:04 +02:00
florian HENRY
cba4676032 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_fix9161 2018-10-05 10:36:03 +02:00
florian HENRY
68c99d01a7 OMG!!!! var_dump.... 2018-10-05 10:35:32 +02:00
Laurent Destailleur
b20dc5678c
Merge pull request #9684 from atm-ph/fix_7.0_wrong_modulepart_name 
FIX wrong value for module part and return access denied
 2018-10-04 19:06:53 +02:00
Laurent Destailleur
8592b03b49
Merge pull request #9682 from atm-ph/fix_7.0_missing_hook 
Fix missing hook on sellsjournal
 2018-10-04 19:06:02 +02:00
Laurent Destailleur
17e4af50ec
Merge pull request #9680 from ATM-Nicolas/fix_wrong_variable_name 
FIX : Wrong variable name
 2018-10-04 18:47:08 +02:00
Laurent Destailleur
ac86eac508
Merge pull request #9675 from atm-ph/fix_7.0_dom_error 
Fix minor error in dom
 2018-10-04 18:32:52 +02:00
Laurent Destailleur
3060647212 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2018-10-04 17:50:19 +02:00
Laurent Destailleur
8690d65479 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2018-10-04 17:47:22 +02:00
Laurent Destailleur
577192554d
Merge pull request #9670 from oas-services/7.0 
Fix issue #9434 : no array_options available when calling api on order line and invoice line
 2018-10-04 17:39:37 +02:00
Laurent Destailleur
9e397206d3
Merge pull request #9668 from atm-greg/Fix_pdf_generation 
fix error 500 on pdf_generation
 2018-10-04 17:27:29 +02:00
Laurent Destailleur
1dd276b046
Merge pull request #9666 from atm-gauthier/7.0_wrongfunction 
FIX : wrong function name
 2018-10-04 17:26:59 +02:00
atm-ph
bfaf25ca2a Fix wrong value for module part and return access denied 2018-10-04 16:55:16 +02:00
atm-ph
58d1ac427e Fix missing hook on sellsjournal 2018-10-04 10:57:22 +02:00
ATM-Nicolas
c048f51562 FIX : Wrong variable name 2018-10-04 09:54:40 +02:00
florian HENRY
e95921eb93 better test 2018-10-04 09:47:04 +02:00
florian HENRY
7f4f27ebfe indent 2018-10-04 09:45:12 +02:00
florian HENRY
292dab192b FIX : #9161 2018-10-04 09:42:11 +02:00
atm-ph
2acd69033c Fix minor error in dom 2018-10-03 22:48:29 +02:00
aplose
8ee7a48583 Fix issue #9434 : no array_options available when calling api : 
I replace the deprecated code by the fetch_optionnals() recommanded call.
 2018-10-03 15:15:46 +02:00
atm-greg
583ea05567 fix missing letter... 2018-10-03 12:13:53 +02:00
gauthier
587766b39b FIX : wrong function name 2018-10-03 10:38:47 +02:00
Philippe
06fe172669 FIX Product marge tabs on product card 
Credit note are not negative so the grand total are false
 2018-09-27 20:06:00 +02:00
Philippe
8deb2eaa0c Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into 6.0 2018-09-27 19:00:09 +02:00
Laurent Destailleur
6e7fd15e1e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-09-27 12:48:08 +02:00
Laurent Destailleur
291d477f65 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-09-27 12:47:48 +02:00
Laurent Destailleur
4c8664b297
Merge pull request #9619 from ATM-Marc/FIX_6.0_extrafield_columns 
FIX: showOptionals: column mismatches
 2018-09-27 09:39:51 +02:00
Laurent Destailleur
2d88b69cf6
Merge pull request #9616 from frederic34/patch-14 
add try catch for swiftmailer
 2018-09-27 09:34:21 +02:00
Laurent Destailleur
bc5b794b1a
Merge pull request #9613 from frederic34/patch-11 
FIX Option MAIN_DISABLE_NOTES_TAB #9611
 2018-09-27 09:30:56 +02:00
Laurent Destailleur
77341470e1
Merge pull request #9608 from frederic34/patch-10 
comparaison of two boolean in rssparser.class.php
 2018-09-27 09:23:24 +02:00
Laurent Destailleur
46363a7705
Merge pull request #9607 from atm-gauthier/7.0_fix_replenish_entity 
FIX : need to filter on current entity on replenish
 2018-09-27 09:22:44 +02:00
Laurent Destailleur
ff3f1e933a
Update replenish.php 2018-09-27 09:22:38 +02:00
Marc de Lima Lucio
af93fc7484 FIX: showOptionals: column mismatches 2018-09-26 17:19:06 +02:00
Frédéric FRANCE
1bac3a0ccf
swiftmailer is doing encodetorfc2822 2018-09-26 10:37:20 +02:00
Frédéric FRANCE
92a3faeaf7
add try catch for swiftmailer 2018-09-26 10:13:14 +02:00
Frédéric FRANCE
a9f7bdead6
fix Option MAIN_DISABLE_NOTES_TAB #9611 2018-09-25 15:22:08 +02:00
Frédéric FRANCE
d15c52db3b
Update rssparser.class.php 2018-09-25 08:16:05 +02:00
gauthier
fc7c0ce521 FIX : need to filter on current entity on replenish 2018-09-24 16:23:44 +02:00
Laurent Destailleur
40bed96a01 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-09-24 10:15:20 +02:00
Laurent Destailleur
dbb75e35a1 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/agenda.lang
 2018-09-24 10:14:38 +02:00
Laurent Destailleur
2dbb82fc76 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-09-24 10:03:21 +02:00
Laurent Destailleur
12690666e2 Missing trans 2018-09-24 10:03:08 +02:00