lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
76,237 Commits 43 Branches 150 Tags 886 MiB
17cb6fa11f
Commit Graph

76237 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
17cb6fa11f Fix copyright 2019-06-03 15:22:00 +02:00
Laurent Destailleur
5144992eea Fix packager 2019-06-03 11:51:15 +02:00
Laurent Destailleur
5c2b585705 Fix packager 2019-06-03 11:50:20 +02:00
Laurent Destailleur
281c69f59a Prepare package 10.0 2019-06-03 11:33:04 +02:00
Laurent Destailleur
db463b1080 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-06-03 11:26:29 +02:00
Laurent Destailleur
398d2b864f Update doc 2019-06-03 11:25:31 +02:00
Laurent Destailleur
5530e003ba Fix title 2019-06-02 19:47:19 +02:00
Laurent Destailleur
e6100310af Fix missing title 2019-06-02 19:47:01 +02:00
Laurent Destailleur
1415ad5b53 Debug website module 2019-06-02 17:27:00 +02:00
Laurent Destailleur
3cd302605e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-02 15:49:44 +02:00
Laurent Destailleur
3cda0d2dc5 Fix phpcs 2019-06-02 15:49:10 +02:00
Laurent Destailleur
d8adda82f9
Merge pull request #11291 from AXeL-dev/patch-9 
Fix #11256
 2019-06-02 12:23:27 +02:00
Laurent Destailleur
ea58f8a617 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-02 11:49:49 +02:00
Laurent Destailleur
5f0fbcea9a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/contact/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
 2019-06-02 11:49:33 +02:00
AXeL-dev
82b37a514c Fixed empty verification (0 might be considered as empty also, so its better to compare string value with '') 2019-06-01 16:27:06 +00:00
AXeL-dev
d2c853c47b Fix #11256 2019-06-01 15:00:15 +00:00
Laurent Destailleur
f2088a084f Fix error management 2019-05-31 11:53:30 +02:00
Laurent Destailleur
12c1531b3b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-31 11:39:06 +02:00
Laurent Destailleur
cd75794aaa FIX #11169 #11202 2019-05-31 11:38:54 +02:00
Laurent Destailleur
7e678f3d83
Merge pull request #11272 from hregis/develop_security 
FIX missing encrypt llx_const fields
 2019-05-31 10:57:00 +02:00
Laurent Destailleur
dedd85c8b5
Merge pull request #11271 from hregis/9.0_security 
FIX missing llx_const encrypt
 2019-05-31 10:56:24 +02:00
Laurent Destailleur
3dc36d4ab7
Merge pull request #11269 from ptibogxiv/patch-183 
FIX display job/function in contact list
 2019-05-31 10:56:02 +02:00
Regis Houssin
063fe35c97 FIX missing encrypt llx_const fields 2019-05-30 11:45:55 +02:00
Regis Houssin
bdd54ae245 FIX missing llx_const encrypt 2019-05-30 11:42:28 +02:00
ptibogxiv
5b6821c191
FIX display job/fucnction in contact list 
Display job/function is usefull for correct choice of additionnal contact in a object (PR from returns of severals professionnal dolibarr's user)
 2019-05-29 16:55:44 +02:00
Laurent Destailleur
f89e72e329
Merge pull request #11266 from frederic34/patch-5 
Update linkedobjectblock.tpl.php
 2019-05-29 13:54:28 +02:00
Laurent Destailleur
03feb3604c
Merge pull request #11265 from frederic34/patch-2 
Update tpl linked invoices
 2019-05-29 13:54:09 +02:00
Laurent Destailleur
69efc54fb6
Merge pull request #11263 from atm-arnaud/9.0_FIX_productaccount_buy_page 
FIX productaccount buylist with pages
 2019-05-29 13:52:53 +02:00
Laurent Destailleur
ab73d8a6fc
Merge pull request #11258 from hregis/develop_security 
FIX add Windows and Mac executable
 2019-05-29 13:52:19 +02:00
Laurent Destailleur
bc030561ac Debug various payment 2019-05-29 13:48:00 +02:00
Laurent Destailleur
280a034199 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-29 13:15:57 +02:00
Laurent Destailleur
a7dccf1617
Merge pull request #11255 from aspangaro/10.0_accountancy2 
FIX Lost functionnality - Add category to bank transaction with various payment
 2019-05-29 13:15:47 +02:00
Laurent Destailleur
cafb3840b7 Fix look and feel v10 2019-05-29 12:56:11 +02:00
Laurent Destailleur
6a84dfe29e
Update card.php 2019-05-29 12:34:54 +02:00
Laurent Destailleur
ae597e7b63
Merge pull request #11252 from KlaasOl/patch-2 
Create llx_accounting_account_nl.sql
 2019-05-29 12:25:42 +02:00
Laurent Destailleur
8c97fc164f
Merge pull request #11253 from KlaasOl/patch-3 
Update llx_accounting_abc.sql
 2019-05-29 12:25:08 +02:00
Laurent Destailleur
b6f4cab20d
Merge pull request #11247 from aspangaro/develop 
Accountancy - Use Ansi on Agiris model export & indent
 2019-05-29 12:23:25 +02:00
Laurent Destailleur
05063016e8 FIX #11244 Enhance repair tool 2019-05-29 12:21:51 +02:00
Frédéric FRANCE
48d15032af
Update linkedobjectblock.tpl.php 2019-05-29 11:28:07 +02:00
Frédéric FRANCE
6bb1a4a0e6
Update linkedobjectblock.tpl.php 2019-05-29 11:26:04 +02:00
Frédéric FRANCE
c5c7e8d451
Update linkedobjectblock.tpl.php 2019-05-29 11:18:01 +02:00
Laurent Destailleur
b46b675b7c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-29 10:36:00 +02:00
Laurent Destailleur
a491de01b3
Merge pull request #11244 from altatof/8.0 
FIX : do not include tpl from disabled modules
 2019-05-29 10:35:39 +02:00
Laurent Destailleur
cf70b26db7 Add distinct id 2019-05-29 10:27:03 +02:00
Laurent Destailleur
84d7154106 Fix phpcs 2019-05-29 10:03:18 +02:00
Laurent Destailleur
a524fd17ce Fix phpcs 2019-05-29 10:03:05 +02:00
Laurent Destailleur
fd0eb47b35 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/holiday/card.php
 2019-05-29 09:57:48 +02:00
Laurent Destailleur
a26c8c0714 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-29 09:55:55 +02:00
Laurent Destailleur
6e9cd819c1 Fix phpcs 2019-05-29 09:55:09 +02:00
Laurent Destailleur
35b021f203 Fix phpcs 2019-05-29 09:53:54 +02:00