Commit Graph

19089 Commits

Author SHA1 Message Date
Jérôme Nadaud 0ef7578f26 [-] BO : Order template misplaced empty form 2013-07-26 18:43:40 +02:00
Rémi Gaillard 0d76af7f41 // debug deletion 2013-07-26 18:29:01 +02:00
Rémi Gaillard c0cf92cbdf [+] BO: Add a wizard to create and edit your carriers 2013-07-26 18:27:21 +02:00
gRoussac 42c5335f27 [*] WS : order history add(POST) send customer email if sendemail=1 url parameter, thanks @gerdus 2013-07-26 17:55:53 +02:00
Jérôme Nadaud f3ca8ec15b [+] BO : Handler invoice date generation button 2013-07-26 17:23:15 +02:00
gRoussac 2704f52fe4 [-] Installer: update leftcolumn alias to enable live_edit on blockmyaccount 2013-07-26 17:20:52 +02:00
gRoussac 076b6d11a2 [-] CORE: Copy live_edit bool when register alias hook 2013-07-26 17:15:36 +02:00
sLorenzini c1e4b812f9 // update "create order" tab 2013-07-26 16:33:52 +02:00
Kevin Granger 1a2b78b00f [+] BO Invoices 2013-07-26 15:34:11 +02:00
Jérôme Nadaud 3287ff5300 [+] BO : Product attachment "For" 2013-07-26 15:32:04 +02:00
Jérôme Nadaud 7db1fb89ec [+] BO : Products customization "For" 2013-07-26 15:09:14 +02:00
Jérôme Nadaud 5c52ba31e9 [+] BO : Products quantities "For" and small template fix 2013-07-26 15:03:29 +02:00
sLorenzini 3c035324f4 // update order tab 2013-07-26 12:15:23 +02:00
Jérôme Nadaud 5d2e19fe3b [-] BO : FixBug Impossible to remove available date from product attribute 2013-07-26 12:14:00 +02:00
Jérôme Nadaud 23e0467993 [-] MO dateofdelivery : FixBug #PNM-1478 Now take care of product available date 2013-07-26 11:48:18 +02:00
Kevin Granger 8b7c29dd18 [+] BO Scenes - Tags - Attachments 2013-07-26 11:12:50 +02:00
Damien Metzger e80364984a // Fixed manufacturers addresses export 2013-07-26 10:36:41 +02:00
Kevin Granger 72b046d5f0 [+] BO Manufacturers 2013-07-26 10:21:23 +02:00
Gregory Roussac 30c689df22 Merge pull request #584 from Captain-FLAM/patch-3
[-] FO : product with declinaisons without reductions, reduction price is showed anyway
2013-07-26 00:58:00 -07:00
Gregory Roussac 5015f88a46 Merge pull request #595 from codl/fix/too-many-packs
[-] WS: Sanity check before creating packs
2013-07-26 00:51:08 -07:00
Gregory Roussac 7d06d50d40 Merge pull request #597 from Captain-FLAM/patch-9
[-] CORE : Exception Text filled on Positions Page is not working (Hook Modules Exceptions)
2013-07-26 00:38:22 -07:00
Captain FLAM a35011e9a5 Update Module.php 2013-07-25 19:16:46 +01:00
Kevin Granger 9e5bbac559 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
# By Jérôme Nadaud (4) and sLorenzini (1)
# Via Jérôme Nadaud
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop:
  [-] BO : BugFix Cancel modification button error
  [+] BO : Product "For" and combination button
  // update order tab
  [+] BO : Product "For"
  [+] BO : Product "For" and new carriers select list

Conflicts:
	admin-dev/themes/default/css/admin-theme.css
