Frédéric FRANCE
|
7f3f48be0f
|
clean indent in theme directory
|
2019-10-26 21:11:36 +02:00 |
|
Frédéric FRANCE
|
a7797ba1da
|
clean indent in variants directory
|
2019-10-26 20:53:39 +02:00 |
|
Frédéric FRANCE
|
635306c084
|
restore original rules to be mergeable without errors
|
2019-10-26 18:23:51 +02:00 |
|
Frédéric FRANCE
|
a1f0245c79
|
clean indent in compta, contact directory
|
2019-10-26 18:13:20 +02:00 |
|
Frédéric FRANCE
|
79825e2193
|
start clean indent in compta directory
|
2019-10-26 14:42:25 +02:00 |
|
Frédéric FRANCE
|
1a10b30a76
|
clean indent in comm directory
|
2019-10-26 14:28:40 +02:00 |
|
Frédéric FRANCE
|
86f22c4563
|
do not ignore lines with mix od tabs and spaces
|
2019-10-20 17:17:22 +02:00 |
|
Frédéric FRANCE
|
0ede817588
|
do not ignore lines with mix od tabs and spaces
|
2019-10-20 16:56:47 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Frédéric FRANCE
|
9f59656589
|
fix typo inspired by grandoc
|
2019-10-11 23:08:33 +02:00 |
|
Laurent Destailleur
|
5d64cec354
|
Exclude medias from fixdosfiles
|
2019-10-10 10:52:06 +02:00 |
|
Laurent Destailleur
|
aebae5ff83
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/margins.lang
htdocs/user/class/user.class.php
|
2019-10-10 10:37:17 +02:00 |
|
Laurent Destailleur
|
1c105718b9
|
Update demo
|
2019-10-08 21:06:09 +02:00 |
|
Laurent Destailleur
|
0cf014b01f
|
Update Restler to 3.0RC6 (last bug fixes of branch v3)
|
2019-10-08 11:14:53 +02:00 |
|
Laurent Destailleur
|
44025ce4c2
|
Update TCPDF to 6.3.2
|
2019-10-08 09:59:17 +02:00 |
|
Laurent Destailleur
|
539f4355c3
|
Try to fix stickler
|
2019-10-07 20:48:44 +02:00 |
|
Laurent Destailleur
|
8904ce5732
|
Removed warning we don't want
|
2019-10-03 16:57:12 +02:00 |
|
stickler-ci
|
3cad71f2c1
|
Fixing style errors.
|
2019-10-03 08:00:38 +00:00 |
|
Alexandre SPANGARO
|
16c6c9ae75
|
Merge remote-tracking branch 'upstream/develop' into 11.0_https
|
2019-10-01 06:12:24 +02:00 |
|
Alexandre SPANGARO
|
91b3bf76fd
|
Merge branch 'develop' into 11.0_https
|
2019-10-01 06:11:43 +02:00 |
|
Frédéric FRANCE
|
258424416e
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-30 07:49:52 +02:00 |
|
Laurent Destailleur
|
f3bc319a78
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/takepos/takepos.php
|
2019-09-27 14:11:14 +02:00 |
|
Laurent Destailleur
|
33754f1951
|
Update demo
|
2019-09-26 14:36:23 +02:00 |
|
Laurent Destailleur
|
24e5b6ab79
|
Fix default filename of dump
|
2019-09-26 14:35:50 +02:00 |
|
Laurent Destailleur
|
0e5d0a7784
|
Add data for tickets
|
2019-09-26 14:14:01 +02:00 |
|
Laurent Destailleur
|
b0615d477e
|
Update demo
|
2019-09-26 13:58:43 +02:00 |
|
Laurent Destailleur
|
280219843e
|
Update demo
|
2019-09-26 13:58:30 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Frédéric FRANCE
|
9e18f5243a
|
jshint
|
2019-09-11 18:21:59 +02:00 |
|
Frédéric FRANCE
|
638362f373
|
jshint
|
2019-09-11 18:17:12 +02:00 |
|
Frédéric FRANCE
|
d37dd4ed3c
|
jshint
|
2019-09-11 18:07:21 +02:00 |
|
Frédéric FRANCE
|
c6a02312a9
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-07 14:19:07 +02:00 |
|
Laurent Destailleur
|
8891fd4981
|
Exclude namespacemig
|
2019-08-21 14:59:48 +02:00 |
|
Laurent Destailleur
|
d82e60adb7
|
Work on namespaces test
|
2019-08-20 20:31:46 +02:00 |
|
Jean Traullé
|
c739b95666
|
Fix codestyle
lessc.class.php should be excluded from ruleset as it is an external lib
|
2019-08-14 23:33:06 +02:00 |
|
Laurent Destailleur
|
6df36866e1
|
Remove mentions to register_globals
|
2019-08-14 15:30:03 +02:00 |
|
Alexandre SPANGARO
|
8b8aaafc05
|
Merge branch 'develop' into 10.0_intracommreport
|
2019-07-20 05:47:31 +02:00 |
|
Laurent Destailleur
|
50480bf517
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/opensurvey/index.php
|
2019-07-18 18:23:24 +02:00 |
|
Laurent Destailleur
|
ea349de081
|
FIX #11498
|
2019-07-15 23:25:42 +02:00 |
|
Alexandre SPANGARO
|
9da91c06ed
|
Merge branch 'develop' into 10.0_intracommreport
|
2019-06-26 15:11:43 +02:00 |
|
Philippe GRAND
|
9e905901d1
|
all http addresses should be https now
|
2019-06-23 15:35:12 +02:00 |
|
Philippe GRAND
|
eef9b2867b
|
all http addresses should be https now
|
2019-06-23 15:33:04 +02:00 |
|
Philippe GRAND
|
8dd7e15193
|
all http addresses should be https now
|
2019-06-23 15:32:29 +02:00 |
|
Philippe GRAND
|
2348d499a2
|
all http addresses should be https now
|
2019-06-23 15:30:35 +02:00 |
|
Alexandre SPANGARO
|
abfb708044
|
Merge branch 'develop' into 10.0_intracommreport
|
2019-06-19 21:43:40 +02:00 |
|
Laurent Destailleur
|
1189abdef8
|
Clean demo file
|
2019-06-05 11:59:01 +02:00 |
|
Laurent Destailleur
|
8ef7a3abf2
|
Clean demofile for v10
|
2019-06-05 11:56:57 +02:00 |
|
Laurent Destailleur
|
ba7b601387
|
Fix phpcs
|
2019-05-23 14:29:37 +02:00 |
|
Laurent Destailleur
|
e8ba312d2a
|
Fix phpcs
|
2019-05-23 14:25:16 +02:00 |
|
Laurent Destailleur
|
5f639f611a
|
Try to introduce rules on tab
|
2019-05-23 13:12:04 +02:00 |
|
Frédéric FRANCE
|
08b1f123b0
|
zapier for dolibarr
|
2019-05-19 21:49:34 +02:00 |
|
Frédéric FRANCE
|
aef850f6d3
|
zapier for dolibarr
|
2019-05-19 21:12:22 +02:00 |
|
Alexandre SPANGARO
|
f9e3a958c4
|
NEW Module Intracomm report
|
2019-05-19 10:44:09 +02:00 |
|
Laurent Destailleur
|
384c2d8358
|
Exclude files
|
2019-04-03 18:10:10 +02:00 |
|
Laurent Destailleur
|
c959c8b645
|
Fix api with prestashop
|
2019-03-31 18:21:00 +02:00 |
|
Philippe GRAND
|
9af5aa8eaa
|
update with html5 compliant code
|
2019-03-19 13:41:55 +01:00 |
|
Laurent Destailleur
|
23252ed646
|
Add a test to avoid SQL non compatible with postgresql
|
2019-03-18 11:10:37 +01:00 |
|
Laurent Destailleur
|
39e6e71b0d
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
|
2019-03-14 14:20:34 +01:00 |
|
Laurent Destailleur
|
3073567763
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-03-14 14:17:52 +01:00 |
|
Laurent Destailleur
|
bd0dcf3fb6
|
NEW Add a script to purge data older than a defined creation date
|
2019-03-11 14:24:20 +01:00 |
|
Laurent Destailleur
|
a47cc4ef57
|
Fix script to delete data
|
2019-03-08 19:26:16 +01:00 |
|
Laurent Destailleur
|
6b8c2a1d3b
|
Enhance script to purge data
|
2019-03-08 14:09:22 +01:00 |
|
Laurent Destailleur
|
f6c52578cc
|
Add README file
|
2019-03-08 13:34:03 +01:00 |
|
Alexandre SPANGARO
|
d926657534
|
FIX: Accountancy - Format EBP import
Add doc
|
2019-03-08 10:57:14 +01:00 |
|
Frédéric FRANCE
|
2745f98644
|
PSR2.Classes.PropertyDeclaration.VarUsed
|
2019-03-05 22:10:46 +01:00 |
|
Laurent Destailleur
|
a5711a51ab
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/core/lib/json.lib.php
test/phpunit/JsonLibTest.php
|
2019-03-02 18:30:17 +01:00 |
|
Frédéric FRANCE
|
40d34940f1
|
fix exclude from phpcs
|
2019-03-02 10:00:51 +01:00 |
|
Frédéric FRANCE
|
c5c27fdb77
|
add visibility
|
2019-03-01 19:24:06 +01:00 |
|
Frédéric FRANCE
|
bd2e541fd6
|
add visibility
|
2019-03-01 18:28:51 +01:00 |
|
Frédéric FRANCE
|
796ea6f4ea
|
add visibility
|
2019-02-28 23:19:58 +01:00 |
|
Frédéric FRANCE
|
304dafe9f5
|
check without new rule
|
2019-02-28 22:48:24 +01:00 |
|
Frédéric FRANCE
|
c89e4d79b8
|
wip
|
2019-02-25 22:27:04 +01:00 |
|
Frédéric FRANCE
|
6ee186096c
|
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
|
2019-02-24 23:48:51 +01:00 |
|
Frédéric FRANCE
|
27218b7087
|
wip
|
2019-02-24 23:32:09 +01:00 |
|
Frédéric FRANCE
|
894123fb06
|
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket
|
2019-02-24 20:06:55 +01:00 |
|
Laurent Destailleur
|
09fa5b0456
|
Add more github stats
|
2019-02-15 23:17:46 +01:00 |
|
Laurent Destailleur
|
e6e18ff616
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/menus/edit.php
htdocs/product/stock/card.php
htdocs/product/stock/info.php
htdocs/product/stock/movement_list.php
|
2019-02-14 15:33:17 +01:00 |
|
Laurent Destailleur
|
f0846a9e30
|
Update date of demo
|
2019-02-13 15:48:55 +01:00 |
|
Laurent Destailleur
|
6a4d8c68e8
|
Missing dir in summary
|
2019-02-13 15:35:30 +01:00 |
|
Laurent Destailleur
|
ec9e70a79a
|
Enhance script to load demo
|
2019-02-13 15:19:12 +01:00 |
|
Laurent Destailleur
|
a1803f35e4
|
Avoid warnings
|
2019-02-13 15:14:12 +01:00 |
|
Laurent Destailleur
|
19d68e7085
|
Removed non required files
|
2019-02-13 15:11:31 +01:00 |
|
Laurent Destailleur
|
fb5466fca0
|
Fix remove bad rule
|
2019-02-12 17:02:27 +01:00 |
|
Laurent Destailleur
|
e054b080a5
|
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-12 13:33:39 +01:00 |
|
Laurent Destailleur
|
031999047b
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-12 13:18:05 +01:00 |
|
Laurent Destailleur
|
65f5cb4302
|
Doc
|
2019-02-12 13:17:40 +01:00 |
|
Laurent Destailleur
|
9070e5fe01
|
Merge pull request #10543 from ka7/spelling_1
spelling fixes
|
2019-02-12 13:10:18 +01:00 |
|
Laurent Destailleur
|
4476a1038b
|
Update lib
|
2019-02-12 04:04:57 +01:00 |
|
Laurent Destailleur
|
5450a09b7c
|
Add link to resource
|
2019-02-12 01:33:03 +01:00 |
|
klemens
|
beb2791dde
|
spelling fixes
|
2019-02-10 12:59:09 +01:00 |
|
Frédéric FRANCE
|
1e43f8e54a
|
PEAR FunctionCallSignature
|
2019-02-10 10:45:49 +01:00 |
|
Frédéric FRANCE
|
580e5c42d2
|
GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-09 12:00:49 +01:00 |
|
Frédéric FRANCE
|
970392adb8
|
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
|
2019-02-03 22:41:57 +01:00 |
|
Laurent Destailleur
|
a6dde3d6bd
|
Merge branch 'develop' into nospaceaftercomma
|
2019-02-03 19:27:16 +01:00 |
|
Laurent Destailleur
|
9f7dfe2921
|
Merge pull request #10481 from frederic34/psr2forloop
psr2 Squiz.ControlStructures.ForEachLoopDeclaration
|
2019-02-03 19:11:07 +01:00 |
|
Frédéric FRANCE
|
273d68381c
|
psr2 end file new line none found
|
2019-02-03 15:21:21 +01:00 |
|
Frédéric FRANCE
|
80a12fcd1c
|
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-03 14:29:45 +01:00 |
|
Frédéric FRANCE
|
03701fa091
|
psr2
|
2019-02-02 18:25:01 +01:00 |
|
Laurent Destailleur
|
e18bd6f986
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 18:27:35 +01:00 |
|
Frédéric FRANCE
|
b10558bacd
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-27 23:23:38 +01:00 |
|
Laurent Destailleur
|
f30a3d59ba
|
Merge branch 'develop' into toomanylines
|
2019-01-27 17:59:13 +01:00 |
|
Laurent Destailleur
|
4f9f0fd7b5
|
Merge branch 'develop' into elseif
|
2019-01-27 17:54:06 +01:00 |
|
Frédéric FRANCE
|
f0cdf300d1
|
Squiz.Functions.FunctionDeclarationArgumentSpacing
|
2019-01-27 15:20:16 +01:00 |
|
Frédéric FRANCE
|
496fa9b0fb
|
PSR2.Files.EndFileNewline.TooMany
|
2019-01-27 14:10:35 +01:00 |
|
Frédéric FRANCE
|
7ee086b402
|
PSR2 space after comma in function call
|
2019-01-27 11:55:16 +01:00 |
|
Frédéric FRANCE
|
6e91b3cefc
|
PSR2 usage of else if is discouraged
|
2019-01-27 10:49:34 +01:00 |
|
Laurent Destailleur
|
3ddfcbe3bb
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
.travis.yml
dev/setup/codesniffer/ruleset.xml
|
2019-01-20 20:36:45 +01:00 |
|
Laurent Destailleur
|
abd9686d65
|
Enable accounting module
|
2019-01-20 14:25:26 +01:00 |
|
Laurent Destailleur
|
168ff1a806
|
Fix phpcs
|
2019-01-20 13:22:56 +01:00 |
|
Laurent Destailleur
|
43277cb630
|
Removed some warning
|
2019-01-20 13:22:04 +01:00 |
|
Laurent Destailleur
|
3ba4c4dde0
|
Remove annoying warnings
|
2019-01-12 19:08:19 +01:00 |
|
Laurent Destailleur
|
6e078105ab
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/journal/bankjournal.php
|
2019-01-06 01:22:10 +01:00 |
|
Laurent Destailleur
|
cbf1c30647
|
Fix better test tool
|
2019-01-05 15:19:07 +01:00 |
|
Laurent Destailleur
|
b5ad35f886
|
Fix better test tool
|
2019-01-05 15:18:37 +01:00 |
|
Laurent Destailleur
|
5c516fdae2
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.form.class.php
|
2018-12-26 19:43:01 +01:00 |
|
Laurent Destailleur
|
def732246d
|
Clean dump
|
2018-12-26 19:16:05 +01:00 |
|
Laurent Destailleur
|
e7b3c91645
|
Fix dump file
|
2018-12-26 19:10:22 +01:00 |
|
Laurent Destailleur
|
394a19e93b
|
Merge pull request #10148 from atm-ph/new_bash_snake_case_to_camel_case
New bash snake case to camel case
|
2018-12-15 15:15:03 +01:00 |
|
Laurent Destailleur
|
f48cc46763
|
Update doc schema
|
2018-12-12 21:18:55 +01:00 |
|
Laurent Destailleur
|
a81d7e5338
|
Removed deprecated files
|
2018-12-12 13:02:29 +01:00 |
|
Laurent Destailleur
|
446dbb49f6
|
Update Dolibarr schema
|
2018-12-12 13:02:23 +01:00 |
|
atm-ph
|
edb2283e3a
|
Fix missing return
|
2018-12-01 20:41:19 +01:00 |
|
atm-ph
|
658e295a94
|
New bash to convert snake case function into camel case
|
2018-12-01 20:26:17 +01:00 |
|
Laurent Destailleur
|
5bd9c14929
|
Update demo data for 8.0 and 9.0
|
2018-11-23 14:05:45 +01:00 |
|
Laurent Destailleur
|
9bced281db
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2018-11-09 01:28:47 +01:00 |
|
Laurent Destailleur
|
d827601857
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-11-09 01:25:35 +01:00 |
|
Laurent Destailleur
|
aad0b700d4
|
Fix travis
|
2018-11-09 01:22:56 +01:00 |
|
Laurent Destailleur
|
0d6709c9f7
|
Update phpcs config
|
2018-11-09 01:20:57 +01:00 |
|
Regis Houssin
|
569d59d251
|
FIX change my deprecated email
|
2018-10-27 14:43:12 +02:00 |
|
Frédéric FRANCE
|
86d854f3f4
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
|
2018-10-24 23:04:26 +02:00 |
|
Laurent Destailleur
|
a3d6146bed
|
Code comment
|
2018-10-24 02:32:01 +02:00 |
|
Philippe GRAND
|
56f5aaf1ad
|
html5
|
2018-10-13 13:56:23 +02:00 |
|
Philippe GRAND
|
a48554e875
|
fix typo
|
2018-10-13 11:19:41 +02:00 |
|
Alexey Pyltsyn
|
49de7a5881
|
Replace multiple load calls with loadLangs method
|
2018-10-01 09:22:23 +03:00 |
|
Laurent Destailleur
|
bd523973d8
|
Add missing translation key
|
2018-09-25 00:55:03 +02:00 |
|
Frédéric FRANCE
|
03a5aba8a2
|
move phpcs:ignore
|
2018-09-02 18:49:23 +02:00 |
|
Frédéric FRANCE
|
e13a8ec572
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-02 18:19:45 +02:00 |
|
Frédéric FRANCE
|
e98b8e5e25
|
move phpcs:ignore
|
2018-09-02 09:27:59 +02:00 |
|
Frédéric FRANCE
|
83a647ce0d
|
comment missing and not camecaps are incompatible
|
2018-09-01 15:56:14 +02:00 |
|
Frédéric FRANCE
|
10200374ef
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-09-01 14:06:23 +02:00 |
|
Frédéric FRANCE
|
57fb3dc2f4
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-09-01 13:52:51 +02:00 |
|
Laurent Destailleur
|
5604f3b0c3
|
Merge pull request #9376 from frederic34/functionCommentMissing
function Comment Missing
|
2018-09-01 12:59:32 +02:00 |
|
Frédéric FRANCE
|
ebcf43ec73
|
function Comment Missing
|
2018-08-31 21:39:23 +02:00 |
|
Frédéric FRANCE
|
6aee680a4f
|
PSR2 ClassDeclaration
|
2018-08-29 22:06:05 +02:00 |
|
Frédéric FRANCE
|
b03f4004ea
|
PSR2 FunctionClosingBrace
|
2018-08-29 21:25:22 +02:00 |
|
Frédéric FRANCE
|
fe4260a014
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-28 09:34:53 +02:00 |
|
Frédéric FRANCE
|
6b6daf178f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-21 20:57:58 +02:00 |
|
Frédéric FRANCE
|
aba69b94b2
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing
|
2018-08-21 14:03:02 +02:00 |
|
Laurent Destailleur
|
0799970804
|
Merge pull request #9248 from frederic34/FunctionDeclaration
function declaration
|
2018-08-21 13:41:56 +02:00 |
|
Laurent Destailleur
|
85eed6cf80
|
Merge branch 'develop' into trimtrailing
|
2018-08-21 13:40:04 +02:00 |
|
Laurent Destailleur
|
9a82cc3261
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-08-18 02:55:49 +02:00 |
|
Laurent Destailleur
|
dedfd6d493
|
Fix missing translation
|
2018-08-18 02:55:22 +02:00 |
|
Frédéric FRANCE
|
39462742e2
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-16 08:17:55 +02:00 |
|
Laurent Destailleur
|
b515511ad6
|
Merge branch 'develop' into FunctionDeclaration
|
2018-08-16 00:52:55 +02:00 |
|
Laurent Destailleur
|
5c712a6cd3
|
Merge branch 'develop' into trimtrailing
|
2018-08-16 00:47:09 +02:00 |
|
Frédéric FRANCE
|
7bb781eea8
|
function declaration
|
2018-08-15 14:28:34 +02:00 |
|
Frédéric FRANCE
|
a0a6afc224
|
return comment
|
2018-08-14 12:23:10 +02:00 |
|
Frédéric FRANCE
|
3210181a3d
|
rule for private function is different
|
2018-08-14 10:21:34 +02:00 |
|
Frédéric FRANCE
|
850ac34020
|
mark non camelCaps function
|
2018-08-13 17:26:32 +02:00 |
|
Frédéric FRANCE
|
6f74ecceaf
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing
|
2018-08-12 18:21:59 +02:00 |
|
Frédéric FRANCE
|
9786743795
|
test phpcs v3
|
2018-08-09 10:49:17 +02:00 |
|
Frédéric FRANCE
|
b90d125fda
|
trim trailing
|
2018-07-26 20:19:52 +02:00 |
|
Frédéric FRANCE
|
c991a4d204
|
trim trailing
|
2018-07-26 18:05:20 +02:00 |
|
Frédéric FRANCE
|
39f5641fed
|
trim trailing
|
2018-07-26 17:33:36 +02:00 |
|
Frédéric FRANCE
|
a0a5d33641
|
test include
|
2018-07-26 17:30:53 +02:00 |
|
Frédéric FRANCE
|
aaf4f06686
|
test include
|
2018-07-26 11:10:48 +02:00 |
|
Laurent Destailleur
|
988b6a49d2
|
Fix warning php 7.3
|
2018-07-13 18:40:54 +02:00 |
|
Laurent Destailleur
|
2e891b5694
|
Trans
|
2018-06-06 11:20:35 +02:00 |
|
Frédéric FRANCE
|
03bba4daf0
|
do not test *.min.css with phpcs
|
2018-05-30 13:30:14 +02:00 |
|
Frédéric FRANCE
|
8bfe70899f
|
phpcs
|
2018-05-27 18:52:31 +02:00 |
|
Frédéric FRANCE
|
e2a557aadd
|
limit length of lines to 500 chars
|
2018-05-27 15:04:12 +02:00 |
|
Laurent Destailleur
|
1f775c907d
|
Fix translation of % column in gantt view
|
2018-05-04 11:01:22 +02:00 |
|
Laurent Destailleur
|
c35a190f1d
|
update some tools
|
2018-04-27 13:31:11 +02:00 |
|
Laurent Destailleur
|
b049cf194d
|
Fix PSR2
|
2018-04-22 20:17:27 +02:00 |
|
Laurent Destailleur
|
7f8f55a54b
|
Show version in travis settings
|
2018-04-22 18:12:19 +02:00 |
|
Laurent Destailleur
|
96ff5b1b23
|
Update sql image file for 7.0 stable
|
2018-03-16 11:19:58 +01:00 |
|
Laurent Destailleur
|
7db23385f5
|
Hide pass
|
2018-03-15 19:49:29 +01:00 |
|
Laurent Destailleur
|
e68612fa09
|
Fix initdemo must not copy index.html files
|
2018-02-24 12:06:26 +01:00 |
|
Laurent Destailleur
|
0296661864
|
Complete the demo profile
|
2018-01-19 12:39:47 +01:00 |
|
Laurent Destailleur
|
446c28ce2a
|
Init demo for v7
|
2018-01-19 12:35:38 +01:00 |
|
Laurent Destailleur
|
9d10eb57f2
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
dev/dolibarr_changes.txt
htdocs/compta/facture/card.php
htdocs/compta/facture/list.php
htdocs/main.inc.php
|
2017-12-20 13:28:41 +01:00 |
|
Laurent Destailleur
|
ca8ae3c723
|
Fix option MAIN_USE_JQUERY_JEDITABLE
|
2017-12-20 13:17:21 +01:00 |
|
Laurent Destailleur
|
12d91d7444
|
Fix missing messages in error report.
Fix test on non empty array
|
2017-12-19 18:26:27 +01:00 |
|
Laurent Destailleur
|
394eeb3cd9
|
Fix rendering MD files of images by adding a css
|
2017-12-16 15:11:40 +01:00 |
|
Laurent Destailleur
|
d9c416ee17
|
Complete example
|
2017-11-29 17:51:08 +01:00 |
|
Laurent Destailleur
|
f9aaddb658
|
Add spec for french ecompte
|
2017-11-29 14:08:14 +01:00 |
|
Laurent Destailleur
|
7d3325c087
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
dev/dolibarr_changes.txt
htdocs/user/class/api_users.class.php
|
2017-11-25 13:17:38 +01:00 |
|
Laurent Destailleur
|
61798d1af0
|
FIX list of module not complete when module mb_strlen not available
Conflicts:
dev/dolibarr_changes.txt
|
2017-11-25 02:34:24 +01:00 |
|
Laurent Destailleur
|
bdecef56f9
|
FIX list of module not complete when module mb_strlen not available
|
2017-11-25 02:32:25 +01:00 |
|
Laurent Destailleur
|
6953420ce8
|
Support for ar_EG as laternative of ar_AS
|
2017-11-19 21:25:21 +01:00 |
|
Laurent Destailleur
|
f33b5067ad
|
Upgrade branch 3.0 of RESTLER (still 3.0.0 RC6)
This upgrade Swagger from 1.2 to 2.0
|
2017-11-17 12:55:27 +01:00 |
|
Laurent Destailleur
|
c85acbfc11
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/import/import_xlsx.modules.php
htdocs/install/repair.php
|
2017-11-14 19:47:33 +01:00 |
|
Laurent Destailleur
|
05683bbf61
|
Code comment
|
2017-11-13 11:41:37 +01:00 |
|
Laurent Destailleur
|
a2daef3450
|
Update doc
|
2017-11-09 16:13:39 +01:00 |
|
Laurent Destailleur
|
fa1fbe7db7
|
Work on websiteaccounts
|
2017-11-03 13:25:49 +01:00 |
|
Laurent Destailleur
|
0d09e1d223
|
Enhance purge
|
2017-10-29 20:12:02 +01:00 |
|
Laurent Destailleur
|
bb5bfabd7d
|
Enhance the script purge-data.php to purge remote database
|
2017-10-29 20:08:09 +01:00 |
|
Laurent Destailleur
|
a818422302
|
Update jsgantt to 1.7.5.4
|
2017-10-18 21:24:17 +02:00 |
|
Laurent Destailleur
|
536e1a95c7
|
Add SEPA file example
|
2017-10-17 14:20:39 +02:00 |
|
Laurent Destailleur
|
f853dbc152
|
Add spec for SEPA
|
2017-10-14 02:55:07 +02:00 |
|
Laurent Destailleur
|
4296df45af
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/projet/list.php
htdocs/user/card.php
|
2017-10-13 22:01:56 +02:00 |
|
Laurent Destailleur
|
c3ada19892
|
Fix demo backup
|
2017-10-13 01:27:49 +02:00 |
|
Laurent Destailleur
|
f89676126e
|
Update translation tools
|
2017-10-07 20:11:35 +02:00 |
|
Laurent Destailleur
|
67c571f952
|
Increase cyclomatic complexity threshold
|
2017-10-06 01:59:26 +02:00 |
|
Laurent Destailleur
|
f2e0ff0d30
|
Merge branch 'develop_dict' of https://github.com/hregis/dolibarr into hregis-develop_dict
|
2017-10-03 17:25:01 +02:00 |
|
Laurent Destailleur
|
75e7281054
|
Add resource for NACE
|
2017-10-02 12:41:50 +02:00 |
|
Regis Houssin
|
e65b21a3bf
|
Fix: change the parameter value of dol_getIdFromCode
|
2017-10-02 11:59:17 +02:00 |
|
Regis Houssin
|
9823d6622c
|
Fix: use default $shared value
|
2017-09-27 17:40:02 +02:00 |
|
Regis Houssin
|
d592664150
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
|
2017-09-25 06:48:26 +02:00 |
|
Ahmad M. Zawawi
|
5fd7cdff5c
|
Fix example comment typo
|
2017-09-16 10:53:16 +03:00 |
|
Regis Houssin
|
b5de8da3a6
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/core/modules/modFacture.class.php
|
2017-09-11 08:07:55 +02:00 |
|
Laurent Destailleur
|
4bbd42123e
|
Fix mysqldump (missing fields)
|
2017-09-06 22:02:44 +02:00 |
|
Regis Houssin
|
8e8f94df11
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture-rec.class.php
|
2017-08-30 19:33:23 +02:00 |
|
Laurent Destailleur
|
52a2073152
|
Add demo file for 6.0
|
2017-08-27 15:51:44 +02:00 |
|
Laurent Destailleur
|
54afb2f1af
|
Add demo file for 6.0
|
2017-08-27 15:48:26 +02:00 |
|
Regis Houssin
|
2efb86b5d8
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-07-23 10:36:14 +02:00 |
|
Laurent Destailleur
|
9e6666e511
|
Fix translation keys for taxes
|
2017-07-22 16:40:19 +02:00 |
|
Regis Houssin
|
26df1389f4
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
|
2017-07-21 20:42:21 +02:00 |
|
Regis Houssin
|
c8bd11660d
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
|
2017-07-18 15:23:43 +02:00 |
|
Laurent Destailleur
|
5f32c3d34a
|
Work on new india vat system
|
2017-07-18 12:49:42 +02:00 |
|
Laurent Destailleur
|
e5ec0a785d
|
Fix use command standard @... to mark a change in official code
|
2017-07-17 20:20:38 +02:00 |
|
Regis Houssin
|
cb6b81d897
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-07-11 19:10:22 +02:00 |
|
Laurent Destailleur
|
e3943155f3
|
Sync transifex
|
2017-07-09 19:32:35 +02:00 |
|
Laurent Destailleur
|
9fc17d8988
|
Translation
|
2017-07-09 13:43:23 +02:00 |
|
Laurent Destailleur
|
eff4282cc2
|
Clean files
|
2017-07-07 22:19:01 +02:00 |
|
Regis Houssin
|
544d051fe3
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-06-19 07:06:57 +02:00 |
|
Laurent Destailleur
|
b331176bf7
|
Fix bad data
|
2017-06-19 02:58:09 +02:00 |
|
Laurent Destailleur
|
52eeeebac9
|
Fix bad data in sql dump
|
2017-06-19 02:57:49 +02:00 |
|
Regis Houssin
|
a0299042e4
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-06-17 12:05:33 +02:00 |
|
Laurent Destailleur
|
71c0be20b9
|
Change data structure for bookkeeping v6
|
2017-06-15 10:30:32 +02:00 |
|
Regis Houssin
|
0e8f36dc92
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
|
2017-06-09 14:00:48 +02:00 |
|
Laurent Destailleur
|
1af74b4c42
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
dev/skeletons/skeleton_list.php
htdocs/admin/perms.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/hookmanager.class.php
htdocs/core/lib/files.lib.php
htdocs/product/class/product.class.php
htdocs/product/class/service.class.php
htdocs/product/index.php
htdocs/product/list.php
htdocs/public/members/new.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
|
2017-06-09 12:50:56 +02:00 |
|
Regis Houssin
|
fa58f0f3e8
|
Fix: add entity filter
|
2017-06-09 09:25:15 +02:00 |
|
Laurent Destailleur
|
ee8bc24348
|
Merge pull request #6920 from inoveaconseil/patch-3
Print the value of fields
|
2017-06-08 10:59:51 +02:00 |
|
Laurent Destailleur
|
58f315e8d1
|
Merge pull request #6922 from inoveaconseil/patch-5
Fix bug to display value
|
2017-06-03 00:41:36 +02:00 |
|
Inovea Conseil
|
40dd6fc61c
|
Fix bug to display value
Fix bug to display the values in the future card.php
|
2017-06-01 11:22:08 +02:00 |
|
Inovea Conseil
|
fa3cd267f4
|
Fix bug of prepare_head of card
Delete the call of commande_prepare_head function because do not use in skeleton
|
2017-06-01 10:51:30 +02:00 |
|
Inovea Conseil
|
ab99c178e1
|
Print the value of fields
Add a loop for printing the value of fields
|
2017-06-01 09:04:20 +02:00 |
|
Laurent Destailleur
|
c4f09b8894
|
Work on modulebuilder
|
2017-05-28 14:43:17 +02:00 |
|
Inovea Conseil
|
035cae656f
|
Fix bug in insert method
Missing the last comma in the insert method
|
2017-05-19 22:14:34 +02:00 |
|
Laurent Destailleur
|
0d11fce834
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-05-12 15:45:30 +02:00 |
|
Laurent Destailleur
|
80b0d91154
|
More complete demo
|
2017-05-12 12:12:04 +02:00 |
|
Laurent Destailleur
|
3e0fcf5ec2
|
Fix label "total for this page" on last page.
|
2017-05-10 11:57:59 +02:00 |
|
Laurent Destailleur
|
4c056d68d8
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/dict.php
htdocs/commande/list.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/bills.lang
htdocs/societe/list.php
|
2017-04-15 17:02:05 +02:00 |
|
Laurent Destailleur
|
be439f6252
|
Work on look and feel v6
|
2017-04-07 16:16:44 +02:00 |
|
Laurent Destailleur
|
d99b0461c7
|
Extrafields multilanguage support.
|
2017-04-03 10:56:28 +02:00 |
|
Laurent Destailleur
|
4012aeff90
|
Fix translation
|
2017-03-25 18:35:17 +01:00 |
|
Laurent Destailleur
|
8cd0956b30
|
Code comment
|
2017-03-03 13:28:18 +01:00 |
|
Laurent Destailleur
|
0f22beb774
|
Upgrade to ckeditor 4.6.2.
|
2017-02-28 10:49:58 +01:00 |
|
Laurent Destailleur
|
baa1f3ed2b
|
Clean doc about changes in external libraries
|
2017-02-24 14:35:20 +01:00 |
|
Laurent Destailleur
|
fb88eaf2a4
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
|
2017-02-23 02:55:50 +01:00 |
|
Laurent Destailleur
|
230bb09c1a
|
Prepare 5.0
|
2017-02-21 16:59:21 +01:00 |
|
Laurent Destailleur
|
ebe625aa16
|
Fix debug direct debit module
|
2017-02-21 13:16:28 +01:00 |
|
Laurent Destailleur
|
63876a1b91
|
Prepare 5.0 release
|
2017-02-21 12:09:55 +01:00 |
|
Laurent Destailleur
|
eef3824f8c
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/categories.php
htdocs/admin/dict.php
htdocs/langs/de_DE/bills.lang
htdocs/langs/en_US/main.lang
htdocs/langs/fr_FR/bills.lang
|
2017-02-21 10:34:52 +01:00 |
|
Laurent Destailleur
|
6c40110613
|
Sync transifex
|
2017-02-21 10:26:11 +01:00 |
|
Laurent Destailleur
|
c3d78bf1b4
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/tools/update.php
|
2017-02-16 22:09:37 +01:00 |
|
Laurent Destailleur
|
ad890561c4
|
Prepare release 5.0
|
2017-02-16 02:00:34 +01:00 |
|
Laurent Destailleur
|
1a3b9fada5
|
Som fixes on generator of samples
|
2017-02-16 01:50:02 +01:00 |
|
De Coninck Laurent
|
fa527ff4eb
|
fix the card page generator
|
2017-02-09 13:10:32 +01:00 |
|
Laurent Destailleur
|
4cec071af5
|
Add tms field
|
2017-01-31 14:00:53 +01:00 |
|
Laurent Destailleur
|
70091eceed
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/expensereport/card.php
|
2017-01-27 01:26:11 +01:00 |
|
Laurent Destailleur
|
0c14e1d233
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-01-27 01:24:55 +01:00 |
|
Laurent Destailleur
|
4839d06fc3
|
Fix log
|
2017-01-26 12:48:32 +01:00 |
|
Laurent Destailleur
|
39151d7a74
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-01-22 12:14:18 +01:00 |
|
Laurent Destailleur
|
65f7de8f64
|
Fix css and look 5.0
|
2017-01-22 12:13:32 +01:00 |
|
Laurent Destailleur
|
5362d10c0d
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/hookmanager.class.php
|
2017-01-21 21:56:24 +01:00 |
|
Laurent Destailleur
|
6ab9ba3284
|
Fix management of alternative language for Greek (el_CY)
|
2017-01-21 21:52:42 +01:00 |
|
Laurent Destailleur
|
160f8c3085
|
Add translation comparison doc
|
2017-01-17 11:11:32 +01:00 |
|
Laurent Destailleur
|
4ecd657f34
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-01-16 00:02:43 +01:00 |
|
Laurent Destailleur
|
d14e4dbaba
|
Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on
|
2017-01-15 20:49:20 +01:00 |
|
Laurent Destailleur
|
2c6672d17a
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/tpl/login.tpl.php
|
2017-01-12 11:32:51 +01:00 |
|
Laurent Destailleur
|
c42b48636a
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/commande/class/api_commande.class.php
htdocs/core/class/CMailFile.class.php
htdocs/societe/class/api_contact.class.php
|
2017-01-12 11:06:24 +01:00 |
|
Laurent Destailleur
|
94f14f529b
|
Fix pb with double quote
|
2017-01-11 22:02:08 +01:00 |
|
Laurent Destailleur
|
fd008f88b1
|
Add github tools
|
2017-01-09 10:21:59 +01:00 |
|
Laurent Destailleur
|
febd23fe41
|
Clean dead code
|
2017-01-03 11:22:03 +01:00 |
|
Laurent Destailleur
|
b5c815367c
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6
|
2016-12-26 15:44:31 +01:00 |
|
Laurent Destailleur
|
b777ec79f2
|
Fix contextpage implementation into skeleton
|
2016-12-23 10:38:27 +01:00 |
|
Laurent Destailleur
|
f9d29bbe25
|
Complete sample of setup files
|
2016-12-23 01:25:40 +01:00 |
|
Laurent Destailleur
|
cfde9e2ec5
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6
|
2016-12-22 18:04:13 +01:00 |
|
Laurent Destailleur
|
dcb14db10d
|
Add .pml files into fixdosfiles
|
2016-12-22 18:03:34 +01:00 |
|
Laurent Destailleur
|
e26cb0f238
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6
|
2016-12-12 13:00:20 +01:00 |
|
Laurent Destailleur
|
7077b4931c
|
Add dump v5
|
2016-12-12 11:57:50 +01:00 |
|
Laurent Destailleur
|
3396dfc7f6
|
NEW Index upload files into database.
|
2016-12-08 22:12:45 +01:00 |
|
Laurent Destailleur
|
d23604701c
|
Fix responsive
|
2016-12-07 15:00:20 +01:00 |
|
Laurent Destailleur
|
f9ef6f52a6
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
dev/skeletons/skeleton_list.php
|
2016-12-07 12:23:43 +01:00 |
|
jfefe
|
64f76d8cab
|
Fix : bad function name
|
2016-12-02 17:02:49 +01:00 |
|
Laurent Destailleur
|
bd8f923cee
|
Several fixes in filter on lists
|
2016-11-29 22:52:16 +01:00 |
|
Laurent Destailleur
|
e4a8342aef
|
Fix div-table-form balance on all lists (solve responsive design)
|
2016-11-27 11:41:10 +01:00 |
|
bgenere
|
febb4d7b60
|
Fixed issue with extrafields join for search. Main table alias is t not
u.
|
2016-11-21 10:15:35 +01:00 |
|
Laurent Destailleur
|
9b88ae145b
|
Fix mass action when using no javascript
|
2016-11-17 19:04:10 +01:00 |
|
Laurent Destailleur
|
35d80aa209
|
Miscellaneous fixes
|
2016-11-12 12:40:06 +01:00 |
|
Laurent Destailleur
|
da387db166
|
NEW Error code of each email sent is visible in list of email targets
|
2016-11-11 14:03:57 +01:00 |
|
Laurent Destailleur
|
7fa9692458
|
Uniformize code. Generalize option MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE.
|
2016-11-02 12:48:50 +01:00 |
|
Laurent Destailleur
|
ef03f59e50
|
Uniformize code
|
2016-11-02 12:16:46 +01:00 |
|
Laurent Destailleur
|
aec0e79653
|
Normalize constant name.
|
2016-10-29 21:47:10 +02:00 |
|
Laurent Destailleur
|
6938b05219
|
Mutualize code to show files generated for mass actions
|
2016-10-28 12:00:30 +02:00 |
|
Laurent Destailleur
|
e1eb61d3a2
|
Fix travis on notooltip
|
2016-10-26 11:39:54 +02:00 |
|
Laurent Destailleur
|
854e75513b
|
Fix bad alias
|
2016-10-25 21:44:10 +02:00 |
|
Laurent Destailleur
|
9fd692d846
|
Fix phpcs
|
2016-10-25 19:28:58 +02:00 |
|
Laurent Destailleur
|
f67863e1aa
|
NEW Can use any filter on all REST API to list.
|
2016-10-25 19:15:47 +02:00 |
|
Laurent Destailleur
|
6ef74b33c9
|
Uniformize code
|
2016-10-25 11:09:26 +02:00 |
|
Laurent Destailleur
|
8ab31188ab
|
Merge pull request #5891 from BeltranBot/patch-1
Fix: misspelling
|
2016-10-24 01:09:53 +02:00 |
|
Laurent Destailleur
|
618ac420e4
|
Better skeleton
|
2016-10-21 10:56:25 +02:00 |
|
BeltranBot
|
46c0aa3f03
|
misspelling fix
fixing a misspelling
|
2016-10-18 11:32:35 -05:00 |
|
Laurent Destailleur
|
e7a09c07f9
|
Sync and clean language files
|
2016-10-11 10:38:38 +02:00 |
|
Laurent Destailleur
|
4dfdf29a55
|
FIX #5742 error on project list if an extra field separator is added.
|
2016-10-01 18:00:17 +02:00 |
|
Laurent Destailleur
|
057e107d29
|
Fix on skeleton
|
2016-09-30 23:44:55 +02:00 |
|
Laurent Destailleur
|
dcb18cd637
|
Clean and reorganize dev tools
|
2016-09-27 19:43:34 +02:00 |
|
Laurent Destailleur
|
d1c4f02bf7
|
Uniformize code and style
|
2016-09-18 14:41:17 +02:00 |
|
Laurent Destailleur
|
5ea9fc7467
|
NEW Support extrafields on product lot.
|
2016-09-12 17:27:44 +02:00 |
|
Raphaël Doursenaud
|
72d9f3cd5f
|
Fixed typo
|
2016-09-08 16:40:11 +02:00 |
|
Raphaël Doursenaud
|
f97f011cd3
|
Added missing properties in modules class.
Enhanced modules class documentation.
|
2016-09-08 16:37:48 +02:00 |
|
Laurent Destailleur
|
4d4fc87e2b
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/product/stock/productlot_list.php
htdocs/websites/index.php
|
2016-08-09 13:26:08 +02:00 |
|
Laurent Destailleur
|
2262c1c7dd
|
Fix code generator
|
2016-08-08 21:58:47 +02:00 |
|
Laurent Destailleur
|
2133b1c3b5
|
NEW Table with list of lots/serial can be viewed (module product batch).
|
2016-08-08 20:31:03 +02:00 |
|
Laurent Destailleur
|
bcd055b378
|
Move button to link to, in same part of code than code to output links.
|
2016-08-05 15:30:28 +02:00 |
|
Laurent Destailleur
|
890e6f59c8
|
NEW Support mass actions for proposals
|
2016-08-05 13:08:23 +02:00 |
|
Laurent Destailleur
|
b267402df6
|
Merge remote-tracking branch 'origin/4.0' into develop
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/main.lang
htdocs/societe/rib.php
|
2016-08-01 15:15:32 +02:00 |
|
Laurent Destailleur
|
ee7023422a
|
Update dump
|
2016-07-31 23:19:01 +02:00 |
|
Laurent Destailleur
|
20a2282efc
|
Updated screenshots
|
2016-07-31 16:24:32 +02:00 |
|
Laurent Destailleur
|
e3df4b81f8
|
Update demo 4.0
|
2016-07-30 21:13:16 +02:00 |
|
Laurent Destailleur
|
5aa5c5259d
|
demo is in mode stable
|
2016-07-30 20:39:25 +02:00 |
|
Laurent Destailleur
|
9191692bb2
|
More files for demo data
|
2016-07-30 20:33:01 +02:00 |
|
Laurent Destailleur
|
654ac318d4
|
Prepare dump for 4.0 demo
|
2016-07-30 20:26:05 +02:00 |
|
Laurent Destailleur
|
5d81db9693
|
Update skeleton with mass action code
|
2016-07-30 20:05:54 +02:00 |
|
Laurent Destailleur
|
a87c2f9579
|
Fix several fixes on margin reports
|
2016-07-30 18:57:26 +02:00 |
|
Laurent Destailleur
|
246321cd8f
|
Fix clean orphelins of leave request logs in repair tools
Fix date of supplier proposal missing.
|
2016-07-30 18:08:07 +02:00 |
|
Laurent Destailleur
|
e5583f1544
|
Fix bad translation. Confusionbetween internal tranfert and bank
tranfert for payements
|
2016-07-30 17:28:18 +02:00 |
|
Laurent Destailleur
|
857de64607
|
Fix multicurrency
|
2016-07-30 16:41:10 +02:00 |
|
Laurent Destailleur
|
7678940e50
|
Fix refresh cache value of nb of files into a dir into ECM module
|
2016-07-30 15:51:27 +02:00 |
|
Laurent Destailleur
|
e3f0ab9109
|
Fix tag was not visible
|
2016-07-30 14:05:39 +02:00 |
|
Laurent Destailleur
|
8b3136cb96
|
Merge remote-tracking branch 'origin/4.0' into develop
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/en_US/admin.lang
htdocs/langs/fr_FR/companies.lang
|
2016-07-27 19:04:55 +02:00 |
|
Laurent Destailleur
|
4d1885eb59
|
Fix: restore logout and logged translation key
|
2016-07-27 17:00:14 +02:00 |
|
florian HENRY
|
419dd3095b
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
dev_fix5353
Conflicts:
htdocs/societe/class/societe.class.php
|
2016-07-26 08:59:40 +02:00 |
|
Laurent Destailleur
|
3265b7028d
|
Merge remote-tracking branch 'origin/4.0' into develop
|
2016-07-25 19:53:28 +02:00 |
|
Laurent Destailleur
|
b085ce6916
|
Fix lost translation keys
|
2016-07-23 13:01:42 +02:00 |
|
Laurent Destailleur
|
af09528738
|
NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and
__AMOUNT_WO_TAX__ into emails templates.
|
2016-07-21 20:45:30 +02:00 |
|
Laurent Destailleur
|
2c77a901b3
|
Fix to avoid removal of trnaslation key to keep
|
2016-07-18 12:55:44 +02:00 |
|
Laurent Destailleur
|
e2a03d18dd
|
Merge remote-tracking branch 'origin/4.0' into develop
|
2016-07-16 19:58:36 +02:00 |
|
Laurent Destailleur
|
d0380adc39
|
Merge remote-tracking branch 'origin/3.9' into 4.0
Conflicts:
htdocs/filefunc.inc.php
htdocs/includes/jquery/plugins/datatables/media/js/jquery.js
htdocs/product/list.php
|
2016-07-16 19:54:57 +02:00 |
|
Juanjo Menent
|
cd0849209c
|
FIX Failed to open file
|
2016-07-15 19:44:45 +02:00 |
|
Juanjo Menent
|
88d12618ce
|
NEW Do not use Functions Aliases
|
2016-07-15 17:10:13 +02:00 |
|
Juanjo Menent
|
8a022fb19d
|
NEW Do not use Function Aliases
|
2016-07-15 16:58:26 +02:00 |
|
Laurent Destailleur
|
24a798ed2f
|
Fix restore translation for ModuleCompanyCode...
|
2016-07-07 14:13:33 +02:00 |
|
florian HENRY
|
1bb28648c4
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
dev_fix5353
Conflicts:
build/pad/DoliWamp.pml
build/pad/Dolibarr.pml
build/pad/pad_dolibarr.xml
build/pad/pad_doliwamp.xml
|
2016-07-07 09:05:13 +02:00 |
|
Laurent Destailleur
|
f756f3db0e
|
Fix hook context 'all'
|
2016-07-07 01:23:20 +02:00 |
|
Laurent Destailleur
|
ce3f45c2a2
|
Debug of doliwamp for 4.0
|
2016-07-03 13:14:33 +02:00 |
|
Laurent Destailleur
|
3611161b67
|
Fix custom code should not appears on services
|
2016-06-30 19:35:11 +02:00 |
|
Laurent Destailleur
|
bc38bc63ca
|
Fix minor bug in direct printing with google cloud print
|
2016-06-26 21:18:44 +02:00 |
|