markus
|
c905575d3e
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
|
2019-03-04 17:26:40 +01:00 |
|
Frédéric FRANCE
|
62501b11e8
|
add visibility
|
2019-03-02 00:14:22 +01:00 |
|
Laurent Destailleur
|
3bffa69f1d
|
Remove deprecated code
|
2019-02-27 15:23:56 +01:00 |
|
Laurent Destailleur
|
6373e1db84
|
Merge branch 'develop' into 10.0_linkedin
|
2019-02-27 01:16:21 +01:00 |
|
Laurent Destailleur
|
3a2a1b4a56
|
Debug module ticket
|
2019-02-26 13:43:09 +01:00 |
|
markus
|
d38bff6f14
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
|
2019-02-26 12:31:24 +01:00 |
|
atm-quentin
|
dc7a2fbb30
|
FIX placement function
|
2019-02-25 10:01:26 +01:00 |
|
Alexandre SPANGARO
|
2da1447a0b
|
Merge remote-tracking branch 'upstream/develop' into 10.0_linkedin
|
2019-02-25 09:12:04 +01:00 |
|
Alexandre SPANGARO
|
acb9cfe07a
|
NEW: Add LinkedIn field
|
2019-02-25 09:07:58 +01:00 |
|
Laurent Destailleur
|
6b46a927f1
|
Merge branch 'develop' into PSR2MethodsFunctionCallSignatureSpaceBeforeOpenBracket
|
2019-02-24 20:53:54 +01:00 |
|
Frédéric FRANCE
|
894123fb06
|
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket
|
2019-02-24 20:06:55 +01:00 |
|
Frédéric FRANCE
|
a497a81aac
|
Update api_contacts.class.php
|
2019-02-23 19:09:27 +01:00 |
|
atm-quentin
|
7850925441
|
FIX amount opened on thirdparty card dont care of credit note not converted
|
2019-02-22 15:10:41 +01:00 |
|
markus
|
aa5dfb3cf9
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
|
2019-02-16 14:43:35 +01:00 |
|
Laurent Destailleur
|
43ef2d1be6
|
Update api_contacts.class.php
|
2019-02-15 15:10:10 +01:00 |
|
ptibogxiv
|
df9f248537
|
Update api_contacts.class.php
|
2019-02-14 21:12:00 +01:00 |
|
ptibogxiv
|
bc8b6ed993
|
Fix count ref in contact list API
|
2019-02-14 17:23:48 +01:00 |
|
Laurent Destailleur
|
a7af1b1765
|
Remove deprecated code
|
2019-02-14 16:29:13 +01:00 |
|
Laurent Destailleur
|
aedf91b522
|
Fix: add parameter $includecount
|
2019-02-14 16:22:42 +01:00 |
|
ptibogxiv
|
0aeaac7c5f
|
Fix count of ref in an contact object API
|
2019-02-14 16:00:45 +01:00 |
|
markus
|
01b12793d2
|
fix typo in comment
|
2019-02-12 13:59:55 +01:00 |
|
Frédéric FRANCE
|
1e43f8e54a
|
PEAR FunctionCallSignature
|
2019-02-10 10:45:49 +01:00 |
|
Laurent Destailleur
|
af92303319
|
Merge pull request #10487 from frederic34/psr2squizwhite
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-08 09:30:25 +01:00 |
|
Laurent Destailleur
|
9e28db4202
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/tools/export.php
|
2019-02-06 00:51:10 +01:00 |
|
Laurent Destailleur
|
ce5717a7b7
|
FIX Default language of company is not set
|
2019-02-05 20:43:26 +01:00 |
|
Frédéric FRANCE
|
970392adb8
|
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
|
2019-02-03 22:41:57 +01:00 |
|
markus
|
bc2c6282d9
|
Merge branch 'develop' of https://github.com/mwelters/dolibarr into develop
|
2019-02-03 17:48:04 +01:00 |
|
Frédéric FRANCE
|
80a12fcd1c
|
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-03 14:29:45 +01:00 |
|
Laurent Destailleur
|
e18bd6f986
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 18:27:35 +01:00 |
|
Laurent Destailleur
|
408609e0ec
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/tpl/objectline_edit.tpl.php
|
2019-01-30 16:54:38 +01:00 |
|
Laurent Destailleur
|
9fdba921b4
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/lib/functions.lib.php
|
2019-01-30 16:48:33 +01:00 |
|
Laurent Destailleur
|
81ae4c52c5
|
Merge pull request #10446 from mapiolca/8.0
Fix #10317 et #10318
|
2019-01-30 16:43:14 +01:00 |
|
Laurent Destailleur
|
e72d6c50e6
|
Merge pull request #10428 from frederic34/toomanylines
PSR2.Files.EndFileNewline.TooMany
|
2019-01-30 16:17:09 +01:00 |
|
Laurent Destailleur
|
648eea3a70
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 16:00:11 +01:00 |
|
Laurent Destailleur
|
869159c09f
|
Fix regression in look and feel (if empty, we do not sho value)
|
2019-01-30 15:31:39 +01:00 |
|
Laurent Destailleur
|
1a292839ca
|
Fix regression in look and feel (if empty, we do not sho value)
|
2019-01-30 15:31:18 +01:00 |
|
Laurent Destailleur
|
17c3337c9b
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-01-30 15:25:43 +01:00 |
|
Regis Houssin
|
9539bea68a
|
FIX bad sql request
|
2019-01-29 12:17:51 +01:00 |
|
Regis Houssin
|
39b696af02
|
FIX multicompany compatibility
|
2019-01-29 12:01:40 +01:00 |
|
Pierre Ardoin
|
eca1a2cd64
|
Update societe.class.php
|
2019-01-29 11:08:13 +01:00 |
|
Alexandre SPANGARO
|
cc88c4f8ff
|
Move my email to the new one
|
2019-01-28 21:39:22 +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 |
|
markus
|
00597477e4
|
Fix #10263
|
2019-01-26 16:06:40 +01:00 |
|
Laurent Destailleur
|
300889f53a
|
# WARNING: head commit changed in the meantime
Fix
|
2019-01-19 13:22:38 +01:00 |
|