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

64633 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
91c8dbcc48 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-15 19:50:04 +01:00
Laurent Destailleur
362aec3e4b NEW Add param $dolibarr_main_restrict_ip in config file to limit ips 2018-02-15 19:49:50 +01:00
Laurent Destailleur
c022b082d5
Merge pull request #8201 from BitKFu/develop 
Export to PDF using LibreOffice 5 command line
 2018-02-15 17:30:22 +01:00
Laurent Destailleur
03e58f86f3
Merge pull request #8199 from dolibarr95/patch-37 
Fix : Bad copy/paste in var name
 2018-02-15 17:28:46 +01:00
Gerhard Stephan
93965e857b fetched from dolibarr/dolibarr 2018-02-15 16:02:13 +01:00
Laurent Destailleur
4f0ba4982b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-15 15:34:35 +01:00
Laurent Destailleur
6b74c79798 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/website.lang
 2018-02-15 15:34:17 +01:00
Laurent Destailleur
47713e0264 Fix bug reported by scrutinizer 2018-02-15 15:32:43 +01:00
Laurent Destailleur
8493d9f62e FIX #8163 2018-02-15 15:27:06 +01:00
Laurent Destailleur
13dd440fd4 FIX #8192 2018-02-15 14:47:08 +01:00
Gerhard Stephan
520f581481 Don't check for windows/linux, just call soffice (without the extension) will work on windows too. 2018-02-15 14:38:21 +01:00
Laurent Destailleur
7722f004c8 FIX #8153 2018-02-15 14:08:42 +01:00
Laurent Destailleur
5eee292663 FIX #8189 2018-02-15 13:40:17 +01:00
dolibarr95
634f3bc025
Bad copy/paste 2018-02-15 13:38:21 +01:00
Laurent Destailleur
825a295294 FIX #8198 2018-02-15 13:28:15 +01:00
Laurent Destailleur
d4c5468c71
Merge pull request #8197 from dolibarr95/patch-36 
NEW Add phone format for a lot of countries
 2018-02-15 13:24:51 +01:00
Laurent Destailleur
9965a25eaa Code comment 2018-02-15 13:23:13 +01:00
Laurent Destailleur
0172ecb425 Code comment 2018-02-15 13:21:58 +01:00
Laurent Destailleur
d547d1a9cf Suggest better change for #8196. To be tested. 2018-02-15 13:16:54 +01:00
Laurent Destailleur
f0855da0fb Fix responsive 2018-02-15 12:57:04 +01:00
dolibarr95
3ffc671052
Add phone format for several countries 2018-02-15 10:47:32 +01:00
Gerhard Stephan
51028c845d Export to PDF using LibreOffice 5 command line 2018-02-15 10:15:27 +01:00
Laurent Destailleur
a4384b1921 Fix date start/end of project are day not hours 2018-02-15 02:02:32 +01:00
Laurent Destailleur
18acff5e57 Fix avoid error when homepage not set 2018-02-15 01:29:51 +01:00
Laurent Destailleur
dde5c186e7 Fix duplicate html tag 2018-02-15 00:53:03 +01:00
Laurent Destailleur
b789a50ce6 Fix duplicate html tag 2018-02-15 00:38:11 +01:00
Laurent Destailleur
bab5c41b98 Fix duplicate html tag 2018-02-15 00:24:15 +01:00
Laurent Destailleur
0fc302fe98 Sync transifex 2018-02-15 00:06:43 +01:00
Laurent Destailleur
b515448bbd Fix delete when no extrafields used 2018-02-15 00:01:25 +01:00
Laurent Destailleur
5f0f9ff326 Fix delete page 2018-02-14 23:57:57 +01:00
Laurent Destailleur
f1a9f81fb4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/website.lang
 2018-02-14 22:19:59 +01:00
Laurent Destailleur
7ba55ea12e Fix phpunit 2018-02-14 22:17:53 +01:00
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
78697c1735 USe fk_product is better than ref 2018-02-14 21:14:24 +01:00
Laurent Destailleur
f3ffc7ce8a
Merge pull request #8185 from BitKFu/develop 
NEW Load product data optional fields to the line -> enables to use "line_options_{extrafield}"
 2018-02-14 20:56:00 +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
f8f4d5caac
Merge pull request #8181 from ATM-Nicolas/new_charges_sociales_trigger 
NEW Call to trigger on social contribution creation
 2018-02-14 20:49:31 +01:00
Laurent Destailleur
3780a8b1d9
Merge branch 'develop' into new_charges_sociales_trigger 2018-02-14 20:48:16 +01:00
Laurent Destailleur
ea2e46cccd
Update chargesociales.class.php 2018-02-14 20:46:40 +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