lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
55,508 Commits 43 Branches 150 Tags 886 MiB
0debcf745a
Commit Graph

55508 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
0debcf745a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/cron/card.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php
 2016-09-09 09:32:14 +02:00
Laurent Destailleur
efde12b489 Fix minor css 2016-09-09 09:21:27 +02:00
Laurent Destailleur
87165cd859 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-09-08 18:21:10 +02:00
Juanjo Menent
65ba409add Merge pull request #5724 from grandoc/4.0 
fix : bad name
 2016-09-08 18:17:39 +02:00
Laurent Destailleur
52801b13d9 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-09-08 18:16:50 +02:00
Juanjo Menent
ecfd3a0af5 Merge pull request #5722 from atm-ph/fix_4.0_multicurrency_rate_entity 
Fix miss entity column in llx_multicurrency_rate
 2016-09-08 18:16:21 +02:00
Laurent Destailleur
308200f9ba Fix tooltip on late button 2016-09-08 18:14:31 +02:00
Juanjo Menent
fc8fe394db Merge pull request #5714 from aspangaro/4.0-p48 
FIX: Problem of presentation with index supplier command
 2016-09-08 18:13:47 +02:00
Laurent Destailleur
4fe4907b44 FIX Mandatory field payment term was not css highlighted. 2016-09-08 18:13:23 +02:00
Juanjo Menent
bdb55895fa Merge pull request #5713 from sanser/4.0 
FIX: fileconf.php redundant else blocks
 2016-09-08 18:11:44 +02:00
Laurent Destailleur
c3bb4a89e4 Fix late satus on contract service line 2016-09-08 17:53:04 +02:00
Laurent Destailleur
417b2f566f FIX Translation of "Name" is not a good choice for floow-up. 2016-09-08 17:31:42 +02:00
philippe grand
6fd14128ba fix : bad name 2016-09-08 16:37:30 +02:00
phf
7229b572dc Default entity 1 in llx_multicurrency_rate 2016-09-08 14:59:16 +02:00
phf
7917169961 Fix miss entity column in llx_multicurrency_rate 2016-09-08 14:53:59 +02:00
Laurent Destailleur
71cef95dda FIX Execute a dedicated job from its id may results of launching other 
jobs too.
 2016-09-08 13:01:50 +02:00
Laurent Destailleur
9aa6c72a11 FIX Update of maxnbrun on job list failed. 2016-09-08 12:37:51 +02:00
Laurent Destailleur
72e149e1a6 FIX SEC Improve CSRF protection. Reduce usage of NOCSRFCHECK. 2016-09-08 12:12:00 +02:00
Laurent Destailleur
99a3cc6efc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-08 11:39:47 +02:00
Laurent Destailleur
6d6eceb0ca Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-08 11:39:38 +02:00
Laurent Destailleur
9affdc0886 Prepare 4.0.1 2016-09-08 11:23:26 +02:00
Laurent Destailleur
35145b7426 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-09-08 11:15:16 +02:00
Laurent Destailleur
2b7ef01e42 FIX SEC for HTB23302 2016-09-08 11:09:38 +02:00
Laurent Destailleur
69b65ad00c Fix MAIN_SECURITY_CSRF. Renamed into MAIN_SECURITY_CSRF_WITH_TOKEN 
So option name is easier to understand.
 2016-09-08 10:43:31 +02:00
aspangaro
2b43eb934f Fix: Problem of presentation with index supplier command 2016-09-07 22:25:37 +02:00
Sergiu Sandu
02698c5abb fileconf.php redundant else statements 
Is it ok the 2 else blocks are the same?
 2016-09-07 17:02:41 +01:00
Juanjo Menent
729458ecf8 Merge pull request #5709 from atm-florian/dev_workflow_classDeliverOrderIfShippedTotally 
NEW :  workflow class deliver order if shipped totally on shipping validation
 2016-09-07 17:10:14 +02:00
Juanjo Menent
c21d6aa91e Merge pull request #5708 from atm-florian/dev_fixaddorderline 
Fix : cannot add order line
 2016-09-07 17:08:25 +02:00
Juanjo Menent
73865fa14a Merge pull request #5707 from aspangaro/5.0-p12 
Fix Presentation of fiscal year
 2016-09-07 17:06:58 +02:00
Juanjo Menent
7bce5a354f Merge pull request #5703 from hregis/4.0_bug 
Fix: Warning: preg_match(): No ending delimiter '/' found
 2016-09-07 16:58:00 +02:00
florian HENRY
baa7aa8cd4 New FEATURE 2016-09-07 14:08:41 +02:00
florian HENRY
d6be1cebcb work on going 2016-09-07 12:41:32 +02:00
florian HENRY
abda9146f1 FIX : cannot add order line (if fk column is not in user they whould be 
NULL by defaut.
 2016-09-07 11:32:45 +02:00
Laurent Destailleur
4a49bc1d08 NEW Reduce space lost on EDM module. 2016-09-07 02:10:39 +02:00
Laurent Destailleur
5fdca121aa NEW Can renamed attached files on products and expense reports 2016-09-07 01:54:16 +02:00
Laurent Destailleur
5aaa3028a2 FIX Better position of fields in expense report PDF. 2016-09-07 01:47:09 +02:00
aspangaro
37c7d49537 Presentation of fiscal year 2016-09-06 22:42:15 +02:00
Laurent Destailleur
aa1df53dd5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-06 17:42:37 +02:00
Regis Houssin
36110da4bf Fix: Warning: preg_match(): No ending delimiter '/' found 2016-09-06 17:22:56 +02:00
Laurent Destailleur
10c1f02243 Extrafields for expensereports are visible on cards 2016-09-06 13:39:44 +02:00
Laurent Destailleur
cc9230c07f FIX Columns truncated and translation missing 2016-09-06 13:08:49 +02:00
Laurent Destailleur
898bbd6031 NEW Support extrafields for expense reports 2016-09-06 13:00:32 +02:00
Laurent Destailleur
8419202588 NEW Support free bottom text and watermark on expense report template 2016-09-06 12:47:18 +02:00
Laurent Destailleur
666c62af04 Fix http into https 2016-09-06 00:59:31 +02:00
Laurent Destailleur
e07f65721a Fix css 2016-09-06 00:58:37 +02:00
Laurent Destailleur
ccd2e31d59 Merge pull request #5700 from atm-florian/dev_createorderfromcontract 
Create order from contract
 2016-09-05 15:55:37 +02:00
Laurent Destailleur
ec99a056ac NEW introduce option PROJECT_DISABLE_PRIVATE_PROJECT and 
PROJECT_DISABLE_PUBLIC_PROJECT
 2016-09-05 15:13:03 +02:00
florian HENRY
ae34ef98f6 Create order from contract 2016-09-05 09:42:34 +02:00
Laurent Destailleur
d1719bad5a Fix ChangeLog 2016-09-05 01:36:06 +02:00
Laurent Destailleur
d4c35b7131 Fix bad translation 2016-09-04 23:45:14 +02:00