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

64424 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
4e145f0e5b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-02-14 22:09:12 +01:00
Laurent Destailleur
7f8cbc0f62 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/adherents/type.php
	htdocs/contrat/services.php
	htdocs/contrat/tpl/linkedobjectblock.tpl.php
	htdocs/install/upgrade2.php
 2018-02-14 22:08:18 +01:00
Laurent Destailleur
15ab37b46e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-14 21:51:55 +01:00
Laurent Destailleur
b21feca9d7 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-14 21:51:35 +01:00
Laurent Destailleur
147b35d62e
Merge pull request #8194 from hregis/6.0_multicompany 
Fix: Update entity field in llx_user_rights and llx_usergroup_rights
 2018-02-14 21:31:02 +01:00
Laurent Destailleur
cf5c972c65
Merge pull request #8193 from atm-ph/fix_6.0_multicurrency_situation_invoice 
Fix apply global progress don't update multicurrency values
 2018-02-14 21:27:52 +01:00
Laurent Destailleur
483bfb096b
Merge pull request #8188 from atm-quentin/6.0_develop 
NEW Add sale representative einstein_pdf_modules
 2018-02-14 21:27:24 +01:00
Laurent Destailleur
06357e62da
Merge pull request #8182 from laudeco/hotfix/bank_module 
Bank module is not accessible (error 500) since 7.0.0
 2018-02-14 20:52:36 +01:00
Laurent Destailleur
c28d87252b
Merge pull request #8184 from laudeco/hotfix/8183_welcome_email_adherent 
Fix 8183 - adherent welcome e-mail edition always put 1 instead of keeping the e-mail
 2018-02-14 20:51:57 +01:00
Laurent Destailleur
d0fdf700d7
Update type.php 2018-02-14 20:51:33 +01:00
Laurent Destailleur
0d00c51c2a
Update type.php 2018-02-14 20:51:05 +01:00
Laurent Destailleur
94a76a1393
Merge pull request #8180 from atm-maxime/fix_service_list 
Fix : contract service list context was mixing up with service list from product/service module
 2018-02-14 20:43:03 +01:00
Laurent Destailleur
27c55635f3
Merge pull request #8164 from hregis/6.0_bug 
Fix: nocheck for "fournisseur", already check with "societe"
 2018-02-14 20:36:22 +01:00
Laurent Destailleur
23ee6748f7
Update fournisseurs.php 2018-02-14 20:36:13 +01:00
Laurent Destailleur
8783857aa5 Fix tooltip of website editor 2018-02-14 20:33:48 +01:00
Laurent Destailleur
536eb7e008 Fix label of invoice 2018-02-14 17:25:13 +01:00
Laurent Destailleur
ca71d90d96 Fix help 2018-02-14 14:57:53 +01:00
Laurent Destailleur
9f883f3401 Fix install log disappeared 2018-02-14 14:50:22 +01:00
Regis Houssin
fa2fddcdc1 Fix: Update entity field in llx_user_rights and llx_usergroup_rights 2018-02-14 14:30:39 +01:00
Laurent Destailleur
7bdf335a8e Add a fix to clean data 2018-02-14 14:26:33 +01:00
atm-ph
c690dfb258 Fix apply global progress don't update multicurrency values 2018-02-14 10:15:38 +01:00
Laurent Destailleur
434980bb22 Fix svg image preview ko 2018-02-13 18:15:39 +01:00
Laurent Destailleur
e510e1b679 Fix search field at wrong column 2018-02-13 15:48:29 +01:00
Laurent Destailleur
7ed128ff2b Fix bad escaping 2018-02-13 14:30:14 +01:00
Laurent Destailleur
a8267a86ca Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-02-13 13:39:41 +01:00
Laurent Destailleur
af9e5885d0 Update changelog 2018-02-13 13:38:19 +01:00
Laurent Destailleur
39a2d03263 Update changelog 2018-02-13 13:36:44 +01:00
atm-quentin
144c13998a NEW_einstein_pdf_modules 2018-02-13 09:51:33 +01:00
Laurent Destailleur
88bdebb80f Fix label truncated 2018-02-12 23:08:01 +01:00
Laurent Destailleur
00a8be22a2 Fix field too small 2018-02-12 22:11:43 +01:00
De Coninck Laurent
1052213c97 Fix 8183 - adherent welcome e-mail 
Fix the adherent welcome e-mail.

[see: #8183]
 2018-02-12 18:12:43 +01:00
Laurent Destailleur
a4f48fcfb6 Fix feature must be hidden (not stable) 2018-02-12 16:09:22 +01:00
Laurent Destailleur
1c9f543fd5 Translation 2018-02-12 15:55:37 +01:00
Laurent Destailleur
b2835fc803 Fix check of vat only for european countries 2018-02-12 15:54:24 +01:00
De Coninck Laurent
6f7d6f977b fix error in latest release 2018-02-12 15:50:14 +01:00
Laurent Destailleur
30ba1c1702 FIX #8174 2018-02-12 14:02:51 +01:00
Laurent Destailleur
12e48e07ae Fix deletion of ledger line when editing transaction 2018-02-12 13:50:26 +01:00
Maxime Kohlhaas
ef05171641 Fix : contract service list context was mixing up with service list from product/service module 2018-02-12 13:48:43 +01:00
Laurent Destailleur
284e6f1ad3 Better position of error check 2018-02-12 13:39:06 +01:00
Laurent Destailleur
caa136bed3 FIX Debug journalization: Avoid journalizing if all lines not bound 2018-02-12 13:31:32 +01:00
Laurent Destailleur
09dfd5eb9f Fix journalization protection 2018-02-12 12:02:01 +01:00
Laurent Destailleur
734bd4d2fb Fix menu visible in dev only 2018-02-12 10:15:58 +01:00
Regis Houssin
24cc687724 Fix: you can't check "fournisseur" with checkUserAccessToObject without 
object ID
 2018-02-12 09:28:41 +01:00
Regis Houssin
448fcae02f Fix: move "fournisseur" in $checksoc 2018-02-12 09:03:53 +01:00
Regis Houssin
abb7e651d1 Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0_bug 2018-02-12 09:02:12 +01:00
Laurent Destailleur
60a848de5a Fix bad list of id for supplier categories 2018-02-12 04:09:15 +01:00
Laurent Destailleur
64f61c80ad Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-02-12 04:08:13 +01:00
Laurent Destailleur
55779e3b55 Fix confusion between supplier and customer categories 2018-02-12 04:07:45 +01:00
Laurent Destailleur
9b8b3a1236
Merge pull request #8176 from hregis/7.0_bug2 
Fix: wrong param name (Travis error !)
 2018-02-12 03:25:23 +01:00
Laurent Destailleur
b23ef5fd8f
Merge pull request #8175 from hregis/7.0_bug 
Fix: check perms by type of product
 2018-02-12 03:25:08 +01:00