Commit Graph

89109 Commits

Author SHA1 Message Date
Laurent Destailleur
88059a52d8
Merge branch 'develop' into patch-17 2020-03-03 23:24:14 +01:00
Laurent Destailleur
1ee52d4c63 Enhancement of #13240 2020-03-03 23:19:05 +01:00
Laurent Destailleur
4f7da118d6
Merge pull request #13240 from AlexLudwigITDienstleistungen/patch-1
Resolve Error if dolibarr is running in docker container
2020-03-03 23:16:01 +01:00
Laurent Destailleur
537d129627
Merge pull request #13251 from bb2a/patch-20
NEW Add subtitution variables for url of document in backoffice
2020-03-03 23:13:53 +01:00
Laurent Destailleur
2b6aaa652d
Merge pull request #13256 from ATM-Marc/NEW_list_multicurrency
NEW: add multicurrency columns to document lists
2020-03-03 23:12:53 +01:00
Laurent Destailleur
c80e37edf6
Merge pull request #13259 from ptibogxiv/patch-310
FIX:  fk_type subscription list via api REST
2020-03-03 23:11:47 +01:00
Laurent Destailleur
5e6ca6e61c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-03 23:11:16 +01:00
Laurent Destailleur
93e5ec2b49 FIX #13260 2020-03-03 23:11:06 +01:00
Laurent Destailleur
7866f89585
Merge pull request #13260 from atm-quentin/FIX_ecm_files
FIX ecm_files didnt match cause document ref contained "/"
2020-03-03 23:09:02 +01:00
Laurent Destailleur
6f3197bbea
Merge pull request #13258 from atm-ph/fix_11.0_dict_sql_error_sortorder
Fix sql syntax error
2020-03-03 22:54:11 +01:00
Laurent Destailleur
21173b8b9d
Merge pull request #13262 from ptibogxiv/patch-312
FIX doc
2020-03-03 22:53:51 +01:00
Laurent Destailleur
3f2d6ac2ba
Merge pull request #13266 from hregis/patch-1
FIX missing global $conf
2020-03-03 22:53:35 +01:00
Laurent Destailleur
d5546df57b Responsive 2020-03-03 22:50:37 +01:00
Laurent Destailleur
fd64f0fadb Fix responsive 2020-03-03 22:46:29 +01:00
Laurent Destailleur
88d2e13f02 Fix reponsive 2020-03-03 22:15:55 +01:00
Laurent Destailleur
2d64b8c2f9
Merge pull request #13261 from ptibogxiv/patch-311
NEW get proposal by ref with API
2020-03-03 21:45:17 +01:00
Laurent Destailleur
c3137142fe
Merge pull request #13252 from aspangaro/12.0_a20
FIX: Nowrap on amount
2020-03-03 21:44:54 +01:00
Regis Houssin
945641a05b
FIX missing global $conf 2020-03-03 16:26:57 +01:00
Laurent Destailleur
730b8ed932 CSS 2020-03-03 16:09:33 +01:00
Laurent Destailleur
a22296ca72 Trans 2020-03-03 15:19:37 +01:00
Laurent Destailleur
b587ac6936 FIX responsive 2020-03-03 15:14:27 +01:00
Laurent Destailleur
be30667dbe FIX responsive 2020-03-03 15:13:55 +01:00
Laurent Destailleur
13fb5eda83 Fix for md theme 2020-03-03 15:11:14 +01:00
Tobias Sekan
fae05834ea
Merge pull request #4 from Dolibarr/develop
pull from develop
2020-03-03 14:37:13 +01:00
ptibogxiv
a71356f0ed
FIX doc 2020-03-03 13:41:19 +01:00
ptibogxiv
b6bad0c936
Update api_proposals.class.php 2020-03-03 13:40:26 +01:00
ptibogxiv
fa5aeebcd8
NEW get proposal by ref with API 2020-03-03 13:39:22 +01:00
atm-quentin
9446138951 FIX ecm_files didnt match cause document ref contained "/" 2020-03-03 12:07:18 +01:00
ptibogxiv
060df57cb1
FIX: fk_type subscription list via api REST
v10 to dev
2020-03-03 11:58:15 +01:00
atm-ph
e916ff40ff Fix sql syntax error 2020-03-03 11:55:05 +01:00
Marc de Lima Lucio
5f5824daaa FIX: order list: remove useless multicurrency lines 2020-03-03 10:43:23 +01:00
Tim Otte
667f00872c Fixed lint errors 2020-03-03 10:33:26 +01:00
stickler-ci
f026b959a2 Fixing style errors. 2020-03-03 09:28:00 +00:00
Tim Otte
8ce1f5f360 Fixed a few bugs
Added custom font-families
2020-03-03 10:19:05 +01:00
Marc de Lima Lucio
1735b22be9 NEW: supplier proposal list: enable multicurrency columns 2020-03-03 10:11:40 +01:00
Marc de Lima Lucio
b58608dab0 NEW: supplier order list: enable multicurrency columns 2020-03-03 09:56:25 +01:00
Anthony Berton
2fd7276a30
Update functions.lib.php 2020-03-03 09:53:00 +01:00
Marc de Lima Lucio
1c912659eb NEW: supplier invoice list: enable multicurrency columns 2020-03-03 09:38:05 +01:00
Alexandre SPANGARO
aeb3f70df7 FIX: Nowrap on amount 2020-03-03 07:26:51 +01:00
Alexandre SPANGARO
99b02fca47 Fix error 2020-03-03 05:18:45 +01:00
Alexandre SPANGARO
278dfce301 Fix not logical use 2020-03-03 05:16:14 +01:00
Alexandre SPANGARO
fbd7dc66b2 Fix error 2020-03-03 05:06:31 +01:00
Laurent Destailleur
760afd6838 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-02 23:28:12 +01:00
Laurent Destailleur
481ea6296e No more need fo this constant. Use the generic default feature instead 2020-03-02 23:28:01 +01:00
Laurent Destailleur
799e795871
Merge pull request #13242 from javierybar/develop
NEW TakePOS numbering
2020-03-02 23:27:26 +01:00
javierybar
8776880a12
Update terminal.php 2020-03-02 22:51:06 +01:00
Laurent Destailleur
55093f9ff2
Merge pull request #13232 from TobiasSekan/NewCategoriesInStocks
NEW Category filter for warehouse list
2020-03-02 22:50:08 +01:00
javierybar
4aced13dbf
Update terminal.php 2020-03-02 22:47:12 +01:00
javierybar
9d869587cc
Update setup.php 2020-03-02 22:39:56 +01:00
Laurent Destailleur
b9e5f349a1
Merge pull request #13249 from hregis/11.0_bug
FIX modFournisseur is required by modSupplierProposal
2020-03-02 22:01:39 +01:00