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

5531 Commits

Author SHA1 Message Date
indesign47
0af24ab034 [-] BO : AdminImport add adresses required fields 2013-10-04 04:31:51 +02:00
Kevin Granger
bb7dd876af // orders WIP 2013-10-03 21:04:35 +02:00
gRoussac
31f421153d [-] BO : Fix bug #PSCFV-9323 supplier_reference can be unset 2013-10-03 18:20:45 +02:00
Jerome Nadaud
874e17aa6f // remove javascript include from tpl 2013-10-03 17:55:30 +02:00
gRoussac
c75cda2429 [*] BO : AdminImport, retrieve separators and lang selected 2013-10-03 17:35:20 +02:00
gRoussac
7f32e8d187 [-] BO : Fix bug #PSCFV-10064, could not import feature in multilang, thanks @E.Bigfoot 2013-10-03 16:09:43 +02:00
gRoussac
8b2215eec5 // remove warning 2013-10-03 15:02:48 +02:00
gRoussac
0f288583ca [-] BO : Remove dead code in AdminImport 2013-10-03 14:57:03 +02:00
Jerome Nadaud
309f4333a7 // Supply orders bootstraping 2013-10-03 14:13:15 +02:00
Jerome Nadaud
43a60f1b57 [-] BO : FixBug #PSCFV-9044 - Missing state in new order, and now you can edit customer addresses 2013-10-03 11:06:08 +02:00
Rémi Gaillard
e190c8df9f // small fix on import 2013-10-03 10:33:43 +02:00
Damien Metzger
e82f0feacf // Fixed customer tab 2013-10-03 09:52:25 +02:00
Jerome Nadaud
90b203fde3 // Stock instant bootstraping 2013-10-02 18:59:34 +02:00
Jerome Nadaud
75771e0723 // Supply order bootstraping 2013-10-02 18:59:21 +02:00
Jerome Nadaud
f891f64cc4 // Stock cover bootstraping 2013-10-02 18:58:47 +02:00
gRoussac
e9a3c98af9 [-] BO : Fix bug #PSCFV-8389 duplicates is SpecificPrice table 2013-10-02 18:57:45 +02:00
Damien Metzger
3cfe76ec0c // Fixed mean age 2013-10-02 18:10:51 +02:00
gRoussac
da48cea96e [-] BO : AdminImport, tables are not truncated 2013-10-02 17:54:48 +02:00
Jerome Nadaud
dc06ef9c6d // Stock movement fix export button on select filter 2013-10-02 17:09:31 +02:00
Jerome Nadaud
f63e1065b3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-02 16:58:37 +02:00
Jerome Nadaud
04e5617d7d // Instant stock bootstraping 2013-10-02 16:58:27 +02:00
Sarah Lorenzini
791481e149 // update login page 2013-10-02 16:00:54 +02:00
gRoussac
bf6a0e0077 [-] BO : Fix bug #PSCFV-5060 could not import supplier_combinations in combinations import 2013-10-02 15:46:11 +02:00
Jerome Nadaud
acb5bf77f6 // Remove comment 2013-10-02 14:52:13 +02:00
Jerome Nadaud
3ce163449e // Advanced stock management bootstraping 2013-10-02 14:48:23 +02:00
gRoussac
c4e549db13 [-] BO : Fix #PSCFV-6482 could not import tags in deiffrent languages 2013-10-02 14:20:27 +02:00
Damien Metzger
a876b13c1c [-] BO : fixed currency format on order creation 2013-10-02 12:10:54 +02:00
Jerome Nadaud
a891c9277a // Advanced stock management details list 2013-10-02 12:09:03 +02:00
Rémi Gaillard
99f325dc3c // validation of carrierwizard 2013-10-02 11:24:08 +02:00
Jerome Nadaud
dd79b3c702 // Manufacturer bootstraping 2013-10-02 09:43:46 +02:00
Jerome Nadaud
dd60eb66cf // Fix features list filters and sort 2013-10-01 18:10:52 +02:00
Jerome Nadaud
f2849bdb70 // Remove unnecessary function 2013-10-01 17:56:17 +02:00
Jerome Nadaud
68831ffbe9 // Fix attribute group view list 2013-10-01 17:55:20 +02:00
djfm
172986a461 // changed help text 2013-10-01 15:06:33 +00:00
Kevin Granger
a866de41e7 // login form 2013-10-01 16:24:14 +02:00
Jerome Nadaud
299d1f65ec //Fix Stats bug 2013-10-01 15:15:02 +02:00
Jerome Nadaud
759a3e191a // Groups and language bootsrapify 2013-10-01 15:14:46 +02:00
Rémi Gaillard
9ad046677c [*] BO: Allow to breakdown the taxes when they are computed 2013-10-01 11:55:56 +02:00
Krystian Podemski
2b55944874 [-] BO: translation mismatch 
Here is a form to edit the values ​​in the group, we do not need here "attribute type".
 2013-10-01 08:38:04 +02:00
Jerome Nadaud
452e07ab0b [-] BO : FixBug #PSCFV-10477 - Error message not shown on delete module without permissions 2013-09-30 19:26:49 +02:00
Jerome Nadaud
b7ff8d634a [-] BO : FixBug #PSCFV-10317 - Attributes value not shown on features sorted by position. 2013-09-30 17:23:12 +02:00
Damien Metzger
a6d8ffa293 // More breadcrumbs improvements 2013-09-30 15:38:22 +02:00
gRoussac
7d764c5ce8 [-] BO : AdminImport, not matching by ref for updating 2013-09-30 11:50:51 +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
Jerome Nadaud
e040c096d1 [-] BO : Remove customers group view list link 2013-09-30 10:34:54 +02:00
Rémi Gaillard
22173355a5 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-09-30 09:59:51 +02:00
Rémi Gaillard
06b6facc2d [-] BO: Fix #PSCFV-10488 filter by employee on logs tab 2013-09-30 09:59:33 +02:00
Jerome Nadaud
e0e5f80767 [-] BO : FixBig #PSCFV-10442 - Members Cutomer Group list 2013-09-30 09:59:25 +02:00
gRoussac
813ef8bc7e [-] BO : Could not import empty linkrewrite for products and not matching refs 2013-09-27 19:22:10 +02:00
Jerome Nadaud
c2b9ff40ef [-] BO : FixBig #PSCFV-10442 - Members Cutomer Group list 2013-09-27 19:20:46 +02:00