dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,057 Commits 9 Branches 19 Tags
bootstrap
Commit Graph

407 Commits

Author SHA1 Message Date
Jerome Nadaud
068da6f87c [+] BO : Page header toolbar 2013-08-28 09:24:16 +02:00
Kevin Granger
3005ca39f2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/modules_positions/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
	admin-dev/themes/default/template/controllers/products/shipping.tpl
	admin-dev/themes/default/template/controllers/shipping/content.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminCategoriesController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminModulesPositionsController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminStockInstantStateController.php
	css/admin.css
	js/admin-products.js
	js/admin.js
 2013-08-21 09:14:10 +02:00
Gregory Roussac
3213b5dffb Merge pull request #635 from cippest/development 
[-] BO : missing order lang in Mail::l for in_transit email
 2013-08-06 11:23:19 -07:00
cippest
f8efd7a329 [-] BO : Fix send e-mails updating tracking number 
Hi,
We've fixed some bugs parameters about the Send function of Mail class in the AdminOrdersController.php.

Regards,
Massimo.
 2013-08-06 19:51:16 +02:00
Kevin Granger
9f9c0ef416 [+] BO Orders 2013-07-26 18:54:28 +02:00
Kevin Granger
77f80b1774 // Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	.gitignore
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/page.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/orders/_documents.tpl
	admin-dev/themes/default/template/controllers/orders/_shipping.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/restrictions.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/modules_list/list.tpl
	classes/Tools.php
	controllers/admin/AdminCartRulesController.php
	controllers/admin/AdminProductsController.php
	css/admin.css
 2013-07-24 17:01:23 +02:00
sLorenzini
8b33ac5aca // quantities product modified + line bootsrap added in order, categories and attributes group controllers 2013-07-10 12:21:22 +02:00
Damien Metzger
56aab3c676 // Fixed references to a "conversion rate" that was in fact the "exchange rate" 2013-07-01 12:14:50 +02:00
gRoussac
f824b537cf [-] BO : Fix bug #PSCFV-8619 update order weight when modifying products 2013-07-01 11:32:09 +02:00
Damien Metzger
0a7428c8be [-] BO : allow partial use for credit slip vouchers #PSCFV-9539 2013-06-21 09:45:49 +02:00
gRoussac
21d04cb423 [-] BO : Fix bug #PSCFV-9264 bad cancel qty when refund / return 2013-06-20 18:21:55 +02:00
Rémi Gaillard
68540f1887 [-] BO: Stock should not appears on product listing when stock management is disabled #PSCFV-8207 2013-06-19 11:35:24 +02:00
Damien Metzger
c53d2d04ce [-] BO : fixed parsing of discount value in AdminOrders #PSCFV-9481 2013-06-17 11:16:16 +02:00
Rémi Gaillard
b3a823f876 [-] BO: Fix #PSCFV-7763 Re-inject quantities after deleting a product from a order 2013-06-12 17:08:00 +02:00
Damien Metzger
52bffe6917 // Fixed warning 2013-05-07 17:27:16 +02:00
Rémi Gaillard
41786587ba [-] BO: Fix #PSCFV-8179 shop domain used in emails sometimes was for the wrong shop 2013-05-02 18:42:01 +02:00
Vincent Augagneur
218a76c443 Merge pull request #310 from Patanock/patch-5 
[*] BO: Customer and carrier need to be send to the hook
 2013-04-29 01:31:16 -07:00
gRoussac
01bcb38522 [-] BO : Fix bug #PSCFV-8620 returns with customized product 2013-04-09 10:37:15 +02:00
Francois Gaillard
7f3678a776 Merge branch 'release' into development 2013-03-14 16:39:47 +01:00
fram
77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
Patanock
13353fd5f2 Update AdminOrdersController.php 2013-03-07 10:47:12 +01:00
Patanock
4c2752ab53 Update AdminOrdersController.php 2013-03-07 10:42:27 +01:00
gRoussac
b8a14a8b1b [-] BO : Fix bug #PSCFV-7939 no quantity warning on orders when stock management not enable 2013-03-04 15:07:03 +01:00
Rémi Gaillard
7c26ea32e7 [-] BO: Fix #PSCFV-7851 - shop logo and name should depend of the order shop and from the context 2013-02-18 15:43:37 +01:00
Rémi Gaillard
dd6a93d6f2 [-] BO: Fix #PSCFV-7851 - shop logo and name should depend of the order shop and from the context 2013-02-18 15:43:37 +01:00
Rémi Gaillard
2c2f4170bb // something was missing 2013-02-13 16:17:10 +01:00
Rémi Gaillard
67c0f98366 // something was missing 2013-02-13 16:17:10 +01:00
Rémi Gaillard
1dbf4855cc [-] BO: Fix id_shop for configuration variables in global context for orders 2013-02-04 16:05:01 +01:00
Rémi Gaillard
44d26d5804 [-] BO: Fix id_shop for configuration variables in global context for orders 2013-02-04 16:05:01 +01:00
Rémi Gaillard
7bd44ca1b1 [-] BO: get the invoice prefix from the right shop 2013-02-04 15:11:29 +01:00
Rémi Gaillard
d72ce0d892 [-] BO: get the invoice prefix from the right shop 2013-02-04 15:11:29 +01:00
Rémi Gaillard
d6bd352844 // Fix PHP Notice 2013-02-04 14:46:55 +01:00
Rémi Gaillard
a07d1b06fe // Fix PHP Notice 2013-02-04 14:46:55 +01:00
Gregory Roussac
15c64e9f81 [-] BO : Fiw warning on $current_order_state 2013-01-29 12:21:33 +01:00
Gregory Roussac
b51bf1af25 [-] BO : Fiw warning on $current_order_state 2013-01-29 12:21:33 +01:00
Rémi Gaillard
67d4f21dfa [-] BO: Fix #PSCFV-6367 don't display the payment modules on BackOffice orders if they are disabled 2013-01-18 17:01:47 +01:00
Rémi Gaillard
0d058a5d50 [-] BO: Fix #PSCFV-6367 don't display the payment modules on BackOffice orders if they are disabled 2013-01-18 17:01:47 +01:00
Damien Metzger
9f99ec01b5 [-] FO : fixed shipping number in e-mail #PSCFV-6584 2013-01-15 13:56:39 +01:00
Damien Metzger
49f8b7c7af [-] FO : fixed shipping number in e-mail #PSCFV-6584 2013-01-15 13:56:39 +01:00
djfm
385c593129 //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
djfm
714a5e08cc //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
François Gaillard
064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
Damien Metzger
16b726349f // And another 2012-12-12 14:33:54 +01:00
Damien Metzger
6180cb1fa9 // And another 2012-12-12 14:33:54 +01:00
Damien Metzger
490213a550 // Fixed duplicated lines #PSCFV-6109 2012-12-12 14:31:46 +01:00
Damien Metzger
6532868e1d // Fixed duplicated lines #PSCFV-6109 2012-12-12 14:31:46 +01:00
vAugagneur
a1db83ef41 //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
rGaillard
8c46e7cdf7 [-] BO: Fix #PSCFV-5344 stock reinjecting values on returning products with advanced stock management 2012-11-14 17:53:44 +00:00