Laurent Destailleur
042e9df720
Sort
2019-08-28 18:20:19 +02:00
Laurent Destailleur
8366d89b41
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/10.0.0-11.0.0.sql
2019-08-28 18:15:22 +02:00
Laurent Destailleur
d668b79738
NEW Add column tms into the table of targets for emailing
2019-08-28 18:14:46 +02:00
Laurent Destailleur
27b61eca32
NEW Add column tms into the table of targets for emailing
2019-08-28 18:12:02 +02:00
Laurent Destailleur
76e8384f09
NEW Add option multiselect for developers on the selector of language.
2019-08-28 16:06:19 +02:00
Laurent Destailleur
b05b3e897f
Fix bad error when module not enabled
2019-08-28 13:11:51 +02:00
Laurent Destailleur
55334dff3b
FIX management of extrafields in modulebuilder
2019-08-28 13:04:22 +02:00
Laurent Destailleur
9109eeaa77
Fix type integer
2019-08-28 12:24:35 +02:00
Laurent Destailleur
ed42f59201
FIX error management when adding a property with type real
2019-08-28 12:10:28 +02:00
Laurent Destailleur
e55b2f8298
Update screenshots
2019-08-28 11:34:56 +02:00
Laurent Destailleur
e3a4ad00d7
Code comment
2019-08-28 10:22:40 +02:00
Laurent Destailleur
e421b4b698
Trans
2019-08-28 10:12:39 +02:00
Laurent Destailleur
6ea7e06982
Doxygen
2019-08-27 20:36:52 +02:00
Laurent Destailleur
04e11bcbd1
Doxygen
2019-08-27 20:35:42 +02:00
Laurent Destailleur
4ceb3c2e85
Add context 'ws' for web services authentication.
2019-08-27 20:35:06 +02:00
Laurent Destailleur
bbda4269b2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-27 17:55:21 +02:00
Laurent Destailleur
529c2f4992
Fix phpcs
2019-08-27 17:54:51 +02:00
Laurent Destailleur
e09223ed4d
FIX #11702
2019-08-27 17:52:46 +02:00
Laurent Destailleur
851d76460a
FIX #11720
2019-08-27 17:42:25 +02:00
Laurent Destailleur
12a09b8b2a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/takepos/invoice.php
2019-08-27 15:56:56 +02:00
Laurent Destailleur
1ac9affd82
Trans
2019-08-27 15:54:44 +02:00
Laurent Destailleur
d4d3e28437
It is diffcult to understand how stock decrease is done so we show the
...
ref of stock.
2019-08-27 15:53:03 +02:00
Laurent Destailleur
81beadbed8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-27 15:43:28 +02:00
Laurent Destailleur
d5328d1cec
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-27 15:43:19 +02:00
Laurent Destailleur
a2b1d96d42
Fix protection in cleaning invoice with transaction. Delete also
...
extrafield lines.
2019-08-27 15:42:35 +02:00
Laurent Destailleur
7165389f6c
Add log
...
Add protection to avoid change on a non draft invoice.
2019-08-27 15:39:35 +02:00
Laurent Destailleur
478b1fea25
FIX #11711
2019-08-27 15:06:50 +02:00
Laurent Destailleur
b73a0c4ee7
Merge pull request #11465 from atm-maxime/new_choose_lines_from_origin
...
NEW : can choose lines while creating order from origin
2019-08-27 15:01:26 +02:00
Laurent Destailleur
f9094cfc44
Update card.php
2019-08-27 15:00:41 +02:00
Maxime Kohlhaas
9c09876bd4
Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_choose_lines_from_origin
2019-08-27 14:33:34 +02:00
Maxime Kohlhaas
4bd806ea65
Move $selectedlines to parameter
2019-08-27 14:33:28 +02:00
Laurent Destailleur
9867928fd7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-27 14:10:32 +02:00
Laurent Destailleur
3eb32360ce
Fix escape
2019-08-27 14:10:23 +02:00
Laurent Destailleur
8598dae6ea
Merge pull request #11765 from ptibogxiv/patch-248
...
Fix tab and lang
2019-08-27 13:57:41 +02:00
ptibogxiv
1b64c89c2a
Fix tab and lang
2019-08-27 13:32:55 +02:00
Jean Traullé
b0905c90cb
Fix Minimum PHP vers. requirement in Readme
2019-08-27 13:14:01 +02:00
Laurent Destailleur
1dccd27b8f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-27 13:13:14 +02:00
Laurent Destailleur
bcd2158c72
Merge pull request #11762 from jtraulle/patch-1
...
Fix Minimum PHP vers. requirement in Readme
2019-08-27 13:12:18 +02:00
Jean Traullé
69507118d1
Fix Minimum PHP vers. requirement in Readme
2019-08-27 12:58:28 +02:00
Laurent Destailleur
f41cca15ba
Merge pull request #11761 from ptibogxiv/patch-247
...
FIX amount or stripe account with currency
2019-08-27 12:49:04 +02:00
ptibogxiv
9ac1add425
FIX amount or stripe account with currency
2019-08-27 12:46:28 +02:00
Laurent Destailleur
442793aa65
Merge pull request #11755 from jtraulle/stickler-ci
...
Add .stickler.yml config file
2019-08-27 12:39:50 +02:00
Laurent Destailleur
31e99414b5
Prepare for php 8
2019-08-27 12:34:46 +02:00
Laurent Destailleur
69688a22e0
Merge
2019-08-27 12:33:42 +02:00
Laurent Destailleur
22719b90b6
Fix remove warning
2019-08-27 12:31:15 +02:00
Laurent Destailleur
36c936357c
Add phpunit testDolStringIsGoodIso
2019-08-27 12:25:24 +02:00
Laurent Destailleur
c2c9e1d042
Fix warning
2019-08-27 12:15:29 +02:00
Laurent Destailleur
20f61fb9be
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-27 11:43:07 +02:00
Laurent Destailleur
9fb06b1e7e
Fix phpcs
2019-08-27 11:42:18 +02:00
Jean Traullé
9ca85b8e19
Disabling coding style checks for Pull Requests
...
Because coding style would have been checked by SticklerCI, we can safely skip this in Travis-CI when in Pull Request context.
It will increase build speed by about 50%.
2019-08-27 09:30:42 +02:00