Commit Graph

93397 Commits

Author SHA1 Message Date
Laurent Destailleur
6654b138b9 Fix trans 2022-01-03 22:11:04 +01:00
Laurent Destailleur
64c7472965 Fix link to account id 2022-01-03 22:01:08 +01:00
Laurent Destailleur
3559515399 css 2022-01-03 19:32:21 +01:00
Laurent Destailleur
76df76aa1b css 2022-01-03 19:22:20 +01:00
Laurent Destailleur
ee49dc59f9 Fix #yogosha8182 2022-01-03 18:42:15 +01:00
Laurent Destailleur
ef56631c80 FIX #yogosha8186 2022-01-03 18:15:19 +01:00
Laurent Destailleur
f8a97ef928 FIX a lot of problem with rules for password validation 2022-01-03 16:09:08 +01:00
Ferran Marcet
26c6908f66 Fix: Correctly display product translations 2022-01-03 13:22:07 +01:00
Ferran Marcet
08685cc6b0 Fix: Correctly display product translations 2022-01-03 13:14:40 +01:00
Ferran Marcet
ff2388ceaf Fix: correctly display the products of a warehouse in the pdf 2022-01-03 13:08:20 +01:00
Laurent Destailleur
cd954e4ec3 Optimize images for v15 2022-01-03 12:38:54 +01:00
Laurent Destailleur
cecb11bb1c Debug v15 2022-01-03 12:28:42 +01:00
Laurent Destailleur
72998cd8fe Debug v15 2022-01-03 12:26:57 +01:00
Laurent Destailleur
a49af456ce Debug page customreports.php 2022-01-03 04:47:17 +01:00
Laurent Destailleur
ce05130384 Typo 2022-01-03 04:01:02 +01:00
Laurent Destailleur
f7871be6cd Debug v15 2022-01-03 03:06:18 +01:00
Vincent de Grandpré
6a52b967f4 Permettre de sortir de la fonction de connexion après authentification. 2022-01-02 16:37:07 -05:00
Laurent Destailleur
219ca9b610 css 2022-01-02 21:05:44 +01:00
Laurent Destailleur
0d8cf96f8f FIX croping function 2022-01-02 20:54:35 +01:00
Laurent Destailleur
0c82577fc5 Look and feel v15 2022-01-02 19:04:12 +01:00
Laurent Destailleur
507f91acf8 Fix tooltip 2022-01-02 18:36:18 +01:00
Laurent Destailleur
084a404870 Debug v15 2022-01-02 18:33:57 +01:00
Laurent Destailleur
48c990a8bf Sync transifex 2022-01-02 18:22:18 +01:00
Laurent Destailleur
3d8de7790c Fix restore color if we cancel color selection 2022-01-02 16:34:46 +01:00
Laurent Destailleur
adec35d4b1 Debug v15 2022-01-02 15:46:28 +01:00
Laurent Destailleur
3774eae510 Responsive 2022-01-02 15:08:46 +01:00
Laurent Destailleur
bdb03c8bd0 Fix responsive 2022-01-02 13:51:30 +01:00
Laurent Destailleur
a7d4aa9fb3 Responsive 2022-01-02 12:49:15 +01:00
Laurent Destailleur
b41fdb6ec9 Fix tool for generic to sql filters. Must not be saved into api files. 2022-01-01 21:46:16 +01:00
Laurent Destailleur
7fd601a29d Fix navigation on security audit list 2022-01-01 20:47:01 +01:00
Laurent Destailleur
0b443a203e Fix navigation on security audit list 2022-01-01 20:37:03 +01:00
Laurent Destailleur
0037ee2254 Fix ckeditor plugins 2022-01-01 19:37:53 +01:00
Laurent Destailleur
49dae0aed2 Look and feel v15 2022-01-01 18:41:26 +01:00
Philippe GRAND
17d1fa190f Fix : Fatal error: Uncaught Error: Call to a member function deleteFromShipment() on null in /home/httpd/vhosts/doliweb.com/httpdocs/expedition/class/expedition.class.php on line 1463 2022-01-01 15:27:20 +01:00
Laurent Destailleur
ee5ea123ed Revert "Update functions.lib.php"
This reverts commit 2676427ec4.
2021-12-31 16:13:05 +01:00
Laurent Destailleur
7e11677117 Fix: Add token to the url logout 2021-12-31 14:33:12 +01:00
Laurent Destailleur
d7d019e071 Fix class not found 2021-12-31 14:21:20 +01:00
Laurent Destailleur
5666e90f56
Merge pull request #19674 from mschamp/develop
Close #19673 order categories based on count of elements
2021-12-30 21:36:47 +01:00
Laurent Destailleur
a919ade1c6 Fixunit price 2021-12-30 20:00:04 +01:00
Laurent Destailleur
3967ce9c20 Fix unit price 2021-12-30 19:48:59 +01:00
Laurent Destailleur
8085c32b85
Merge pull request #19681 from atm-florianm/FIX_14.0_best_supplier_price_discount_applied_twice
FIX: discounts are applied twice for displaying best supplier price
2021-12-30 19:47:07 +01:00
Laurent Destailleur
64777acfc1 Fix unit price 2021-12-30 19:46:58 +01:00
Laurent Destailleur
f20753091e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-12-30 19:36:23 +01:00
Laurent Destailleur
b2c008244e Doc 2021-12-30 19:34:02 +01:00
Laurent Destailleur
e8408141e2
Merge pull request #19716 from jyhere/patch-2
FIx : addline() $type default value is misleading
2021-12-30 19:28:44 +01:00
Laurent Destailleur
9b14c68411
Update facture.class.php 2021-12-30 19:28:25 +01:00
Laurent Destailleur
9c50cfeb62 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modBom.class.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/modPropale.class.php
2021-12-30 19:18:41 +01:00
Laurent Destailleur
809c8f993b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/modPropale.class.php
	htdocs/filefunc.inc.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
