Commit Graph

77553 Commits

Author SHA1 Message Date
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
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
Laurent Destailleur
61f8771525
Merge pull request #11959 from prietojc/patch-10
FIX:  expedition.class.php
2019-09-27 11:15:23 +02:00
Laurent Destailleur
435edf999b Fix: label of product not always visible after a search 2019-09-27 11:05:44 +02:00
Marc de Lima Lucio
13f5decdf7 FIX: shipping card: missing user error messages when classifying closed or billed 2019-09-27 11:00:17 +02:00
Laurent Destailleur
cd295662d6 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-27 10:21:28 +02:00
Laurent Destailleur
8c3c7fd857 Fix remove + of categ on product thumb 2019-09-27 10:21:14 +02:00
Laurent Destailleur
d4364dd44e
Merge pull request #11956 from atm-john/10.0_fix_top_menu_size
FIX top menu right padding
2019-09-26 23:39:23 +02:00
Laurent Destailleur
5d7e542d37
Merge pull request #11970 from aspangaro/10.0_colspan
FIX colspan on VAT quadri report
2019-09-26 23:29:09 +02:00
Alexandre SPANGARO
b52e5d51e3 FIX colspan on VAT quadri report 2019-09-26 22:01:59 +02:00
JC Prieto
cdb6e7f9a6
Fix moved to fetch_line()
Fix moved to fetch_line()
2019-09-26 20:34:28 +02:00
Laurent Destailleur
33754f1951 Update demo 2019-09-26 14:36:23 +02:00
Laurent Destailleur
24e5b6ab79 Fix default filename of dump 2019-09-26 14:35:50 +02:00
Laurent Destailleur
aa5f35f14f Fix image on ticket 2019-09-26 14:28:34 +02:00
Laurent Destailleur
0e5d0a7784 Add data for tickets 2019-09-26 14:14:01 +02:00
Laurent Destailleur
b0615d477e Update demo 2019-09-26 13:58:43 +02:00
Laurent Destailleur
280219843e Update demo 2019-09-26 13:58:30 +02:00
Laurent Destailleur
ba1275332d Fix thousand separator for fr_NC 2019-09-25 13:03:43 +02:00
JC Prieto
0893926189
Update expedition.class.php
Clear lines before fech them.
2019-09-25 12:49:19 +02:00
Laurent Destailleur
db334a3b94 FIX Var not enough sanitized 2019-09-24 14:16:24 +02:00
Laurent Destailleur
c53be23122 FIX Filtering the HTTP Header "Accept-Language". 2019-09-24 13:54:52 +02:00
Laurent Destailleur
9cfe1262bd FIX Force downlaod of file with .noexe as octet-stream mime type 2019-09-24 13:30:04 +02:00
John Botella
5417dc0356 Fix top menu right padding 2019-09-24 13:11:40 +02:00
Laurent Destailleur
b5c5cc42fc Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-24 12:43:54 +02:00
Laurent Destailleur
6431e8e16d FIX SQL injection on qty 2019-09-24 12:43:44 +02:00
Frédéric FRANCE
26cd418320
Update price_parser.class.php 2019-09-24 10:28:27 +02:00