lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
64,356 Commits 43 Branches 150 Tags 886 MiB
2930fc7dfa
Commit Graph

64356 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
2930fc7dfa Fix missing mainmenu and leftmenu into menu definition 2018-02-05 02:27:31 +01:00
Laurent Destailleur
f229f34d05 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-05 01:34:08 +01:00
Laurent Destailleur
c02d46fb0a Fix leftmenu in menu entries 2018-02-05 01:33:44 +01:00
Laurent Destailleur
30c683ed65 Fix properties into tooltip 2018-02-05 00:36:54 +01:00
Laurent Destailleur
8fe773204e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-04 23:18:33 +01:00
Laurent Destailleur
5455ab3280 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/projet/card.php
 2018-02-04 23:17:09 +01:00
Laurent Destailleur
906a9eaa5a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-04 23:12:57 +01:00
Laurent Destailleur
dbe45d03d3 Fix: amount into form must be numeric without format 2018-02-04 23:12:19 +01:00
Laurent Destailleur
354fc4edd0 Fix: amount into form must be numeric without format 2018-02-04 23:06:37 +01:00
Laurent Destailleur
fe57cf697f Fix init category selected 2018-02-04 14:35:38 +01:00
Laurent Destailleur
ec15048964 Fix init category selected 2018-02-04 14:34:31 +01:00
Laurent Destailleur
1a1e6adcb9 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-04 13:57:07 +01:00
Laurent Destailleur
7ed66457b4 Fix ref already output 2018-02-04 13:55:18 +01:00
Laurent Destailleur
0cc6654b06 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2018-02-04 13:25:00 +01:00
Laurent Destailleur
5a609215d5 Fix default value was not save at creation 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2018-02-04 13:23:04 +01:00
Laurent Destailleur
aff6bced4a Fix default value was not save at creation 2018-02-04 13:20:47 +01:00
Laurent Destailleur
3cfb6aaa67 Fix missing trigger CONTRACT_MODIFY 2018-02-04 12:59:16 +01:00
Laurent Destailleur
42f8da7496 NEW Add trigger CONTRACT_MODIFY 2018-02-04 12:56:17 +01:00
Laurent Destailleur
956df63c87 Fix extrafields updated twice 2018-02-04 12:55:29 +01:00
Laurent Destailleur
e5cb2be618
Merge pull request #8129 from hregis/6.0_bug 
Fix: remove lines with special code when convert to reduc
 2018-02-04 12:18:20 +01:00
Laurent Destailleur
4fdde55c59 Keep empty graph if graph is called with empty data 2018-02-04 12:14:39 +01:00
Laurent Destailleur
0e3d5ea9e5 Fix missing translation 2018-02-04 11:44:39 +01:00
Laurent Destailleur
f3700b66c6 Fix size of columns when using PRODUCT_USE_UNIT 2018-02-04 11:17:45 +01:00
Laurent Destailleur
fd8f89c708 FIX a discount is a percent, not an amount, so we use vatrate not price 2018-02-04 11:13:47 +01:00
Laurent Destailleur
d24d401f3a Fix translation 2018-02-04 10:55:09 +01:00
Laurent Destailleur
85031f61f3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-04 10:51:20 +01:00
Laurent Destailleur
ea15c1bfed Fix CONTRACT_SYNC_PLANNED_DATE_OF_SERVICES 2018-02-04 10:50:58 +01:00
Regis Houssin
8ee1186492 Fix: wrong test 2018-02-04 09:05:35 +01:00
Regis Houssin
c1e6d88442 Fix: use product_type instead special_code 2018-02-04 08:55:51 +01:00
Laurent Destailleur
c6fba7273d Api interventions 2018-02-03 20:58:26 +01:00
Laurent Destailleur
3fd0105512
Merge pull request #8104 from kadogo/add-api-for-fichinter 
NEW: Add an API for fichinter
 2018-02-03 20:00:14 +01:00
Laurent Destailleur
408fc69fac
Update index.php 2018-02-03 19:59:21 +01:00
Laurent Destailleur
48a31b2398
Update explorer.php 2018-02-03 19:58:30 +01:00
Laurent Destailleur
936a2ca966
Merge branch '7.0' into add-api-for-fichinter 2018-02-03 19:57:04 +01:00
Laurent Destailleur
30c68aecf2 Code comment 2018-02-03 19:52:09 +01:00
Laurent Destailleur
5ab5c12a7b Code comments 2018-02-03 19:42:00 +01:00
Laurent Destailleur
f57ea2682a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/notify.class.php
	htdocs/societe/class/societe.class.php
 2018-02-03 19:33:24 +01:00
Laurent Destailleur
7c6c893657
Merge pull request #7996 from atm-maxime/new_force_mailto 
NEW Option to force all emails recipient
 2018-02-03 19:15:11 +01:00
Laurent Destailleur
6de2a08d70 Fix scrutinizer bugs 2018-02-03 19:10:52 +01:00
Laurent Destailleur
5c6dd0b061 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-03 19:00:04 +01:00
Laurent Destailleur
a91172b7bc Add comment into csv export 2018-02-03 18:58:02 +01:00
Laurent Destailleur
9d0314dbae NEW Add option CONTRACT_SYNC_PLANNED_DATE_OF_SERVICES 2018-02-03 18:50:20 +01:00
Laurent Destailleur
f3f39fb1ee Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-03 17:37:51 +01:00
Laurent Destailleur
833c7685e1 Hook 'maildao' was renamed into 'mail' into the method sendfile that 
send emails, and method was renamed from 'doaction' into 'sendMail'.
To process task #4875 #7969 in several steps.
 2018-02-03 17:36:33 +01:00
Laurent Destailleur
e982e1d28c
Merge pull request #8062 from atm-maxime/new_disable_freelines 
NEW hidden option MAIN_DISABLE_FREE_LINES
 2018-02-03 17:02:05 +01:00
Laurent Destailleur
a308e45c6b
Update objectline_create.tpl.php 2018-02-03 17:00:47 +01:00
Laurent Destailleur
b3df7670e9
Merge pull request #7999 from frederic34/propalweight 
NEW display weight volume in propal
 2018-02-03 16:58:58 +01:00
Laurent Destailleur
2114e6ba4e
Merge pull request #8101 from simnandez/6.0 
FIX: #7974 Contract - Invalid reference on the document
 2018-02-03 16:57:22 +01:00
Laurent Destailleur
c9e7e6d925
Merge pull request #8130 from hregis/6.0_bug2 
Fix: compatibility with multicompany sharing
 2018-02-03 16:45:16 +01:00
Laurent Destailleur
fa3f06aaaa
Merge pull request #8123 from atm-florian/7.0 
fix warning class declaration
 2018-02-03 16:33:39 +01:00