2021-12-30 19:03:46 +01:00
Laurent Destailleur
108df3726a Fix php syntax 2021-12-30 18:46:26 +01:00
Laurent Destailleur
62a74ed428 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
	htdocs/societe/list.php
2021-12-30 17:57:45 +01:00
Laurent Destailleur
9f82aa1570 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/modulebuilder/template/admin/setup.php
2021-12-30 17:51:25 +01:00
Laurent Destailleur
7bdfc998bf Fix regression 2021-12-30 17:49:53 +01:00
Laurent Destailleur
7b10d7d001
Merge pull request #19676 from grandoc/new_branch_22_12_2021
fix : Fatal error: Uncaught Error: Class 'AccountingAccount' not foun…
2021-12-30 17:29:18 +01:00
Laurent Destailleur
76a0caf116
Merge pull request #19717 from OPEN-DSI/fix-company-list-title-on-nature-of
FIX title for nature of third party in company list
2021-12-30 17:25:08 +01:00
Laurent Destailleur
f307d5590b
Merge pull request #19686 from Je2fb/patch-2
Fix bug project reset on supplier order when you select a supplier
2021-12-30 17:08:13 +01:00
Laurent Destailleur
c396f972b4
Merge pull request #19694 from henrynopo/patch-1
Fix - Currency of Account Statement
2021-12-30 17:05:18 +01:00
lvessiller
f16166c47c FIX title for nature of third party in company list 2021-12-30 15:35:49 +01:00
Laurent Destailleur
ebb7aa7494
Merge pull request #19693 from grandoc/new_branch_27_12_2021
fix : units were not displayed
2021-12-30 13:19:25 +01:00
Laurent Destailleur
63f2cd6a30
Merge pull request #19695 from atm-maxime/fix_user_from_candidate
Fix #19672 : email unicity was checked when email was null
2021-12-30 13:17:49 +01:00
Laurent Destailleur
ac7d08d3e7
Merge pull request #19696 from atm-maxime/fix_supinv_unpaidboard
Fix #19404 : only validated invoice must be considered in unpaid indicator
2021-12-30 13:00:09 +01:00
Laurent Destailleur
b62741b5a0
Merge pull request #19697 from atm-maxime/fix_order_massbilling
Fix #19249 : wrong payment cond and mode on mass order billing
2021-12-30 12:59:21 +01:00
Laurent Destailleur
3da863d6b4
Merge pull request #19698 from atm-maxime/fix_knowmgmt_bad_fk
Fix #19691 : wrong table name in sql file
2021-12-30 12:56:52 +01:00
Laurent Destailleur
15b34dedac
Merge pull request #19701 from atm-maxime/fix_bankentries_filter
Fix #19667 : bankentries wrong SQL parenthesis + missing filter
2021-12-30 12:52:57 +01:00
Laurent Destailleur
cd8613e9db
Merge pull request #19704 from atm-john/fix_validate_methode_call
Fix wrong method call
2021-12-30 12:46:12 +01:00
Laurent Destailleur
706581a227
Merge pull request #19706 from atm-john/fix_scrutinizer_comments
Fix : scrutinizer comments
2021-12-30 12:42:08 +01:00
Laurent Destailleur
c288b0d02a
Merge pull request #19711 from dolibarr95/patch-58
Update functions.lib.php
2021-12-30 12:40:52 +01:00
Laurent Destailleur
2435ef4f66
Merge pull request #19712 from atm-maxime/fix_boxes_css_amount
Fix missing amount css class on boxes
2021-12-30 12:39:34 +01:00
jyhere
ddb8b406a0
FIx : addline() $type default value is misleading
It should refer to a Product type, not an Invoice type.
2021-12-30 10:17:03 +01:00
stickler-ci
38aee54529 Fixing style errors. 2021-12-29 12:58:36 +00:00
Maxime Kohlhaas
873adb3cb1 Fix : add missing resource stats on stat box 2021-12-29 13:57:22 +01:00
Maxime Kohlhaas
ac7fb65d04 Fix missing amount css class on boxes 2021-12-29 13:43:18 +01:00
dolibarr95
2676427ec4
Update functions.lib.php
#19709
2021-12-29 13:24:23 +01:00
John BOTELLA
33ea8e850b Remove not defined param 2021-12-28 19:47:58 +01:00
John BOTELLA
38539dace3 fix test 2021-12-28 19:44:10 +01:00
John BOTELLA
0f587a37e2 fix missing var definition 2021-12-28 19:36:44 +01:00
John BOTELLA
5449d57d26 fix variable does not seem to be defined for all execution 2021-12-28 19:19:51 +01:00
John BOTELLA
e20d669e34 Fix : prevent fatal error 2021-12-28 19:08:47 +01:00
stickler-ci
537965c7b7 Fixing style errors. 2021-12-28 17:34:11 +00:00
Maxime Kohlhaas
f9f1c7e3f8 Fix action protection 2021-12-28 18:32:02 +01:00
John BOTELLA
019b10c9eb Fix wrong method call 2021-12-28 18:27:29 +01:00
Maxime Kohlhaas
f27fda33e8 Fix prelevement action right management 2021-12-28 18:26:42 +01:00
Maxime Kohlhaas
1e848f0ebb Fix prelevement right management and action buttons 2021-12-28 18:17:57 +01:00
Maxime Kohlhaas
2237c09d64 Remove unused set_credit function 2021-12-28 17:59:41 +01:00
Maxime Kohlhaas
93393b82a3 Fix nav + translations on supplier invoice credit transfer 2021-12-28 17:40:25 +01:00
Maxime Kohlhaas
4b3289ed84 Fix #19666 : missing quotes in SQL statement 2021-12-28 16:20:01 +01:00
Maxime Kohlhaas
12880f1716 Fix : replace old filters by new ones 2021-12-28 16:02:51 +01:00
Maxime Kohlhaas
1d20694f33 Fix #19667 : bankentries wrong SQL parenthesis + missing filter 2021-12-28 15:47:46 +01:00
Maxime Kohlhaas
b54e7bd861 Fix #19691 : wrong table name in sql file 2021-12-28 12:23:15 +01:00
Maxime Kohlhaas
0e9b707801 Fix #19249 : wrong payment cond and mode on mass order billing 2021-12-28 11:57:26 +01:00
Maxime Kohlhaas
1bb07dbc6b Fix #19404 : only validated invoice must be considered in unpaid indicator 2021-12-28 11:02:45 +01:00
Maxime Kohlhaas
3ada0a8741 Fix #19672 : email unicity was checked when email was null 2021-12-28 10:40:44 +01:00
Henry
559b0b4bfa
Fix - Currency of Account Statement 2021-12-28 17:12:12 +08:00
Philippe GRAND
f8884d2c86 fix : units were not displayed 2021-12-27 15:00:05 +01:00
mschamp
77d1f83964
Merge branch 'Dolibarr:develop' into develop 2021-12-27 09:53:08 +01:00
Laurent Destailleur
27134a1f91 Fix position of menu 2021-12-26 15:44:04 +01:00
Laurent Destailleur
2e2e1b90e5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-12-26 15:41:25 +01:00
Laurent Destailleur
a7ef4991fd Fix position of menu 2021-12-26 15:41:09 +01:00
Laurent Destailleur
7edba34107 Debug and secure the signature feature 2021-12-25 17:08:40 +01:00
Laurent Destailleur
3fc0205d0b Fix responsive 2021-12-25 12:44:46 +01:00
Maxime Kohlhaas
d82c1f34e0 Fix modulebuilder params for updatemask action 2021-12-25 11:33:26 +01:00
Je2fb
369d125002
Update card.php
Fix bug when you create a supplier order from a project to keep the project when you select the supplier (Option RELOAD_PAGE_ON_SUPPLIER_CHANGE)
2021-12-23 22:47:30 +01:00
atm-florian
67910db532 FIX: discounts are applied both when fetching the best supplier price and when displaying it
cf. PR #18873
commit 2be2423dee
2021-12-23 19:00:39 +01:00
Laurent Destailleur
4eb9a7625a Fix notification setup page. 2021-12-23 15:12:35 +01:00
Laurent Destailleur
0a72aed3d7 Fix missing space before union 2021-12-23 13:35:38 +01:00
Laurent Destailleur
0fd386a450 css 2021-12-23 11:32:12 +01:00
Laurent Destailleur
0273ab67fe Prepare 14.0.5 2021-12-23 10:24:06 +01:00
Laurent Destailleur
00b43be7e6 Code comment 2021-12-23 10:20:01 +01:00
Laurent Destailleur
fee64f57d4 FIX Can't close a down payment if paid with credit notes. 2021-12-23 10:09:20 +01:00
Laurent Destailleur
dd94745e33 Fix css for rtl languages 2021-12-22 20:57:14 +01:00
mschamp
8bbbcd9b9d
Merge branch 'Dolibarr:develop' into develop 2021-12-22 20:08:11 +01:00
Laurent Destailleur
6c84a128f6 Look and feel 2021-12-22 18:35:06 +01:00
Philippe GRAND
641b0ba88f fix : Fatal error: Uncaught Error: Class 'AccountingAccount' not found in /home/httpd/vhosts/doliweb.com/httpdocs/admin/dict.php on line 1970 2021-12-22 17:38:06 +01:00
Laurent Destailleur
b74c24cefd Fix status of KM article 2021-12-22 11:38:17 +01:00
mschamp
aac0375e7f Close #19673 order categories based on count of elements 2021-12-22 10:32:50 +01:00
Laurent Destailleur
9feb3a0adb
Merge pull request #19492 from fmarcet/13.0
Fix: Import don't work if extrafield is separator
2021-12-22 00:25:03 +01:00
Laurent Destailleur
e4c4ef14ef Fix td balance 2021-12-21 23:52:01 +01:00
Laurent Destailleur
e76c85bc8d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-12-21 16:32:45 +01:00
Laurent Destailleur
856b010a45 FIX #19651 2021-12-21 15:56:59 +01:00
Laurent Destailleur
82bab7bcac
Merge pull request #19668 from ATM-Consulting/FIX_ContactCategorie_Double_Display_On_Societe_Create_Card_With_THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION
FIX : double display for contact categorie on societe create card
2021-12-21 15:53:53 +01:00
Laurent Destailleur
ccabc320d7
Merge pull request #19654 from aspangaro/15b1
FIX Accountancy - Separator problem with FEC/FEC2 export format
2021-12-21 15:53:08 +01:00
Laurent Destailleur
d3b429bef6
Merge pull request #19663 from frederic34/patch-1
add url in receipt printer options
2021-12-21 15:52:25 +01:00
Laurent Destailleur
0cf460ced2
Merge pull request #19656 from grandoc/new_branch_20_12_2021
fix: Fatal error: Uncaught Error: Class 'AccountingAccount' not found…
2021-12-21 15:52:01 +01:00
Laurent Destailleur
e2ee74f8e0 Clean code 2021-12-21 15:46:42 +01:00
Laurent Destailleur
bb436e556d Fix warnings 2021-12-21 15:23:56 +01:00
Laurent Destailleur
86b6f9c742 Fix warning 2021-12-21 15:01:41 +01:00
Laurent Destailleur
e3bb837313 Fix doxygen 2021-12-21 14:58:34 +01:00
Laurent Destailleur
2de5db83a9 Fix iban_prefix 2021-12-21 14:51:57 +01:00
Laurent Destailleur
e555683787 Fix unexpected code 2021-12-21 14:46:44 +01:00
Laurent Destailleur
55562eb1d8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formadmin.class.php
2021-12-21 14:36:38 +01:00
Laurent Destailleur
084f298836 Fix regression. The entity for bank is in table itself not into a parent 2021-12-21 14:34:47 +01:00
atm-gregr
3feb3d5b76 double contactcategorie 2021-12-21 14:26:28 +01:00
Laurent Destailleur
de25cf3a72 NEW: Hidden option API_DISABLE_COMPRESSION is now visible in API setup
page.
2021-12-21 14:08:06 +01:00
Laurent Destailleur
fa1bddc79d Fix API for php8 2021-12-21 14:01:58 +01:00
Laurent Destailleur
12645926cc Fix text 2021-12-21 12:12:32 +01:00
Laurent Destailleur
bb6bf2f743 Fix replacement of ICS on sepa mandate 2021-12-21 11:45:42 +01:00
Laurent Destailleur
8e4077eedf Fix ics on sepa mandate template 2021-12-21 11:25:19 +01:00
Laurent Destailleur
8438b62b02 Swith to beta 2021-12-21 11:16:17 +01:00
Frédéric FRANCE
214feeb1f3
Update dolreceiptprinter.class.php 2021-12-21 10:05:06 +01:00
Laurent Destailleur
3d173560e1 css 2021-12-21 02:51:21 +01:00
Laurent Destailleur
af8d022b92 Fix link of module bookmarks 2021-12-21 02:49:10 +01:00
Laurent Destailleur
0387b9922e FIX error message on sqlfilter in API 2021-12-20 20:49:32 +01:00
Laurent Destailleur
4855a97b21 Fix phpunit 2021-12-20 20:07:29 +01:00
Laurent Destailleur
29a09e5cbc typo 2021-12-20 18:49:11 +01:00
Laurent Destailleur
02317f1d95 Fix nav lose filter 2021-12-20 18:12:08 +01:00
Laurent Destailleur
26d30be518 FIX list on time spent when no param provided was wrong. 2021-12-20 17:50:59 +01:00
Frédéric FRANCE
520c296626
add url in receipt printer options 2021-12-20 16:04:32 +01:00
Laurent Destailleur
0465afbc34 Fix css for takepos 2021-12-20 13:39:34 +01:00
Ferran Marcet
2b7c3be511 Replace sql operator 2021-12-20 12:34:46 +01:00
Ferran Marcet
aa3f473ebc Merge branch '13.0up' into 13.0 2021-12-20 12:32:43 +01:00
Philippe GRAND
67b9244c6b fix: Fatal error: Uncaught Error: Class 'AccountingAccount' not found in /home/httpd/vhosts/doliweb.com/httpdocs/expensereport/card.php on line 2099 2021-12-20 10:36:35 +01:00