Laurent Destailleur
|
aa574c2a47
|
Merge pull request #10517 from frederic34/patch-18
fix phpcs
|
2019-02-08 09:56:50 +01:00 |
|
Laurent Destailleur
|
7334f02e5c
|
Merge pull request #10514 from atm-florian/dev_defautselectcustomertype
Dev defautselectcustomertype
|
2019-02-08 09:56:29 +01:00 |
|
Laurent Destailleur
|
81507ea43e
|
Merge pull request #10510 from frederic34/patch-2
fix phpcs public/payment/newpayment.php
|
2019-02-08 09:53:23 +01:00 |
|
Laurent Destailleur
|
714516fc18
|
Merge pull request #10509 from OPEN-DSI/fix-margin-agents
Fix margin by users when a thirdparty have many sellers
|
2019-02-08 09:51:26 +01:00 |
|
Laurent Destailleur
|
3f01cd554b
|
Update agentMargins.php
|
2019-02-08 09:50:45 +01:00 |
|
Laurent Destailleur
|
70135a1940
|
Merge pull request #10493 from grandoc/new_branch_04_02_2019
update with html5 compliant code
|
2019-02-08 09:42:29 +01:00 |
|
Laurent Destailleur
|
0e42e8824b
|
Merge branch 'develop' into new_branch_04_02_2019
|
2019-02-08 09:42:18 +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
|
9aa2911291
|
Merge pull request #10511 from frederic34/patch-17
.editorconfig for php psr2
|
2019-02-08 09:28:59 +01:00 |
|
Laurent Destailleur
|
3bdf017d41
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-07 19:39:59 +01:00 |
|
Laurent Destailleur
|
8d82135033
|
Fix missing \n
|
2019-02-07 19:39:23 +01:00 |
|
Laurent Destailleur
|
491bfbdbfc
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-07 19:39:04 +01:00 |
|
Laurent Destailleur
|
89af7b0e98
|
Add doctype to web site
|
2019-02-07 19:38:36 +01:00 |
|
Laurent Destailleur
|
0156cd40a6
|
Fix name
|
2019-02-07 14:00:32 +01:00 |
|
Laurent Destailleur
|
065e74379b
|
Missing picto
|
2019-02-07 13:54:38 +01:00 |
|
Laurent Destailleur
|
2ef8544a39
|
sort and filter on parent company
|
2019-02-07 13:52:51 +01:00 |
|
Laurent Destailleur
|
6a4a92510d
|
Code comment
|
2019-02-07 13:32:05 +01:00 |
|
florian HENRY
|
bc74cd5066
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_defautselectcustomertype
|
2019-02-07 12:21:45 +01:00 |
|
florian HENRY
|
6ee5a9e2a6
|
fix travis
|
2019-02-07 12:21:33 +01:00 |
|
Laurent Destailleur
|
5516cb061d
|
Fix filter
|
2019-02-06 18:50:34 +01:00 |
|
Laurent Destailleur
|
d960159b73
|
NEW Column of parent company is available in list of third parties
|
2019-02-06 18:49:58 +01:00 |
|
Frédéric FRANCE
|
c0686733e8
|
fix phpcs
|
2019-02-06 15:56:13 +01:00 |
|
florian HENRY
|
f0f0b69d87
|
add comment
|
2019-02-06 10:59:24 +01:00 |
|
florian HENRY
|
3f6187fe12
|
remove useless parameters
|
2019-02-06 10:58:40 +01:00 |
|
florian HENRY
|
813a7a0085
|
remove comment
|
2019-02-06 10:57:11 +01:00 |
|
florian HENRY
|
3f20cae6d3
|
NEW: setup default thridparty type (customer or prospect/customer)
|
2019-02-06 10:54:11 +01:00 |
|
Lionel VESSILLER
|
b87df18292
|
Fix the margin rate by seller when the margin is negative
|
2019-02-06 09:37:19 +01:00 |
|
Laurent Destailleur
|
58eaee2acf
|
Fix css
|
2019-02-06 00:56:28 +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
|
88fb491441
|
Fix note output
|
2019-02-06 00:40:07 +01:00 |
|
Laurent Destailleur
|
58e6cfd635
|
Fix popup content
|
2019-02-06 00:36:11 +01:00 |
|
Frédéric FRANCE
|
7b8464c65d
|
.editorconfig for php psr2
|
2019-02-05 21:16:48 +01:00 |
|
Frédéric FRANCE
|
7c82b416ae
|
fix phpcs public/payment/newpayment.php
|
2019-02-05 20:56:34 +01:00 |
|
Laurent Destailleur
|
ce5717a7b7
|
FIX Default language of company is not set
|
2019-02-05 20:43:26 +01:00 |
|
Laurent Destailleur
|
db50ef39e7
|
FIX Translation not loaded by scheduled jobs
|
2019-02-05 20:32:14 +01:00 |
|
Laurent Destailleur
|
82df83cec2
|
Add log
|
2019-02-05 20:04:25 +01:00 |
|
Laurent Destailleur
|
27f804a454
|
Fix currency
|
2019-02-05 19:59:36 +01:00 |
|
Laurent Destailleur
|
d4e6610722
|
Fix currency
|
2019-02-05 19:58:42 +01:00 |
|
Laurent Destailleur
|
5a659bfd90
|
Fix Missing currency
|
2019-02-05 19:57:35 +01:00 |
|
Laurent Destailleur
|
7c24847fa3
|
Typo
|
2019-02-05 19:38:28 +01:00 |
|
Laurent Destailleur
|
7436a3bc73
|
Typo
|
2019-02-05 19:37:58 +01:00 |
|
Laurent Destailleur
|
66998c4873
|
Fix translation
|
2019-02-05 19:37:22 +01:00 |
|
Laurent Destailleur
|
44f5223c90
|
Remove warning
|
2019-02-05 18:54:38 +01:00 |
|
Lionel VESSILLER
|
727213a5fd
|
Fix margin by users when a thirdparty have many sellers
|
2019-02-05 17:04:46 +01:00 |
|
Lionel VESSILLER
|
4e08aa95bb
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix-margin-agents
|
2019-02-05 17:03:12 +01:00 |
|
Lionel VESSILLER
|
f4c5f1e3f1
|
Revert "Fix filter by event type Emailing in show actions done (companylib)"
This reverts commit 225e69a4de.
|
2019-02-05 17:02:43 +01:00 |
|
Laurent Destailleur
|
0345c00f0a
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-05 16:45:10 +01:00 |
|
Laurent Destailleur
|
bb315a6f12
|
Fix trans
|
2019-02-05 16:44:10 +01:00 |
|
Laurent Destailleur
|
f4e4377435
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-05 15:24:14 +01:00 |
|
Laurent Destailleur
|
4097d648ae
|
Fix search with alias
|
2019-02-05 15:23:51 +01:00 |
|