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

85 Commits

Author SHA1 Message Date
Kevin Granger
889a2006ec Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/customer_threads/message.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/favorites.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
	admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/associations.tpl
	admin-dev/themes/default/template/controllers/products/combinations.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	classes/ProductSale.php
	classes/helper/HelperList.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminCustomersController.php
	controllers/admin/AdminMetaController.php
	controllers/admin/AdminModulesController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminProductsController.php
	controllers/front/ParentOrderController.php
	install-dev/theme/views/welcome.phtml
	modules/blocknewproducts/blocknewproducts.php
	modules/blocktopmenu/blocktopmenu.php
	modules/importerosc/importerosc.php
	modules/mailalerts/mailalerts.php
	modules/shopimporter/shopimporter.php
	modules/statsstock/statsstock.php
	themes/default/css/product_list.css
 2013-11-04 14:43:01 +01:00
Kevin Granger
67dc7aac04 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/filters.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	classes/Category.php
	classes/controller/AdminController.php
	controllers/admin/AdminAttributesGroupsController.php
	controllers/admin/AdminFeaturesController.php
	controllers/admin/AdminImportController.php
	controllers/admin/AdminLogsController.php
	install-dev/install_version.php
	install-dev/langs/ru/data/tab.xml
	js/admin_carrier_wizard.js
	modules/loyalty/loyalty.php
 2013-10-14 12:21:29 +02:00
djfm
5e407db21e [*] LO : Fixed a few bugs with currency formats in Back-Office orders 2013-10-14 09:30:45 +00:00
Jerome Nadaud
0f9c81a683 [-] BO : FixBug #PSCFV-10671 - remove htmlentities on customer message 2013-10-11 17:29:44 +02:00
Jerome Nadaud
d88857610d // Toolbar modifs 2013-10-08 18:42:07 +02:00
Damien Metzger
a876b13c1c [-] BO : fixed currency format on order creation 2013-10-02 12:10:54 +02:00
Damien Metzger
d26336aa77 // Copy KPIs from customer to cart 2013-09-24 15:54:45 +02:00
Jerome Nadaud
74a262f2ed // Shopping carts bootsrap design 2013-09-20 10:29:32 +02:00
Jerome Nadaud
4413d04525 // Customer fix 2013-09-18 17:05:16 +02:00
Jerome Nadaud
967fc98693 [+] BO : Page header toolbar 2013-08-28 09:37:49 +02:00
Kevin Granger
e4878ba393 // I'm not sure as I've never had a look at how that works before ;) 2013-07-31 21:17:03 +02:00
Damien Metzger
aefc22bb10 [-] BO : fixed quote issue with magic quote in customization in adminorders #PSCFV-9311 2013-06-17 11:40:35 +02:00
Rémi Gaillard
dc7f1ceddf [-] BO: Fix #PSCFV-8957 order creation when id_cart=0 is present in database but should normally not happen 2013-04-29 13:47:46 +02:00
Rémi Gaillard
96ee6386c1 [-] BO: Fix admin carts currency prices on view and listing 2013-04-16 14:14:04 +02:00
fram
ed947bc123 // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
Rémi Gaillard
9dcb75e572 [*] BO: you can now export listing of some tabs in CSV 2013-02-13 16:15:37 +01:00
Rémi Gaillard
d2ba246a08 [-] BO: Don't display delete icon for order carts 2013-02-05 15:28:09 +01:00
Rémi Gaillard
e5e62ba00b [-] BO: Fix #PSCFV-6616 id_shop should be loaded from cart when no order is created on Admin Carts 2013-01-15 19:31:21 +01:00
Rémi Gaillard
507309ddf5 [-] BO: Fix #PSCFV-6386 recyclable should be init to 0 on BO orders 2013-01-04 15:06:07 +01:00
Rémi Gaillard
3fbd7dc55c [-] BO: Fix #PSCFV-6120 display of shipping price on BO order summary detail with freeshipping 2013-01-04 14:51:01 +01:00
François Gaillard
064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
Rémi Gaillard
df405abfe9 [-] BO: Fix #PSCFV-6118 display of product image for git on BackOffice orders 2013-01-03 11:38:39 +01:00
Rémi Gaillard
35013b82fe [-] BO: Fix #PSCFV-6172 don't htmlentities the cart rule name && increase size of name order_cart_rule field 2012-12-17 14:42:24 +01:00
Rémi Gaillard
4e75a1c406 [-] BO: Fix product image link for admin orders #PSCFV-5163 2012-11-27 11:55:58 +01:00
vAugagneur
a1db83ef41 //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
lLefevre
779cf350af // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
046b51ab99 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
rGaillard
f682e2885b [*] BO: Improve customization management on BackOffice orders #PSCFV-4062 2012-10-15 13:38:19 +00:00
rGaillard
f0bf2da7e3 // Fix #PSCFV-4468 2012-09-28 13:08:48 +00:00
dMetzger
eee9e6f40d // Back office optimization begun (memory & SQL) and will resume tomorrow 2012-09-26 17:52:27 +00:00
rGaillard
4621f814c3 // Fix PSCFV-3840 2012-08-31 14:52:54 +00:00
rGaillard
24f646dfb9 // Small fix 2012-08-31 08:56:14 +00:00
dMetzger
b8279c429e // #PSCFV-3843 2012-08-31 07:29:32 +00:00
dMetzger
fa8b1eb0b7 // Current cart should not be displayed in the old cart in the order creation (BO) #PSCFV-3566 2012-08-17 13:55:33 +00:00
dMetzger
a1d1158af1 // small bug fix on BO orders 2012-08-14 09:15:50 +00:00
rGaillard
e944625f0e // Small fix 2012-08-01 12:11:48 +00:00
rGaillard
4c4cb0bc93 [-] BO: Fix PSCFV-3345 display of prices with a currency different than default on backoffice orders 2012-07-30 15:24:29 +00:00
rGaillard
6d0974f2b2 // Small fix 2012-07-19 15:28:17 +00:00
rGaillard
668cc4c02e // Fix various bugs with customized products in backoffice order 2012-07-19 12:26:04 +00:00
mDeflotte
e650482c03 [-] BO : #PSCFV-3064 - Fix bug on creating order using a cart 2012-07-11 13:33:23 +00:00
rGaillard
49757f537b // Fix freeshipping on backoffice Order 2012-06-07 14:56:48 +00:00
vAugagneur
7661ea3869 //remove unused variable 2012-06-05 09:24:15 +00:00
rGaillard
43413ebd50 [-] BO: Add feedback on backoffice order when the minimal quantity is not reached 2012-05-25 14:00:16 +00:00
rGaillard
44ca1199f6 [*] BO: Add free shipping to BackOffice Order 2012-05-21 17:11:00 +00:00
aFolletete
4ccd85f553 [-] BO : fixed bug #PSCFV-1296 - Can't add a product in order (BO) 
// Fix backward compatibility issue with updateQty method
 2012-05-10 09:29:46 +00:00
rGaillard
dd35b0b29e [+] BO: The customizable products are now usable in the BackOffice order 2012-05-09 14:04:13 +00:00
mDeflotte
da3dedaf75 [-] Project : #PSFV-820 - Cartrules are now reapplied each time we add/remove a product on/from the cart 2012-04-19 09:39:14 +00:00
rMalie
49869aaaaf // MERGE product_multistore branch : product fields are now editable per shop 2012-04-17 13:32:12 +00:00
rGaillard
cc75192730 // Fix default carrier selection on backoffice order 2012-04-16 14:03:07 +00:00
tDidierjean
e9c8678cd6 // Helpers : remove param 'float' 2012-04-10 13:07:19 +00:00