Commit Graph

74710 Commits

Author SHA1 Message Date
Laurent Destailleur
e9fbcb45cf Fix trans 2020-03-29 21:24:05 +02:00
Laurent Destailleur
5fad4c8cb4 CSS 2020-03-29 19:41:01 +02:00
Laurent Destailleur
4ed4644c08 Work on generic multilanguage properties 2020-03-29 04:28:23 +02:00
Laurent Destailleur
239732a234 trans 2020-03-29 03:36:34 +02:00
Laurent Destailleur
44f7ba65e4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-29 03:34:23 +02:00
Laurent Destailleur
78bcf280ac CSS 2020-03-29 03:31:49 +02:00
Laurent Destailleur
9b2da5bdae FIX Missing token 2020-03-29 00:56:11 +01:00
Laurent Destailleur
cc35b5e6bd css 2020-03-28 17:49:20 +01:00
Maxime Kohlhaas
0512b3a7a7 Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_bom_cost 2020-03-28 16:37:39 +01:00
Laurent Destailleur
d5b107211f Look and feel v12 2020-03-28 15:20:26 +01:00
Laurent Destailleur
ec83f18944 Move more icon definition into CSS 2020-03-28 13:38:25 +01:00
Matt Sidnell
6f07b87cde
Update admin.lib.php 2020-03-27 23:22:02 +00:00
Matt Sidnell
f93bdf6b22
Fix so company_admin tabs do not show in Societe
fix
2020-03-27 23:09:40 +00:00
andreubisquerra
0db7c2bf21
TakePOS CSS fix in action buttons 2020-03-27 23:19:56 +01:00
Matt Sidnell
815ae3cb09
Ability to add new tabs on company admin section
I have added the option to add a tab from a module to the main company setup section.  I need this ability so thought that others might too.
2020-03-27 21:51:34 +00:00
ptibogxiv
cb7342d4c8
FIX product purchase prices
Fix get datas but don't fix cleandata :( @eldy
2020-03-27 20:07:18 +01:00
Laurent Destailleur
235210b3bc Look and feel v12 2020-03-27 19:26:45 +01:00
Laurent Destailleur
4207d94f53 FIX Bad position of total in column
Conflicts:
	htdocs/fourn/facture/paiement.php
