4207bdff32
Merge pull request #890 from indesign47/patch-14
...
[-] BO : AdminImport change width height depth
2013-10-24 09:43:54 -07:00
6f57093f50
[-] BO : FixBug #PSCFV-10600 - Unmatched Boundary with mod_security
2013-10-24 18:36:36 +02:00
8cb1806e49
// small fixes for Width Height Depth
...
change
0,1;0,2;0,3
to
1,2,3
2013-10-24 18:13:05 +02:00
759fe2f671
// norms
2013-10-24 18:09:21 +02:00
0416aca547
Merge pull request #889 from PhpMadman/PSCFV-10728
...
[-] BO : fix #PSCFV-10728, prices incorrectly formatted when creating new order from BO
2013-10-24 09:06:43 -07:00
cc3363011e
// rewrited urls for feeder module
2013-10-24 17:54:44 +02:00
c516035e0e
[-] BO : fix #PSCFV-10728, prices incorrectly formatted when creating new order from BO
2013-10-24 17:19:28 +02:00
c5324a653b
[-] IN: Fix bug #PSCFV-10644 no carrier available after upgrade from 1.4.x
2013-10-24 16:31:50 +02:00
3cd702da42
[-] WS: Fix stockavailables list when stock is shared between shops #PSCFV-10793
2013-10-24 16:30:02 +02:00
65401efcb6
Merge pull request #887 from indesign47/patch-13
...
[*] BO : AdminImport add img manufacturers-suppliers
2013-10-24 07:22:57 -07:00
84454bbc1c
[*] BO : AdminImport add img manufacturers-suppliers
2013-10-24 16:16:29 +02:00
f0ed5a303c
[*] BO : AdminImport add img suppliers
2013-10-24 15:49:56 +02:00
4803530eed
[*] BO : AdminImport add img manufacturers
2013-10-24 15:47:31 +02:00
ea8a5277f2
[*] BO : AdminImport add img manufacturers-suppliers
2013-10-24 15:44:11 +02:00
2ffc296279
FO : https://github.com/PrestaShop/PrestaShop/pull/878
2013-10-24 12:03:33 +02:00
971722a13f
// note updated by ajax in admincustomers should be url encoded
2013-10-24 11:56:50 +02:00
fc9b39968b
// remove notice
2013-10-24 11:46:09 +02:00
81945cef71
[-] FO : Follow up https://github.com/PrestaShop/PrestaShop/pull/879
2013-10-24 10:00:19 +02:00
1cc0134ec3
Merge pull request #879 from neemzy/development
...
[-] FO : OPC hide VAT fields fail if there are no company fields
2013-10-24 00:55:55 -07:00
b9de912dd3
[-] MO : Fixed bug PNM-1431 - referralprogram Lack the % sign
2013-10-24 09:53:16 +02:00
6d3640e895
Conditions to hide VAT fields fail if there are no company fields
...
"Company" fields may or may not be rendered on this form, whereas "VAT" fields are always rendered and depend on the former ones to be shown (or hidden) with CSS.
This fixes an edge case where there are no "Company" fields rendered and "VAT" fields still wrongly appear, which was caused by the fact that `$('#field').val() != ''` is truthy when `$('#field').length` is zero (since `'' != undefined`).
2013-10-24 09:43:50 +02:00
56693da6e0
// remove warning Notice: Undefined variable: connections in AdminCustomersController.php on line 702
2013-10-23 19:02:13 +02:00
3e33a259ef
[-] BO : FIx bug #PSCFV-10736 again, fixing query when product is not in base
2013-10-23 18:33:37 +02:00
8e506ddff2
[-] BO : FIx bug #PSCFV-10736, could not load a product given from getBoughtProducts
2013-10-23 18:16:45 +02:00
03ad842697
[-] BO : Fix bug #PSCFV-10790, Customer group names not exploded
2013-10-23 16:07:28 +02:00
554ab9414f
[-] BO: product listing should call Product::getPriceStatic() with the product default shop in the context when it is not a shop context
2013-10-23 15:08:02 +02:00
747ec9a2c4
// notice on carrierwizard when step back
2013-10-23 14:50:30 +02:00
2f5e15e2b1
Merge pull request #874 from PhpMadman/patch-5
...
[-] FO: Mobile theme removed width on message product select
2013-10-23 03:04:25 -07:00
373604fc97
[-] FO: removed width on message product select
...
Limiting select could make the user think the select is not working if they click to much to the left on bigger screens
2013-10-23 11:52:35 +02:00
101b37b40a
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-10-23 11:45:26 +02:00
ad4ecefcf9
[-] FO : Prevent fatal error on getUniqReference when order not loaded
2013-10-23 11:44:12 +02:00
3e999ab591
[-] MO blockcart
...
#PNM-1685 - [CODE] incorrect spelled variable in ajax-cart.js
2013-10-23 10:56:48 +02:00
010ad76e6f
Merge remote-tracking branch 'origin/development' into development
2013-10-23 10:55:35 +02:00
5fd3ad5adf
[*] FO ProductSale: improves calculation of most selled products when there are a lot of products in shop
2013-10-23 10:55:23 +02:00
6cddb57ce3
[-] BO: Synchronize stock available after receipt supply order items #PSCFV-10724
2013-10-23 10:34:00 +02:00
ae63336a37
[-] BO : Fix bug #PSCFV-10638, Admin Import by reference moves products to home category
2013-10-23 01:41:05 +02:00
feca06417f
// definition on addFeatureValueImport
2013-10-23 01:23:35 +02:00
5d28d38a22
[-] BO : Fix bug #PSCFV-7907 AdminImport, add custom field to features
2013-10-23 01:18:09 +02:00
398548fecf
Merge pull request #864 from samy-r/features-duplication-escaping
...
[-] CORE : pSQL for feature values
2013-10-22 10:20:44 -07:00
83d4d0d258
Merge pull request #872 from ldecoker/patch-11
...
[-] PDF : {else if} instead of {elseif} (B2B invoice template)
2013-10-22 10:19:31 -07:00
c401e61b81
Merge pull request #871 from ldecoker/patch-10
...
[-] PDF : {else if} instead of {elseif}
2013-10-22 10:18:57 -07:00
5bb4d48ddd
Merge pull request #870 from djfm/development
...
[*] LO : Fixed a few bugs with currency formats in Back-Office orders
2013-10-22 10:17:11 -07:00
e557db6429
Merge pull request #866 from studiokiwik/sk-ps15x-007
...
[-] MO : Loyalty if customer is logged do not recreate it
2013-10-22 10:15:55 -07:00
ce4170574c
[PDF] [-] {else if} instead of {elseif} (B2B invoice template)
2013-10-22 18:57:12 +02:00
e6e2db8400
[PDF] [-] {else if} instead of {elseif}
2013-10-22 18:55:32 +02:00
70d2e6e10b
Merge pull request #868 from ldecoker/patch-8
...
[-] BO : Notices onBO translation page
2013-10-22 08:03:06 -07:00
7cbaada844
[BO][-] Notice messages when accessing the BO translation page
...
When accessing the translation part with "core translation" , you got 2 errors:
Notice: Use of undefined constant _PS_THEME_SELECTED_DIR_ - assumed '_PS_THEME_SELECTED_DIR_' in controllers\admin\AdminTranslationsController.php on line 1018
Notice: Use of undefined constant _PS_THEME_SELECTED_DIR_ - assumed '_PS_THEME_SELECTED_DIR_' in \controllers\admin\AdminTranslationsController.php on line 1026
It's because the variable $this->theme_selected is not set for that case.
2013-10-22 17:00:56 +02:00
bc7e8eb355
Merge pull request #867 from PhpMadman/patch-4
...
[-] FO: Removed missplaced </li> on mobile theme
2013-10-22 07:50:21 -07:00
bc38b542fe
Merge remote-tracking branch 'origin/development' into development
2013-10-22 15:53:43 +02:00
2989538ce1
[*] BO Module mailalerts: send e-mail to merchand when product is out of stock
2013-10-22 15:53:20 +02:00
Gregory Roussac