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

212 Commits

Author SHA1 Message Date
Kevin Granger
2c7ed00b39 // pagination 2013-10-09 17:21:53 +02:00
Kevin Granger
daa1cc47db Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-09 09:43:10 +02:00
Kevin Granger
b4459e39a4 // Orders WIP 2013-10-09 09:43:04 +02:00
Jerome Nadaud
57c34488ff // Orders refund buttons 2013-10-09 09:41:51 +02:00
Kevin Granger
797a6c121a // Orders WIP 2013-10-08 18:53:41 +02:00
Jerome Nadaud
b9cfc24922 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-08 18:42:19 +02:00
Jerome Nadaud
d88857610d // Toolbar modifs 2013-10-08 18:42:07 +02:00
Kevin Granger
3e6f425bd4 // Orders WIP 2013-10-08 12:26:48 +02:00
Kevin Granger
3e2d2e2afc // fix Orders 2013-10-07 18:54:28 +02:00
Kevin Granger
ba7d9eec21 // fix Orders 2013-10-07 11:11:21 +02:00
Kevin Granger
c2ea0be841 // orders WIP 2013-10-04 19:13:02 +02:00
Kevin Granger
bb7dd876af // orders WIP 2013-10-03 21:04:35 +02:00
Kevin Granger
65fc1fea63 // orders WIP 2013-10-01 18:50:41 +02:00
Kevin Granger
8ed77030aa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	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/list.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.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/products/suppliers.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminGroupsController.php
	controllers/admin/AdminManufacturersController.php
 2013-09-30 11:01:23 +02:00
Kevin Granger
c93eb9f40a // orders WIP 2013-09-20 19:11:08 +02:00
Kevin Granger
eeb3b540e2 // orders + css highlight / fixed-width 2013-09-20 14:42:09 +02:00
Kevin Granger
724ab12122 // orders cleanup 2013-09-19 20:12:05 +02:00
Kevin Granger
650001024a // orders cleanup 2013-09-19 16:55:06 +02:00
Kevin Granger
be8f728b2a // orders 2013-09-19 12:09:25 +02:00
Rémi Gaillard
47c5f400ee // Add gender on order view 2013-09-17 16:30:47 +02:00
Damien Metzger
f7855f2a3a // Always more KPIs 2013-09-17 12:47:13 +02:00
Damien Metzger
c0c4af988f // Added net profits / visitor as a KPI 2013-09-17 10:47:54 +02:00
Damien Metzger
8934f9c7ed [*] BO : Connected the first KPIs to real data 2013-09-16 18:40:34 +02:00
Kevin Granger
7f6255156e // BO orders 2013-09-16 15:20:30 +02:00
Kevin Granger
70b39019bf // kpi orders 2013-09-16 11:45:02 +02:00
Kevin Granger
c7ec33f062 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/home/content.tpl
	admin-dev/themes/default/template/controllers/localization/content.tpl
	admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
	admin-dev/themes/default/template/controllers/orders/_new_product.tpl
	admin-dev/themes/default/template/controllers/orders/_product_line.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
	admin-dev/themes/default/template/footer.tpl
	controllers/admin/AdminCarrierWizardController.php
	controllers/admin/AdminCarriersController.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminLocalizationController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminSuppliersController.php
	css/admin.css
	js/admin-products.js
	js/admin_carrier_wizard.js
	translations/fr.gzip
 2013-09-13 11:41:14 +02:00
gRoussac
dfdbe39ee3 [-] BO : Small changes when creating vouchers in back office orders 2013-09-11 16:28:11 +02:00
Kevin Granger
f8f2c99d28 // Modules page + Warning 2013-08-26 11:38:10 +02:00
Kevin Granger
44655ecdef // breaking things 2013-08-20 16:38:31 +02:00
Jerome Nadaud
155fd516ba // Misplaced if 2013-08-19 14:41:08 +02:00
Rémi Gaillard
24ac8582bf [*] BO: Warehouse name is now displayed on each product line orders 2013-08-14 15:02:30 +02:00
Kevin Granger
ff16de05de // fix, design and fun ! 2013-08-06 19:06:56 +02:00
Nils-Helge Garli Hegvik
b362c808dc Fixed fieldset issue when customer is a guest 2013-07-31 12:25:35 +02:00
sLorenzini
2ac6ada03d // update order tab 2013-07-29 11:01:48 +02:00
Jérôme Nadaud
0ef7578f26 [-] BO : Order template misplaced empty form 2013-07-26 18:43:40 +02:00
sLorenzini
c1e4b812f9 // update "create order" tab 2013-07-26 16:33:52 +02:00
sLorenzini
3c035324f4 // update order tab 2013-07-26 12:15:23 +02:00
sLorenzini
832f5cf0dd // update order tab 2013-07-25 16:53:18 +02:00
sLorenzini
312ad4eb37 // update order tab 2013-07-25 09:41:31 +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
5b804d3628 // update order tab 2013-07-23 17:54:47 +02:00
sLorenzini
f194aec8c5 // update module and orders tab 2013-07-22 17:56:24 +02:00
djfm
3c59c5e779 //replaced all js='1' with js=1 so that the translation regexes don't fail 2013-07-22 09:34:18 +00:00
sLorenzini
66f64c1baa // update order tab 2013-07-15 17:58:23 +02:00
Gregory Roussac
5b6c6a3ce9 Merge pull request #561 from BigZ/patch-5 
[-] PDF : Get correct prefix for invoices
 2013-07-12 08:44:24 -07:00
BigZ
f1049c021a get correct prefix for invoices 
One must use the shop id when getting invoices prefix
 2013-07-12 03:43:03 +02:00
BigZ
bd432641a0 update documents listing to display proper prefix 
In order details, generic prefix was displayed in right column instead of shop specific prefix
 2013-07-12 02:32:52 +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
gRoussac
349a10e2a9 // fix warnings 2013-06-28 17:58:04 +02:00