2020-03-27 19:10:01 +01:00
Laurent Destailleur
a4797634d5 FIX Bad position of total in column 2020-03-27 19:08:39 +01:00
Laurent Destailleur
b33552fb6f Fix phpcs 2020-03-27 16:13:53 +01:00
Laurent Destailleur
c27592bad2 Clean deprecated params on all fetch_optionals() 2020-03-27 16:02:58 +01:00
ptibogxiv
497b0e4ecc
NEW filter by product on supplier order
let's get the next replenishment date and order's informations on front-end for selected products
2020-03-27 15:30:05 +01:00
Laurent Destailleur
f512e0d161 Fix popup 2020-03-27 12:06:58 +01:00
Laurent Destailleur
975f061b43 Fix popup 2020-03-27 12:06:18 +01:00
Laurent Destailleur
3a9cc532d7 FIX Use getNomURL instead of hard coded link. Fix limit. 2020-03-27 11:56:59 +01:00
Laurent Destailleur
259f23e96b Look and feel v11 2020-03-27 11:56:45 +01:00
Laurent Destailleur
4f83eb59cd FIX Use getNomURL instead of hard coded link. Fix limit. 2020-03-27 11:55:33 +01:00
Laurent Destailleur
fd3d13cfcf Look and feel v11 2020-03-27 11:15:38 +01:00
atm-quentin
96481c3d52 FIX ordered stock already in $stock 2020-03-27 09:43:59 +01:00
Alexandre SPANGARO
e1611a8366 Typo 2020-03-27 06:16:24 +01:00
Laurent Destailleur
354cb8c1b0 Work on Kanban view for modules 2020-03-27 01:59:17 +01:00
Laurent Destailleur
9379f6fa9d Fix duplicate tooltip 2020-03-26 20:27:49 +01:00
Laurent Destailleur
a02e3e1e61 Fix duplicate tooltip 2020-03-26 20:05:17 +01:00
Laurent Destailleur
4a012c13b2 FIX Translation of tooltips of extrafields 2020-03-26 19:47:28 +01:00
Laurent Destailleur
2f94db6ffe FIX Translation of tooltips of extrafields 2020-03-26 19:46:36 +01:00
Bahfir Abbes
f7ecc9d60c
Fix:The column "print $langs->trans("StockCorrection");" is now duplicated. 2020-03-26 15:22:24 +01:00
stickler-ci
38029abcb1 Fixing style errors. 2020-03-26 08:34:27 +00:00
Tobias Sekan
1e13dbe270
fix non numeric error 2020-03-26 09:29:35 +01:00
Tobias Sekan
4624fd2445
Fix add mulitcurrency line in supplier proposal 2020-03-26 09:23:19 +01:00
atm-quentin
cef65a3c8f FIX hook name and useless inithook 2020-03-26 09:20:14 +01:00
Tobias Sekan
f7762f11db
Fix change multicurrency line in supplier proposal 2020-03-26 09:13:56 +01:00
stickler-ci
208049a8f2 Fixing style errors. 2020-03-26 07:27:10 +00:00
florian HENRY
aded72a6fa Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_tasklist_columnAndExtrafields 2020-03-26 08:24:39 +01:00
florian HENRY
21b98a7c4c set as global 2020-03-26 08:24:20 +01:00
Laurent Destailleur
c9696114f4 Fix scrutinizer 2020-03-26 04:30:16 +01:00
Laurent Destailleur
5a5863f46a FIX Group by invalid with pgsql 2020-03-26 03:55:34 +01:00
Laurent Destailleur
fb5363d857 Fix pregex 2020-03-26 03:32:05 +01:00
Laurent Destailleur
004397304e FIX Foreign currency lost when splitting a discount 2020-03-26 02:32:53 +01:00
Laurent Destailleur
f0de10897a FIX Foreign currency lost when splitting a discount 2020-03-26 02:32:24 +01:00
Laurent Destailleur
3ae3e9a16e Remove $_POST 2020-03-26 02:21:50 +01:00
Laurent Destailleur
d3debccabe FIX bad value in currency into discount created from down payment 2020-03-26 02:14:57 +01:00
Laurent Destailleur
d2163c95d6 Save the vat src code when converting down payment into discount 2020-03-26 02:13:34 +01:00
Laurent Destailleur
fa3bba942f Start to save the VAT src code into table of discounts to reuse them
later
2020-03-26 02:01:30 +01:00
Laurent Destailleur
88d98acbba FIX #13410
Conflicts:
	htdocs/compta/facture/card.php
2020-03-26 01:26:50 +01:00
Laurent Destailleur
a05f9fad33 FIX Look and feel v11 2020-03-26 01:25:10 +01:00
Laurent Destailleur
ab19bb2455 FIX default value of selectMasssAction broken 2020-03-26 01:25:05 +01:00
Laurent Destailleur
ba000dbcfd FIX #13410 2020-03-26 01:24:27 +01:00
Laurent Destailleur
82825f143b FIX Look and feel v11 2020-03-26 01:24:05 +01:00
Laurent Destailleur
90e0ead953 FIX default value of selectMasssAction broken 2020-03-26 00:52:05 +01:00
Laurent Destailleur
20fad86520 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/cashcontrol/cashcontrol_card.php
2020-03-26 00:14:06 +01:00
Laurent Destailleur
2e5bfb207f Fix responsive 2020-03-25 23:50:05 +01:00
andreubisquerra
d420656c3f
Update langs 2020-03-25 21:32:58 +01:00
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
51f8c5ca87 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/class/commoninvoice.class.php
	htdocs/expensereport/list.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/product/fournisseurs.php
