c70fe92dac
// Validate::isGenericName now allow "#" #PSCFV-6530
2013-07-18 18:22:50 +02:00
caf321e691
[-] FO : FixBug #PSCFV-8018 All products was counted in manufacturer lsit even if products was set as hidden
2013-07-18 18:16:57 +02:00
d879fb15a9
[-] FO : FixBug #PSCFV-8018 All products was counted in manufacturer list even hidden products
2013-07-18 18:10:29 +02:00
3693349643
[-] BO : FixBug #PSCFV-5316 Translation problem in delete button link
2013-07-18 15:49:53 +02:00
6293631ac4
[-] FO : fixed group query for cart rules #PSCFV-8992
2013-07-18 13:47:43 +02:00
69066361a6
[-] BO : FixBug #PSCFV-8234 Products tags not correctly indexed in search
2013-07-18 12:15:42 +02:00
108bd92c3b
[-] FO : Fixed partial use of cart rules which does not offer free shipping #PSCFV-9216
2013-07-18 12:09:48 +02:00
40389822c3
[-] BO : FixBug Directory Separator on URL
2013-07-18 08:52:39 +02:00
eecfdae0b6
[-] BO : FixBug #PSCFV-8217 Shop logo image not refresh after change
2013-07-17 18:23:59 +02:00
312e066751
Merge pull request #550 from PrestaEdit/patch-44
...
[-] Class: PaymentModule / Be sure to have the right "TaxCalculationMeth...
2013-07-17 09:01:32 -07:00
cf04c18ce6
Merge pull request #537 from PrestaEdit/patch-43
...
[-] FO: OrderHistory - Unclosed tag
2013-07-17 08:53:31 -07:00
458838e598
[-] BO : FixBug #PSCFV-9613 Fix product tax to be shop dependent
2013-07-17 17:33:53 +02:00
24b2e1ec8c
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-17 15:36:03 +02:00
d55f31d3b5
Merge branch 'tools-fileAttachment' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-tools-fileAttachment
...
Conflicts:
classes/Tools.php
controllers/front/ContactController.php
2013-07-17 15:35:18 +02:00
1b9892b944
// removed deprecated message
2013-07-17 13:42:45 +02:00
899dc30097
[-] Class : AdminController - Object id fixed
2013-07-17 11:33:33 +02:00
d66f407fcb
[-] BO : Use only 0% reduction from category in group
2013-07-16 18:28:11 +02:00
ae5b6b79ee
[*] BO : #PSCFV-8498 You can now use 0% in groups category rules in order to not apply discount on this category
2013-07-16 17:42:38 +02:00
8d39f32506
[-] BO: Fix tax rule edition - unique tax rule can't be edited
2013-07-16 11:52:05 +02:00
d2ff50ddb7
[*] CORE : Fix bug #PSCFV-9811 doc on display404Error
2013-07-16 10:50:27 +02:00
3d283000a0
// Fixed misplaced comma
2013-07-16 10:27:52 +02:00
f6ef6f5d0e
Merge pull request #572 from PrestaEdit/patch-47
...
[-] Class : Media / Correct jquery_ui_dependencies fileName
2013-07-15 07:41:07 -07:00
01bad90b29
// Welcome 2013
2013-07-15 16:36:54 +02:00
4b8a756add
[-] Class: Media / Correct jquery_ui_dependencies fileName
...
Even if not used...
2013-07-15 16:34:51 +02:00
ee1187d821
[-] BO: Delete specific price after combination deletion && fix SpecificPrice::getByProductId() sql query
2013-07-15 11:00:35 +02:00
e23854d143
// Add currency ID on default modules cache id
2013-07-12 17:49:38 +02:00
39a23e1494
Merge pull request #560 from BigZ/patch-4
...
[-] PDF : Develivery slip should use prefix
2013-07-12 08:42:16 -07:00
b25b88cf33
Merge pull request #559 from BigZ/patch-3
...
[-] PDF : Invoice prefix wasn't used in filename
2013-07-12 08:41:37 -07:00
105b1422a3
Merge pull request #562 from axometeam/patch-14
...
[*] BO : Do not increment stock if statut change fom Error to Canceled
2013-07-12 07:22:50 -07:00
9fec968488
Update Translate.php
...
Translations shouldn't be cached if they contain dynamic vars (sprintf)
On productcomments,
<li>{l s='%1$d out of %2$d people found this review useful.' sprintf=[$comment.total_useful, $comment.total_advice] mod='productcomments'}</li>
was always printing the same sentence
2013-07-12 15:17:09 +02:00
8588978e03
[*] FO : getCatImageLink doesn't work without type thanks @axometeam
2013-07-12 15:03:52 +02:00
1c960da57a
[*] BO : Not increment stock if statut change fom Error to Canceled
...
Not increment stock if statut change fom Error => Canceled or Canceled => Error (stock should stay the same).
Add a code simplification too
2013-07-12 11:22:42 +02:00
0928efb112
// small fix
2013-07-12 11:17:30 +02:00
c3b7e1dad9
Merge pull request #519 from axometeam/patch-5
...
[*] BO : Correct Request Sql Manager validate options
2013-07-12 02:08:45 -07:00
44debd682f
Merge pull request #517 from axometeam/patch-4
...
[*] BO : AdminControllers Keep "active" filter on pagination
2013-07-12 02:07:51 -07:00
4b492046c0
// add another logs information
2013-07-12 10:55:37 +02:00
8fcca7999d
Merge pull request #502 from axometeam/patch-2
...
[-] BO : Prevent false error for product duplication
2013-07-12 01:29:39 -07:00
25b5d2857b
develivery slip should use prefix
...
as develivery_prefix uses lang and shop id, those variables has to be passed as parameters
2013-07-12 03:03:21 +02:00
e28a1e793a
Invoice prefix wasn't used in filename
...
As invoice_prefix uses lang and shop ids they have to be passed has parameters
2013-07-12 03:01:33 +02:00
a5ee2c2f4f
[-] Classes : fixed cachefs and memcache classes #PSCFV-5225 thanks @prestalab
2013-07-11 18:27:54 +02:00
40967e6525
// update modules list tab
2013-07-11 17:27:11 +02:00
d0cf8fce18
// small fix
2013-07-11 17:04:29 +02:00
20b5449231
[*] Core: that is now easier to get links for another shop
2013-07-11 16:40:40 +02:00
004e833b24
[+] BO: Addition, deletion and edition are now logged
2013-07-11 14:50:23 +02:00
d0e4e956c4
[-] Classes : Mail - check instance of link in the context
2013-07-11 14:01:24 +02:00
7cc5196fec
[-] FO : fixed useless error when the product id in the URL is not an int #PSCFV-9726
2013-07-11 11:38:57 +02:00
f042d704d2
// field translatable + tpl products + fixs
2013-07-10 19:39:35 +02:00
02faf9d18e
[-] WS: do not escape shop name overzealously
2013-07-10 10:21:33 +02:00
e8b8fa0527
[-] CORE: No category in url preview on BO product page
2013-07-09 18:06:02 +02:00
7b62144220
[-] Core: ObjectModel::toggleStatus should change only active field on multishop with global context #PSCFV-9707
2013-07-09 11:19:58 +02:00
Damien Metzger