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

125 Commits

Author SHA1 Message Date
Jerome Nadaud
1fd6540574 [+] BO : Page header toolbar 2013-08-28 14:14:04 +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
jeromenadaud
8be06bba2d [-] BO : FixBug Multiple list pagination error. 2013-08-05 18:22:30 +02:00
Sarah Lorenzini
6533ee4bec // update stock tab 2013-08-05 12:13:43 +02:00
Jérôme Nadaud
cfeaf0fa36 // norm 2013-07-25 08:51:22 +02:00
Jérôme Nadaud
ae7f47a275 [-] BO : FixBug #PSCFV-9042 Supply orders now accept 0 value to automatically load products 2013-07-24 18:52:47 +02:00
Jérôme Nadaud
08aa1f90c6 [-] BO : FixBug #PSCFV-9839 Update product warehouse on suply order - thanks @O'Donnell 2013-07-24 16:40:59 +02:00
vAugagneur
3328c7a653 [-] BO : remove deprecated parameter when call Tools::displayDate() 2013-05-20 16:55:52 +02:00
fram
77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
djfm
714a5e08cc //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
lLefevre
6588f9514c // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
398d345362 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
lLefevre
2a093e3655 [-] BO : fix #PSCFV-4238 and fix #PSCFV-4258 2012-09-21 14:28:58 +00:00
rGaillard
346dac91b2 [-] BO: Fix #PSCFV-3618 toolbar title on changing state of supply orders 2012-08-28 13:38:33 +00:00
rGaillard
768e45b584 [-] BO: Fix #PSCFV-3618 toolbar title on changing state of supply orders 2012-08-28 13:35:36 +00:00
rGaillard
8a17cd16ec // Disable content of stocks tab if advanced stock management is not activated 2012-08-07 13:08:37 +00:00
lLefevre
12c69a6dc6 [*] TR : update English translations key for Back Office 2012-07-12 10:04:56 +00:00
rMalie
e580832934 // Use protected instead of private for classes we can override #PSCFV-1976 2012-04-26 08:55:55 +00:00
tDidierjean
ad1d630fd6 // Rename fieldsDisplay to fields_list part3 (timeout) 2012-03-29 16:31:01 +00:00
bMancone
1b978feccb // displayInformation() added 2012-03-26 16:29:13 +00:00
rMalie
6cf9ef197d // Fix problems with display of PDF with multishop #PSFV-643 admin/pdf.php is now deprecated 2012-03-26 16:00:05 +00:00
bMancone
7c41d04d15 // Fixed postProcess() in SupplyOrdersController 2012-03-22 15:31:16 +00:00
bMancone
3803c3298d // Fixed #PSTEST-1074 2012-03-22 14:21:57 +00:00
lLefevre
c21bef2acf // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
bMancone
40b5ec330f // Fixed #PSTEST-885 2012-03-07 09:09:23 +00:00
bMancone
3aef2ec94b // Improved filters 2012-03-06 13:35:05 +00:00
tDidierjean
e462d968f0 // rename $toolbar_fix to $toolbar_scroll part2 2012-02-28 17:39:40 +00:00
bMancone
c27d2b0b62 // Improved listing 2012-02-28 14:32:35 +00:00
bMancone
499b5a24f5 // Fixed merge.. 2012-02-28 13:20:24 +00:00
bMancone
362258ede6 // Fixed revision 13573 2012-02-28 13:13:47 +00:00
rMalie
ffbb4cd3e2 // Fix multishop context in BO 2012-02-27 17:14:33 +00:00
bMancone
faa9448823 // Fixed Supply Orders: prices are now correctly updated 2012-02-27 16:49:08 +00:00
bMancone
f7e80e84b7 // Improved Supply Orders threshold when creating a template 2012-02-27 16:16:23 +00:00
bMancone
a93a86b51e // Improved Supply Orders threshold when creating a template 2012-02-27 16:15:50 +00:00
rMalie
d76bc47f26 // Fix multishop_context 2012-02-24 10:38:24 +00:00
rMalie
1dc629a949 // Welcome 2012² 2012-02-23 16:33:10 +00:00
bMancone
2c45847fa7 // Improved SupplyOrders : states & history of reception 2012-02-22 16:49:54 +00:00
rMalie
cc72ac8a9b // Remove $display_multishop_toolbar and add instead $multishop_context to manage shop context per admin controller 2012-02-22 14:25:28 +00:00
mMarinetti
677a4e485c // Welcome 2012 2012-02-22 09:28:22 +00:00
bMancone
ba19ed11cb // Fixed Supply orders : bulk action / autoload products 2012-02-21 13:48:49 +00:00
bMancone
8030481a2f // Updated Shop toolbar for advanced stock management controllers 2012-02-15 14:16:00 +00:00
bMancone
dae38fb4a3 // Fixed AdminSupplyOrdersController 2012-02-08 13:44:57 +00:00
bMancone
d30a0abadd // Fixed Supply Orders 2012-02-07 14:59:56 +00:00
bMancone
b63c04a22b // Update supply order templates 2012-02-07 13:25:12 +00:00
tDidierjean
e73990a61c // Rename template/helper to template/helpers 2012-02-06 16:35:49 +00:00
bMancone
65b77f5e1f // Improved Supply Order States 2012-02-06 14:11:29 +00:00
tDidierjean
fccb65f6d3 // Replace public by protected in override methods 2012-02-06 13:41:51 +00:00
bMancone
fcf60410a4 // Fixed #PSTEST-657 2012-02-06 10:20:42 +00:00