2013-07-25 19:21:59 +02:00
Kevin Granger 9308c5c527 no message 2013-07-25 19:18:54 +02:00
Gregory Roussac c9e87d99da Merge pull request #551 from cinscaen/development
[-] BO: Fix Bug Progress Bar Upload Image Product
2013-07-25 09:23:07 -07:00
Gregory Roussac ceee011d5c Merge pull request #555 from piotrmocko/patch-1
[- ] BO : Do not limit feature values on a  getList
2013-07-25 09:20:53 -07:00
Jérôme Nadaud 07000c1f66 [-] BO : BugFix Cancel modification button error 2013-07-25 18:15:41 +02:00
gRoussac d2acb9dedb [-] MO : Fix sort order for combinations, report of pull request https://github.com/PrestaShop/PrestaShop/pull/364 2013-07-25 18:15:06 +02:00
gRoussac 9848468f3e [-] MO : blockviewed Fix bug adding last product to list, thanks @kluevandrew 2013-07-25 17:58:22 +02:00
Jérôme Nadaud ce5355415b [+] BO : Product "For" and combination button 2013-07-25 17:53:09 +02:00
Damien Metzger e6ecf0c177 // Added a more efficient index 2013-07-25 17:07:28 +02:00
Damien Metzger eff81dfe05 // Moved a condition/function from SQL to PHP. 2013-07-25 17:07:28 +02:00
sLorenzini 832f5cf0dd // update order tab 2013-07-25 16:53:18 +02:00
Jérôme Nadaud 76c87044de [+] BO : Product "For" 2013-07-25 16:44:52 +02:00
Gregory Roussac 6531572c15 Merge pull request #596 from ChristopheBoucaut/patch-3
[-) FO : addtextfield if magic_quotes_gpc is enabled, there is no need to escape the characters from $ _POST
2013-07-25 07:36:31 -07:00
Jérôme Nadaud cc1fddd52d [+] BO : Product "For" and new carriers select list 2013-07-25 16:24:43 +02:00
Kevin Granger 488cf0919a // BO attributes 2013-07-25 15:51:41 +02:00
ChristopheBoucaut a9e233b209 Update Cart.php
If magic_quotes_gpc is enabled, there is no need to escape the characters from $ _POST as they already are.
2013-07-25 15:46:08 +02:00
Gregory Roussac a54ac39632 Merge pull request #356 from arnolem/dev-wsSetProductTags
[*] WS : Allow to set the tags list of product
2013-07-25 06:17:15 -07:00
Gregory Roussac 3896453c7c Merge pull request #352 from sdevilcry/development
[-] CORE : Fix issue after a payment redirection error, delivery_option is not sent
2013-07-25 06:11:51 -07:00
gRoussac bff2844adf [*] MO : Added customer and product object to hook sending email 2013-07-25 14:50:35 +02:00
Jérôme Nadaud f8ff755067 [+] BO : Product "For" 2013-07-25 14:50:10 +02:00
Corentin Delcourt 53526304a5 [-] WS: Sanity check before creating packs
As it is before this commit, every product that is created from the
schema without removing the empty bundle item in the schema will become
a pack containing one broken item.

Sorry, this bug was introduced by my previous pull request.
2013-07-25 14:45:17 +02:00
Jérôme Nadaud 3f83dd9222 [+] BO : Product "For" 2013-07-25 14:33:14 +02:00
Gregory Roussac b4d3b631ad Merge pull request #594 from Shagshag/patch-6
[*] BO: twice class attribute in color input
2013-07-25 05:18:41 -07:00
Jérôme Nadaud d6b38635f9 [+] BO : Product "For" 2013-07-25 14:02:36 +02:00
gRoussac ae7ee01028 [*] FO : Fix bug #PSCFV-9611, autocomplete to off on opc page and other pages 2013-07-25 12:26:57 +02:00
Gregory Roussac 56aa91a3fa Merge pull request #296 from samy-r/dev-address-update
[*] CORE : Add mobile phone in default adress layout update
2013-07-25 03:05:36 -07:00
Kevin Granger 59aa781b0d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
# By Jérôme Nadaud
# Via Jérôme Nadaud
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop:
  // oops
  [-] BO : Add missing tmp directory
2013-07-25 11:55:58 +02:00
Kevin Granger b5ae321ea5 // fix input + switch 2013-07-25 11:55:27 +02:00