Commit Graph

107936 Commits

Author SHA1 Message Date
Laurent Destailleur
f4cb5810a7 FIX list of visible type of event was not correctly filtered
FIX Error management on mass action "Approve holiday"
2022-03-07 12:01:34 +01:00
Laurent Destailleur
e6857c9f64 Fix color in css 2022-03-06 20:31:06 +01:00
andreubisquerra
3715659880
Set to default place after close sale in TakePOS
Set to default place after close sale in TakePOS when Bar Restaurant mode is enabled
2022-03-06 12:27:59 +01:00
Frédéric FRANCE
543c475a71
clean comment 2022-03-06 10:56:17 +01:00
Khang
9cada04261 Add unit price for "free-text product" receipt 2022-03-05 16:58:37 +07:00
Khang
d326fe02cf Feature: unit price for {DOL_PRINT_OBJECT_LINES}
Module "Receipt printers":
add unit price for {DOL_PRINT_OBJECT_LINES} in tabs "template setup"
2022-03-05 07:02:36 +07:00
Laurent Destailleur
893e1571b8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-04 22:43:35 +01:00
Laurent Destailleur
c45d6a3bc7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-04 19:45:02 +01:00
Laurent Destailleur
792dcc6334 FIX creation of the shipment if order contains services - 2/2 2022-03-04 19:14:57 +01:00
Frédéric FRANCE
9d1bcbe55a
Fix wrong upload dir
introduced here https://github.com/Dolibarr/dolibarr/pull/19165
2022-03-04 18:17:23 +01:00
Noé Cendrier
cfabaea645 translation refining 2022-03-04 17:38:39 +01:00
Noé Cendrier
e4f4a07fc6 correct mass action "classify delivered" 2022-03-04 17:31:04 +01:00
steve
665e401564 wip: replace butAction 2022-03-04 17:03:40 +01:00
Laurent Destailleur
444abbbc0e Fix regression 2022-03-04 16:44:33 +01:00
Eric Seigne
744b84cb09 fix #20270 : use product_id in sql only if product_id is defined 2022-03-04 15:20:50 +01:00
Gauthier PC portable 024
7701ae2d19 FIX : in case of TVA refund, negative amount must be allowed 2022-03-04 13:55:52 +01:00
Florian HENRY
801402f46a fix: #20267 2022-03-04 11:58:52 +01:00
Laurent Destailleur
82e2f8706a Doc 2022-03-04 11:22:34 +01:00
Ferran Marcet
8c2c3bf3fb Fix: Can't import thirds. Column Skype doesn't exist 2022-03-04 10:06:24 +01:00
Ferran Marcet
da772676de Merge branch '15.0up' into 15.0 2022-03-04 09:58:30 +01:00
Alexandre SPANGARO
1671b095eb Fix also table llx_c_country 2022-03-04 07:02:40 +01:00
Alexandre SPANGARO
13b69bcf93 NEW Dictionaries - add possibility to manage countries in EEC 2022-03-04 07:00:02 +01:00
steve
436b8fa5b5 apply feedbacks 2022-03-03 16:18:09 +01:00
Florian HENRY
3b06a08aa0 FIX: User name in ManufacturingOrder 2022-03-03 13:56:10 +01:00
Marc de Lima Lucio
7239fa3605 FIX: project creation prevented if PROJECTLEADER contact role renamed, de-activated or deleted 2022-03-03 12:19:47 +01:00
lvessiller
6c172d6441 NEW option update prices on proposal cloning 2022-03-03 11:58:29 +01:00
wdammak
cf43024d5d
Update eldy.lib.php 2022-03-03 11:29:47 +01:00
Thomas Negre
d884fe6532 Make ticket messages order by date desc by default 2022-03-03 10:03:19 +01:00
Laurent Destailleur
8655592aea Fix bad merge 2022-03-03 09:51:12 +01:00
Laurent Destailleur
aed4d69568 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-03 09:49:26 +01:00
Laurent Destailleur
2837c938e6 Fix help easier to understand to avoid lethal situations.
Fix reponsive
2022-03-03 09:41:15 +01:00
Laurent Destailleur
4f17f45e99 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	test/phpunit/SecurityTest.php
2022-03-03 02:17:53 +01:00
Laurent Destailleur
246474b39b Fix phpunit 2022-03-03 02:15:52 +01:00
Laurent Destailleur
88944656be Doc 2022-03-03 02:05:13 +01:00
Laurent Destailleur
cdf603a7b3 Prepare v16 2022-03-03 02:02:04 +01:00
Laurent Destailleur
0fed4dae13 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/functions.lib.php
2022-03-03 01:59:31 +01:00
Laurent Destailleur
3c3d6ab0da Fix regression. Add unit test to detect it. 2022-03-03 01:17:44 +01:00
Laurent Destailleur
9bda7ba8c7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/doleditor.class.php
2022-03-03 00:16:55 +01:00
Laurent Destailleur
a9a2928e63 Responsive 2022-03-03 00:13:35 +01:00
wdammak
dd9a350136
Simplification of the code by separating the part given to menu processing
The goal:
- A simplification of the code for easier maintenance is targeted
- Separation of data to left menu display processing
- Plan in the future to put the left menu data directly in the folders of the modules concerned and which will be loaded automatically by eldy.lib.php or eldy_menus.php (for example add a folder "menus/leftmenu.php" in the module "bank" => "bank/menus/leftmenu.php")... This greatly cleans up the code and makes the modules easier to maintain while also avoiding the massive use of hooks for external modules.
- A reuse of the left menus in other corners of the ERP just by calling the function of the desired menu.
- The code is much lighter! is more readable with easier display order modification!
2022-03-02 22:41:00 +01:00
Laurent Destailleur
c452428d12 Fix label of menu 2022-03-02 22:20:05 +01:00
Laurent Destailleur
9c7e1df622 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-02 22:06:06 +01:00
Laurent Destailleur
f0e95a2d20 Fix a default value is creating a letal blocking situation 2022-03-02 22:05:35 +01:00
Laurent Destailleur
987b32ef19 Fix a default value is creating a letal blocking situation 2022-03-02 22:04:44 +01:00
kevin
ad5a18996d Replace id by class 2022-03-02 21:00:07 +01:00
kevin
c71bebfd21 Add Init Hooks on several project tabs 2022-03-02 20:48:46 +01:00
Laurent Destailleur
940417efe2 FIX payment not completed when using Paypal. 2022-03-02 15:13:17 +01:00
Steve
8f07c22d70 Merge branch 'dolibarrdevelop' into WIP_Employee_management_improvement 2022-03-02 14:51:46 +01:00
steve
9900e5dd31 Clean 2022-03-02 14:51:16 +01:00
Laurent Destailleur
a7cb3fa492 Clean log 2022-03-02 14:44:14 +01:00