Commit Graph

78589 Commits

Author SHA1 Message Date
Ferran Marcet
63b15dd1b6 Fix: User can see events that are not assigned to it 2020-08-03 11:17:30 +02:00
quentin
b026896a98 FIX product label and desc were never updated when modifying trans 2020-08-03 10:33:48 +02:00
Laurent Destailleur
b57ec55812 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-08-02 15:58:13 +02:00
Laurent Destailleur
91db3b9344 Merge pull request #14323 from altatof/fixsizewithff
FIX : duration fields size with firefox
2020-08-02 01:25:11 +02:00
altairis
448cd1cd36 Merge branch '10.0' into fixsizewithff 2020-07-31 12:23:57 +02:00
altairis
9a9eef428b fix duration fields size with firefox 2020-07-31 12:22:21 +02:00
Laurent Destailleur
9dc904f0a5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-07-29 16:03:03 +02:00
Laurent Destailleur
491f72accc Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2020-07-29 16:02:07 +02:00
Laurent Destailleur
ab4b1b1f29 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-07-29 13:48:18 +02:00
Laurent Destailleur
4a291f181f Fix regression 2020-07-29 13:47:04 +02:00
Laurent Destailleur
c93a4c7fc0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-07-29 13:40:27 +02:00
Laurent Destailleur
566f683c54 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-07-29 13:40:19 +02:00
Laurent Destailleur
454a804b4e Merge pull request #14299 from atm-gauthier/9.0_hidden_unit
FIX : We need to see unit line on PDF even though it's an option
2020-07-29 13:18:17 +02:00
Laurent Destailleur
cb8c8a1d50 Merge pull request #14305 from marc-dll/FIX_10.0_expedition_create
FIX: shipping creation: checks not done on weight and sizes
2020-07-29 12:59:23 +02:00
Laurent Destailleur
d2e730f8e5 Merge pull request #14310 from atm-gauthier/10.0_fix_wrong_column_order_by
FIX : Order by amount in product propal stats must be done on d.total_ht and not p.total
2020-07-29 12:58:28 +02:00
Laurent Destailleur
c4b3781df0 Merge pull request #14315 from OPEN-DSI/v10-fix-contact-list-redirect-main-search
FIX redirect on contact card from main search
2020-07-29 12:25:38 +02:00
lvessiller
8ee5b16e89 FIX redirect on contact card from main search 2020-07-29 12:00:22 +02:00
VERDOL Gauthier
d214dbb5fd FIX : Order by amount in product propal stats must be done on d.total_ht and not p.total 2020-07-28 15:42:54 +02:00
Marc DLL
ee55b82a8d FIX: shipping creation: checks not done on weight and sizes 2020-07-27 23:27:44 +02:00
VERDOL Gauthier
25994e61bc FIX : We need to see unit line on PDF even though it's an option 2020-07-27 16:04:21 +02:00
Laurent Destailleur
4e4e737ff2 Merge pull request #14269 from atm-gauthier/10.0_fix_wrong_invoice_template_link
FIX : wrong link to third invoice templates
2020-07-24 13:13:15 +02:00
Laurent Destailleur
cd5982e45f Merge pull request #14273 from fbosman/patch-3
Specific email-adresses for invoice, shipment and order-confirmation
2020-07-24 12:58:47 +02:00
stickler-ci
8273dbcd49 Fixing style errors. 2020-07-24 08:39:09 +00:00
Frans Bosman
94498b191b Update card_presend.tpl.php 2020-07-24 10:37:19 +02:00
Frans Bosman
e2592d9049 Update card_presend.tpl.php
Add hidden options for specific sender email-adress for Invoices, Shipments and Order-confirmations
2020-07-22 11:44:26 +02:00
VERDOL Gauthier
55298317e3 FIX : wrong link to third invoice templates 2020-07-20 16:22:48 +02:00
Laurent Destailleur
071b909d38 FIX Fails to retraive accounting code of social contribution sometimes
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
2020-07-10 05:19:21 +02:00
Laurent Destailleur
7cdb832c24 Merge pull request #14207 from atm-gauthier/10.0_fix_order_by_amount
FIX : order by amount ht uses wrong column
2020-07-10 02:50:30 +02:00
gauthier
25509e74d3 FIX : order by amount ht uses wrong column 2020-07-09 17:27:14 +02:00
Laurent Destailleur
b4cd670b09 Merge pull request #14186 from atm-gauthier/10.0_fix_search_soc
FIX : soc filter doesn't work on task list
2020-07-06 12:05:40 +02:00
Laurent Destailleur
2629a98851 Fix regression 2020-07-06 11:31:05 +02:00
Laurent Destailleur
1399ac9b41 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-07-06 11:28:17 +02:00
Laurent Destailleur
053a1a2230 Fix duplicate code 2020-07-06 11:22:30 +02:00
gauthier
466b7e84ef FIX : soc filter doesn't work on task list 2020-07-06 09:58:44 +02:00
Laurent Destailleur
4fba3ec872 Merge pull request #14115 from atm-florian/10.0
fix entity on supplier order
2020-07-03 00:50:51 +02:00
Laurent Destailleur
8d8695ccd7 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-07-03 00:41:06 +02:00
Laurent Destailleur
53c5ec51b8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-07-03 00:40:59 +02:00
Laurent Destailleur
4f5c5356c5 Merge pull request #14150 from atm-gauthier/9.0_deposit_amount_with_comma
FIX : create a deposit with amount using comma didn't work
2020-07-03 00:38:59 +02:00
Laurent Destailleur
18fa4c4105 Update card.php 2020-07-03 00:38:31 +02:00
Laurent Destailleur
9c504c1b3d Merge pull request #14158 from OPEN-DSI/v10-fix-societe-card-change-selected-fields
FIX change selected fields on company card
2020-07-03 00:30:34 +02:00
Laurent Destailleur
d3c23428d5 FIX Use of office365 TLS with SMTPs method.
Conflicts:
	htdocs/core/class/smtps.class.php
2020-07-01 17:11:13 +02:00
lvessiller
918e669c98 FIX change selected fields on company card 2020-06-30 16:33:18 +02:00
gauthier
6553c40bea FIX : create a deposit with amount using comma didn't work 2020-06-30 11:23:55 +02:00
Laurent Destailleur
960512acd9 Update fournisseur.commande.class.php
Action with filter on rowid does not need to have test on entity
2020-06-28 21:21:35 +02:00
Laurent Destailleur
1194c61857 Merge pull request #14125 from ATM-Consulting/10.0_FIX_pgsql_on_company.lib.php_2
FIX 10.0 - fatal with postgreSQL
2020-06-28 21:20:20 +02:00
Laurent Destailleur
dfb7c3e194 Update fournisseur.commande.class.php 2020-06-28 21:14:49 +02:00
Laurent Destailleur
b3fdb9f168 Merge pull request #14136 from atm-gauthier/10.0_getpost_extrafields_date
FIX : $_POST must be GETPOST
2020-06-28 21:08:46 +02:00
gauthier
858a751eef FIX : $_POST must be GETPOST 2020-06-26 10:51:04 +02:00
Florian Mortgat
ccfe6f18fe FIX 10.0 - fatal with postgres
backport of https://github.com/Dolibarr/dolibarr/pull/14064/files
2020-06-25 16:06:16 +02:00
florian HENRY
77868ad2a3 fix entity on supplier order 2020-06-24 12:42:41 +02:00