Commit Graph

108456 Commits

Author SHA1 Message Date
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
bjoern86
cab4b762d3
Adds possibility to add senders name to $formmail->fromname
If INVOICE_EMAIL_SENDER_NAME, SHIPPING_EMAIL_SENDER_NAME, COMMANDE_EMAIL_SENDER_NAME or ORDER_SUPPLIER_EMAIL_SENDER_NAME is beeing set, use it as sender name. If not, keep $formmail->fromname blank
2022-01-01 20:24:30 +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
Mélina
a85f542668 double quotes 2021-12-31 09:29:56 +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
c57dc82eaa
Merge pull request #19688 from atm-maxime/fix_modbuilder_numbering_model
Fix modulebuilder params for updatemask action
2021-12-30 17:07:27 +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