2020-03-25 19:01:56 +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
b48c21dbcb If we need more var here, we must fix to have var starting with search_ 2020-03-25 18:47:42 +01:00
Laurent Destailleur
e160ea2bee Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-25 18:45:55 +01:00
Laurent Destailleur
33fe7b5f70
Merge pull request #13416 from simnandez/11.0
FIX: Compatibility with multicompany, bad numerotation of task.
2020-03-25 18:40:13 +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
925554d15e More accurate result 2020-03-25 18:27:53 +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
florian HENRY
81d86f717d Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_tasklist_columnAndExtrafields 2020-03-25 12:14:54 +01:00
florian HENRY
8662c864d2 remove not use column from arrayfields 2020-03-25 12:14:42 +01:00
VESSILLER
c516a54f78 FIX get remain to pay with rounding decimals 2020-03-25 11:53:47 +01:00
Laurent Destailleur
59f66ce9bd Type of var 2020-03-25 11:32:24 +01:00
atm-quentin
e9ee78ab8f NEW hook on product load stats 2020-03-25 11:20:54 +01:00
Tobias Sekan
c38e16460e
Add new category button in sub categories 2020-03-25 10:31:40 +01:00
gauthier
81af385259 FIX : when we filter a list on a view status, we want this filter to be on bookmark that we create 2020-03-25 10:27:59 +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
florian HENRY
6e4038a051 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_tasklist_columnAndExtrafields 2020-03-24 19:50:19 +01:00
florian HENRY
46a4184f15 NEW : Project task list, add column selector and extrafields 2020-03-24 19:50:01 +01:00
Laurent Destailleur
62fefab5ac Standardize color of status 2020-03-24 19:06:37 +01:00
Juanjo Menent
fec3377f24 FIX: Compatibility with multicompany, bad numerotation of task. 2020-03-24 18:49:16 +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
gauthier
4c0de74470 FIX : sort by default role makes no sense 2020-03-24 16:27:53 +01:00
florian HENRY
21febcc8fc fix extrafeild creation 2020-03-24 16:09:18 +01:00
Laurent Destailleur
1657a6b50a FIX actions on supplier proposal not saved (bad trigger name)
Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-03-24 15:00:13 +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
a5379c7144 FIX All forms must use newToken()
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/cashcontrol/cashcontrol_card.php
	htdocs/supplier_proposal/card.php
2020-03-24 13:14:23 +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
Maxime Kohlhaas
bcbccf0c83 Start working on bom cost 2020-03-24 10:32:31 +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
Laurent Destailleur
0dbc37667c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-03-23 15:25:42 +01:00
Laurent Destailleur
ca4b641094 FIX #13407 2020-03-23 15:24:29 +01:00
Laurent Destailleur
e4a9763f54
Merge pull request #13405 from aspangaro/12.0_a25
Qual: Move supplier proposal menu to the core
2020-03-23 15:17:10 +01:00
Laurent Destailleur
aab3ca4fa1
Merge pull request #13402 from andreubisquerra/develop
Fix TakePOS DirectPayment when place is higher 0
2020-03-23 15:12:38 +01:00
Laurent Destailleur
d662bb97dc Debug parallel sale feature 2020-03-23 15:02:15 +01:00
Laurent Destailleur
d965aad6e6 Some fix to support correctly parallel sales 2020-03-23 14:31:59 +01:00
Laurent Destailleur
2177afecd9 Sort order 2020-03-23 14:12:48 +01:00
Alexandre SPANGARO
89de39f199 Move supplier proposal menu to the core 2020-03-23 08:51:38 +01:00
Regis Houssin
45579b0986 FIX remove unused var, $usercancreate can be change by Multicompany 2020-03-23 07:01:23 +01:00
andreubisquerra
fbe6711353
Fix TakePOS DirectPayment when place is higher 0 2020-03-22 22:46:40 +01:00
andreubisquerra
618da0a808
Fix TakePOS DirectPayment when place is higher 0 2020-03-22 22:39:41 +01:00
Laurent Destailleur
94b6fbb223 FIX #13300 2020-03-22 20:52:00 +01:00
Laurent Destailleur
26e9500c26 FIX #13300 2020-03-22 20:50:50 +01:00
Laurent Destailleur
ef86311639
Merge pull request #13224 from mapiolca/patch-38
# Fix Compatibility with NOTMODIFYOTHERENTITYFOURNPRICE const.
2020-03-22 20:32:15 +01:00
Laurent Destailleur
f20e0efe06 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-22 20:22:41 +01:00
Laurent Destailleur
c80c247a84 Fix phpcs 2020-03-22 20:22:33 +01:00
Laurent Destailleur
3eaed6bfc8 Fix phpcs 2020-03-22 20:22:08 +01:00
Laurent Destailleur
4b3d2bfb64
Merge pull request #13398 from andreubisquerra/master
NEW: Multiple sales in TakePOS
2020-03-22 20:19:40 +01:00
Laurent Destailleur
1cb598290a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-22 20:17:10 +01:00
Laurent Destailleur
1fdef022f0 css 2020-03-22 20:16:14 +01:00
Laurent Destailleur
cafe898b6a
Merge pull request #13392 from andreubisquerra/develop
Remove vars to avoid conficts in TakePOS setup
2020-03-22 19:49:38 +01:00
Laurent Destailleur
226f4695cd Fix migration of type of field 2020-03-22 19:48:53 +01:00