Commit Graph

77581 Commits

Author SHA1 Message Date
Laurent De Coninck
c8fb81710f fix #12041 - Generate password
Secure the generate password method "perso".
Now the system checks the minimum possible value. If the value entered
is lower then the system will never trigger the update.

Since the update is done through GET parameters, I also added a check
backend wise. This checks should never be triggered nor in error.

[see: #12041]
2019-10-04 18:13:00 +02:00
Laurent Destailleur
0b9d27423d FIX Can't modify vendor invoice if transfered into accountancy 2019-10-04 10:31:57 +02:00
Laurent Destailleur
6cd3d27885 Fix comparison 2019-10-04 09:54:52 +02:00
Laurent Destailleur
b787e53020 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-10-03 17:54:58 +02:00
Laurent Destailleur
1a66e0b05e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/product/card.php
2019-10-03 17:53:59 +02:00
Laurent Destailleur
d9aa816197 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-03 17:52:06 +02:00
Laurent Destailleur
75be637b0b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-03 17:50:57 +02:00
Laurent Destailleur
7412335217
Merge pull request #12031 from atm-lena/8.0_fix_missingbegin
FIX missing begin()
2019-10-03 17:50:35 +02:00
atm-lena
ae01bd8f07 FIX missing begin() 2019-10-03 17:23:16 +02:00
Laurent Destailleur
9762d77958
Merge pull request #12024 from frederic34/patch-17
Update dolgraph.class.php
2019-10-03 15:57:48 +02:00
Laurent Destailleur
03614536f9
Merge pull request #12018 from frederic34/patch-12
backport commit for setmulticurrency
2019-10-03 15:54:01 +02:00
Frédéric FRANCE
0d41216624
Update dolgraph.class.php 2019-10-03 00:22:14 +02:00
Frédéric FRANCE
ad3cbd17c2
backport commit for setmulticurrency
a489207122 (diff-48f18024fb928ce21b76ef02fc967c67)
2019-10-02 11:12:30 +02:00
Laurent Destailleur
4928a999a0
Merge pull request #11933 from atm-gauthier/fix_conf_to_allow_changeproducttype
FIX : change product type must be allowed if we activate hidden conf
2019-10-01 14:41:52 +02:00
Laurent Destailleur
d448998762
Update card.php 2019-10-01 14:41:25 +02:00
Laurent Destailleur
d6198a1e33 Fix billed time is empty 2019-10-01 13:47:29 +02:00
Laurent Destailleur
2d42afc686 FIX Filter on project on ticket list 2019-10-01 12:36:39 +02:00
Laurent Destailleur
9b607a3105 FIX navigation on ticket tab of projects 2019-10-01 12:29:58 +02:00
Frédéric FRANCE
64381ac4d6 Update api_boms.class.php 2019-10-01 11:37:29 +02:00
Laurent Destailleur
956b46d920 Fix warnings 2019-10-01 11:37:15 +02:00
Frédéric FRANCE
7872a93605 Update box_commandes.php 2019-10-01 11:36:33 +02:00
Frédéric FRANCE
4ff65ce586 Update box_supplier_orders.php 2019-10-01 11:36:29 +02:00
Frédéric FRANCE
d201515514 Update box_prospect.php 2019-10-01 11:36:24 +02:00
Laurent Destailleur
322786cabe Look and feel v10 2019-10-01 11:36:06 +02:00
Laurent Destailleur
15e646cc62 Fix bad name of trigger 2019-10-01 11:34:35 +02:00
Laurent Destailleur
6ee17022c0 Fix bad key for type of contact of resources 2019-10-01 11:34:01 +02:00
gauthier
2167e7ed98 FIX : hidden conf to prevent from changing product_type 2019-10-01 09:12:51 +02:00
Laurent Destailleur
4f356fa412
Merge pull request #11859 from altatof/avoir
FIX : allow standalone credit note even if no invoice
2019-09-30 18:12:55 +02:00
Laurent Destailleur
945dd0ae89
Update card.php 2019-09-30 18:12:43 +02:00
Laurent Destailleur
29d941cb6e
Merge pull request #11918 from atm-gauthier/8.0_fix_discount_visibility_follows_invoice_sharing
FIX : If we share invoice, we need to see discount created from a deposit on each entity
2019-09-30 18:04:07 +02:00
Laurent Destailleur
d2881eb85b FIX CSS
Conflicts:
	htdocs/core/tpl/extrafields_list_search_input.tpl.php
2019-09-29 19:26:37 +02:00
Laurent Destailleur
d0d884742f FIX #11861 Not consistent code to manage measuring units 2019-09-27 19:45:33 +02:00
Laurent Destailleur
18055bc425 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-27 17:51:34 +02:00
Laurent Destailleur
46e019642f Code comment 2019-09-27 17:51:22 +02:00
Laurent Destailleur
ea62ea8c70
Merge pull request #11901 from ptibogxiv/patch-263
NEW: delete purchase price API
2019-09-27 15:37:21 +02:00
VESSILLER
5f08a649eb FIX empty cache when we want to load specific warehouses in select
Conflicts:
	htdocs/product/class/html.formproduct.class.php
2019-09-27 15:10:05 +02:00
Laurent Destailleur
e3edb37620 Fix escape db 2019-09-27 14:54:23 +02:00
madx666
4b3430a1dc Fix return to list on page 1
When are on page 1 on any list and we go on an object, when return to the list, we are back on page 0
2019-09-27 14:53:11 +02:00
Laurent Destailleur
da35e3d7cd Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-27 14:07:35 +02:00
Laurent Destailleur
6d1a571aed Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/product/dynamic_price/class/price_parser.class.php
2019-09-27 14:07:11 +02:00
Laurent Destailleur
5d45638248 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-09-27 14:02:23 +02:00
Laurent Destailleur
ab33665f7b
Merge pull request #11950 from laudeco/hotfix/11881-remove-referent
[FIX][#11881] -  remove referent from the project
2019-09-27 12:37:16 +02:00
Laurent Destailleur
412e0f193b
Update element.php 2019-09-27 12:36:53 +02:00
Laurent Destailleur
34aa64bae2
Update element.php 2019-09-27 12:36:15 +02:00
Laurent Destailleur
2eaa910336
Update project.class.php 2019-09-27 12:32:27 +02:00
Laurent Destailleur
7f9ea2e223
Merge pull request #11929 from atm-florian/9.0
fix regex main.inc.php warning
2019-09-27 12:26:24 +02:00
Laurent Destailleur
de11801792
Merge pull request #11971 from ATM-Marc/FIX_8.0_shipping_errors
FIX: shipping card: missing user error messages when classifying closed or billed
2019-09-27 11:56:43 +02:00
Laurent Destailleur
59a099b176
Merge pull request #11954 from frederic34/patch-18
add missing error code in price parser
2019-09-27 11:35:42 +02:00
Laurent Destailleur
fe15871fe3
Merge pull request #11935 from atm-gauthier/8.0_chargesociale
FIX : wrong test
2019-09-27 11:35:00 +02:00
Laurent Destailleur
99cfea1ff4
Update paiement_charge.php 2019-09-27 11:34:50 +02:00