Commit Graph

84818 Commits

Author SHA1 Message Date
andreubisquerra
eef3a1795e
Update dolreceiptprinter.class.php with CUPS 2020-03-25 21:30:33 +01:00
andreubisquerra
3e4b788316
Update receiptprinter.php with CUPS 2020-03-25 21:23:55 +01:00
Laurent Destailleur
e937b22721 Increase batch number to 128 2020-03-25 19:34:52 +01:00
Laurent Destailleur
04f0cdac18 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-25 19:30:06 +01:00
Laurent Destailleur
4e77413996 Try fix suggested in #13418 2020-03-25 19:29:54 +01:00
Laurent Destailleur
8820fa6ca5
Merge pull request #13420 from TobiasSekan/NewAddCategoryFromSubCat
NEW show "New category" button in top of sub categories list
2020-03-25 18:48:43 +01:00
Laurent Destailleur
7c819a96d5
Merge pull request #13415 from ptibogxiv/patch-314
NEW PRODUCT_SHOW_ORIGIN_IN_COMBO
2020-03-25 18:32:57 +01:00
Laurent Destailleur
0a92dcc5e6
Merge pull request #13413 from atm-florian/develop
fix extrafield creation with empty printable
2020-03-25 18:31:28 +01:00
Laurent Destailleur
9d25a0f83f
Merge pull request #13411 from andreubisquerra/develop
No reload page to load other sale in TakePOS
2020-03-25 18:29:35 +01:00
Laurent Destailleur
6f1b9c4678 Fix colspan 2020-03-25 18:24:39 +01:00
Laurent Destailleur
3855ef6073 Add rounding code 'CR' (currency rate' 2020-03-25 17:41:39 +01:00
Laurent Destailleur
63e0e1f4bf Fix option THEME_TOPMENU_DISABLE_IMAGE 2020-03-25 17:35:50 +01:00
Laurent Destailleur
1c01972bfe Fix logs 2020-03-25 17:30:54 +01:00
Laurent Destailleur
3c572c1909 Debug multicurrency 2020-03-25 17:24:20 +01:00
Laurent Destailleur
f509c6a266 Add user id into ajaxconst_onoff 2020-03-25 16:00:42 +01:00
Laurent Destailleur
c06655bc03 Fix regression of bookmarks for blind people 2020-03-25 15:40:02 +01:00
Laurent Destailleur
59f66ce9bd Type of var 2020-03-25 11:32:24 +01:00
Tobias Sekan
c38e16460e
Add new category button in sub categories 2020-03-25 10:31:40 +01:00
Tobias Sekan
2054447beb
Merge pull request #10 from Dolibarr/develop
pull from develop
2020-03-25 10:27:04 +01:00
Laurent Destailleur
d1c6079a7a Fix phpcs 2020-03-24 21:44:47 +01:00
Laurent Destailleur
92db075aa1 Add parameter morecss to img_credit_card() 2020-03-24 21:40:25 +01:00
Laurent Destailleur
86fc2c5d26 Standardize color of status 2020-03-24 20:18:18 +01:00
Laurent Destailleur
62fefab5ac Standardize color of status 2020-03-24 19:06:37 +01:00
ptibogxiv
06f53fdd69
Update html.form.class.php 2020-03-24 17:32:50 +01:00
ptibogxiv
8409f3ba4e
NEW PRODUCT_SHOW_ORIGIN_IN_COMBO
for some business, products have same label so we sometimes need display origin of product for a good choice
2020-03-24 17:28:12 +01:00
florian HENRY
21febcc8fc fix extrafeild creation 2020-03-24 16:09:18 +01:00
Laurent Destailleur
d922eb270d FIX actions on supplier proposal not saved (bad trigger name) 2020-03-24 13:25:45 +01:00
Laurent Destailleur
1ff15e1fd9 FIX All forms must use newToken() 2020-03-24 13:10:35 +01:00
Laurent Destailleur
2b33ef7e46 Align color of graph of status on status color 2020-03-24 13:06:59 +01:00
andreubisquerra
58a10c9c16
Unnecessary line 2020-03-23 23:10:55 +01:00
andreubisquerra
585c46b181
Avoid print customer name when is default 2020-03-23 22:58:04 +01:00
andreubisquerra
53850caa87
No reload page to load other sale in TakePOS 2020-03-23 22:44:26 +01:00
Laurent Destailleur
f56de9f177 Fix autocalculation of timespent in monthy mode 2020-03-23 22:04:40 +01:00
Laurent Destailleur
063cf15bcb Clean code 2020-03-23 20:16:51 +01:00
Laurent Destailleur
f4a52470e3 Graph use color of status 2020-03-23 19:46:43 +01:00
Laurent Destailleur
c2f0cdc0f6 Look and feel v12. Several minor fixes 2020-03-23 19:35:14 +01:00
Laurent Destailleur
820a21a721 Simple setup tutorial 2020-03-23 18:35:22 +01:00
Laurent Destailleur
16ddc56353 FIX #12277 2020-03-23 17:47:30 +01:00
Laurent Destailleur
8f07fc0550 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-23 17:39:46 +01:00
Laurent Destailleur
b9088c1ce3 css 2020-03-23 17:39:35 +01:00
Laurent Destailleur
c249a1af14
Merge pull request #13408 from Dolibarr/scrutinizer-patch-3
Scrutinizer Auto-Fixes
2020-03-23 17:39:09 +01:00
Laurent Destailleur
2a310b09af Fix phpcs 2020-03-23 17:24:47 +01:00
Laurent Destailleur
b18d3e5588 Fix var not defined 2020-03-23 15:58:47 +01:00
Scrutinizer Auto-Fixer
e8083e2a65 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-23 14:54:02 +00:00
Laurent Destailleur
0905b3a6b2 Fix function not found 2020-03-23 15:46:16 +01:00
Laurent Destailleur
716777f364 Fix scrutinizer errors 2020-03-23 15:43:41 +01:00
Laurent Destailleur
01e60562b9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/commande/index.php
	htdocs/takepos/takepos.php
2020-03-23 15:38:10 +01:00
Laurent Destailleur
db6cb2d449 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-23 15:34:03 +01:00
Laurent Destailleur
24dc202022 Doc 2020-03-23 15:33:52 +01:00
Laurent Destailleur
1e955a89ef FIX #13399 after #13285 and #13183 2020-03-23 15:28:18 +01:00