dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,066 Commits 9 Branches 19 Tags
b882ecfbbc7ae217ee6553ef3bb77b667b9cdd58
Commit Graph
18066 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Granger 613c9b66e5 // fix carriers 2013-07-29 16:51:03 +02:00
Kevin Granger 483dbd7b53 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
# By Sarah Lorenzini (1) and sLorenzini (1)
# Via Sarah Lorenzini
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop:
  // update shipping tab
  // update shipping tab

Conflicts:
	admin-dev/themes/default/template/helpers/options/options.tpl
 2013-07-29 16:21:31 +02:00
Kevin Granger ae225dce4c // WIP customer 2013-07-29 16:16:10 +02:00
Sarah Lorenzini b528b7b6fc // update shipping tab 2013-07-29 16:13:07 +02:00
Sarah Lorenzini 101d9283ae // update wizard 2013-07-29 15:12:50 +02:00
gRoussac ab0189a726 [-] CORE : Fix bug #PSCFV-9572 when seizing in 0 in forms input fields for objects 2013-07-29 14:39:35 +02:00
sLorenzini 243834ee17 // update shipping tab 2013-07-29 14:14:00 +02:00
PrestaEdit c1b0d32d32 [-] Carrier Wizard: fix 2013-07-29 13:57:31 +02:00
Captain-FLAM 0de4642d09 [*] BO : Proposition : IMPROVEMENT Admin Modules Positions 
You can see in action over there :
http://www.youtube.com/watch?v=e7KXuCU3RIM
 2013-07-29 12:35:02 +01:00
Damien Metzger ad9d3af3ad // Class index for Carrier Wizard 2013-07-29 11:54:08 +02:00
Gregory Roussac 155102da4b Merge pull request #603 from xBorderie/patch-1 
// Removed "502" from the notice of license.
 2013-07-29 02:49:48 -07:00
Xavier 4291b23e23 Update CartRule.php 
Removed "502" from the notice of license.
 2013-07-29 11:41:35 +02:00
Vincent Augagneur e1b408f1f3 //added missing carrier wizard step img 2013-07-29 11:36:44 +02:00
sLorenzini 2ac6ada03d // update order tab 2013-07-29 11:01:48 +02:00
Vincent Augagneur 210d24343c [-] BO : fixed input action when set fees for all zones in carrier wizard 2013-07-29 10:47:20 +02:00
gRoussac 1c37fdbc23 // foloww up https://github.com/PrestaShop/PrestaShop/commit/2e6e5a2604be05da859154f5369ec026ee55e44d 2013-07-29 10:24:36 +02:00
Vincent Augagneur 60d67a7798 Merge pull request #600 from PrestaEdit/carrier_wizard 
[-] Carrier Wizard: Remove fatal error "Call-time pass-by-reference"
 2013-07-29 01:04:17 -07:00
Jérôme Nadaud 95ca638ec9 [-] BO : FixBug #PSCFV-9895 Mal function in products suppliers accordion 2013-07-29 09:33:50 +02:00
PrestaEdit c089b1e69e [-] Carrier Wizard: Remove fatal error "Call-time pass-by-reference" 2013-07-27 15:23:48 +02:00
PrestaEdit 85553525e9 Merge pull request #2 from PrestaShop/development 
// Merge PrestaShop
 2013-07-27 04:39:15 -07:00
Rémi Gaillard a786606c9a // small fix on carrierwizard 2013-07-26 20:27:25 +02:00
Rémi Gaillard 77f4eec64f // Fix group association on carrierwizard 2013-07-26 19:38:06 +02:00
Rémi Gaillard 159d0b3904 // improve exception 2013-07-26 19:15:37 +02:00
Jérôme Nadaud 06834e404d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-07-26 19:00:00 +02:00
Jérôme Nadaud 52ff61719b [+] BO : Remove invoices button toolbar 2013-07-26 18:59:39 +02:00
Kevin Granger 94de4d3d2f 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:
  [-] BO : Order template misplaced empty form
  [+] BO : Handler invoice date generation button
 2013-07-26 18:55:18 +02:00
Kevin Granger 9f9c0ef416 [+] BO Orders 2013-07-26 18:54:28 +02:00
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