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
Vincent Augagneur
3814a8c735 [-] BO : fixed bug #PSCFV-9809 - carrier wizard tab access fix 2013-07-30 10:40:13 +02:00
Kevin Granger
8bafaceb40 [+] BO Customers > Addresses // Helper > Required Fields 2013-07-30 10:35:47 +02:00
Kevin Granger
b95478d529 [+] BO Customers Groups WIP 2013-07-29 20:39:52 +02:00
Kevin Granger
d95a519ace [+] BO Customers WIP 2013-07-29 19:18:02 +02:00
gRoussac
918ceb3ed5 // norms 2013-07-29 19:15:47 +02:00
Gregory Roussac
a23a576d47 Merge pull request #611 from 202-ecommerce/fix_translation 
[-] BO : Fix while of translation, to find in folder if translation exists
 2013-07-29 10:07:50 -07:00
Guillaume DELOINCE
8ddd592da1 [-] BO : Fix while of translation, to find in folder if translation exists 2013-07-29 19:00:57 +02:00
Vincent Augagneur
0e6f1598f7 [-] BO : fixed some bug on carrier wizard - added tabindex on input - new default carrier img 2013-07-29 18:36:50 +02:00
Kevin Granger
613c9b66e5 // fix carriers 2013-07-29 16:51:03 +02:00
Kevin Granger
483dbd7b53 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
# By Sarah Lorenzini (1) and sLorenzini (1)
# Via Sarah Lorenzini
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop:
  // update shipping tab
  // update shipping tab

Conflicts:
	admin-dev/themes/default/template/helpers/options/options.tpl
 2013-07-29 16:21:31 +02:00
Kevin Granger
ae225dce4c // WIP customer 2013-07-29 16:16:10 +02:00
sLorenzini
243834ee17 // update shipping tab 2013-07-29 14:14:00 +02:00
PrestaEdit
c1b0d32d32 [-] Carrier Wizard: fix 2013-07-29 13:57:31 +02:00
Captain-FLAM
0de4642d09 [*] BO : Proposition : IMPROVEMENT Admin Modules Positions 
You can see in action over there :
http://www.youtube.com/watch?v=e7KXuCU3RIM
 2013-07-29 12:35:02 +01:00
PhpMadman
1dd7d6afcc [-] BO : Fixed incorrect error message in a_s_m 
[+] BO : Added support for Depends On Stock
[-] BO : Added missing check if warehouse is set in csv
 2013-07-29 11:54:15 +02:00
PhpMadman
909948bfb9 [+] BO : Added support to set A warehouse by id 
[*] BO : Import will clear any warehouses allready set
 2013-07-29 10:27:31 +02:00
PhpMadman
4857c8c788 [+] BO: Added support for Advanced Stock Management 
[*] BO: Fixed typos
[*] BO: Auto remove product from DependsOnStock of Advanced Stock Management is disabled
[*] BO: Added id to warehouse controller
 2013-07-29 09:35:39 +02:00
PrestaEdit
c089b1e69e [-] Carrier Wizard: Remove fatal error "Call-time pass-by-reference" 2013-07-27 15:23:48 +02:00
Rémi Gaillard
a786606c9a // small fix on carrierwizard 2013-07-26 20:27:25 +02:00
Rémi Gaillard
77f4eec64f // Fix group association on carrierwizard 2013-07-26 19:38:06 +02:00
Jérôme Nadaud
06834e404d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-07-26 19:00:00 +02:00
Jérôme Nadaud
52ff61719b [+] BO : Remove invoices button toolbar 2013-07-26 18:59:39 +02:00
Kevin Granger
94de4d3d2f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
# By Jérôme Nadaud
# Via Jérôme Nadaud
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop:
  [-] BO : Order template misplaced empty form
  [+] BO : Handler invoice date generation button
 2013-07-26 18:55:18 +02:00
Kevin Granger
9f9c0ef416 [+] BO Orders 2013-07-26 18:54:28 +02:00
Rémi Gaillard
c0cf92cbdf [+] BO: Add a wizard to create and edit your carriers 2013-07-26 18:27:21 +02:00
Jérôme Nadaud
f3ca8ec15b [+] BO : Handler invoice date generation button 2013-07-26 17:23:15 +02:00
Kevin Granger
1a2b78b00f [+] BO Invoices 2013-07-26 15:34:11 +02:00
Jérôme Nadaud
3287ff5300 [+] BO : Product attachment "For" 2013-07-26 15:32:04 +02:00
Madman
1895ec8731 // Begining of Support for Advanved Stock Managment in CSV Import 2013-07-26 15:30:54 +02:00
Jérôme Nadaud
5c52ba31e9 [+] BO : Products quantities "For" and small template fix 2013-07-26 15:03:29 +02:00
sLorenzini
3c035324f4 // update order tab 2013-07-26 12:15:23 +02:00
Jérôme Nadaud
5d2e19fe3b [-] BO : FixBug Impossible to remove available date from product attribute 2013-07-26 12:14:00 +02:00
Kevin Granger
8b7c29dd18 [+] BO Scenes - Tags - Attachments 2013-07-26 11:12:50 +02:00
Damien Metzger
e80364984a // Fixed manufacturers addresses export 2013-07-26 10:36:41 +02:00
Kevin Granger
72b046d5f0 [+] BO Manufacturers 2013-07-26 10:21:23 +02:00
Kevin Granger
9e5bbac559 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
# By Jérôme Nadaud (4) and sLorenzini (1)
# Via Jérôme Nadaud
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop:
  [-] BO : BugFix Cancel modification button error
  [+] BO : Product "For" and combination button
  // update order tab
  [+] BO : Product "For"
  [+] BO : Product "For" and new carriers select list

Conflicts:
	admin-dev/themes/default/css/admin-theme.css
 2013-07-25 19:21:59 +02:00
Kevin Granger
9308c5c527 no message 2013-07-25 19:18:54 +02:00
Gregory Roussac
ceee011d5c Merge pull request #555 from piotrmocko/patch-1 
[- ] BO : Do not limit feature values on a  getList
 2013-07-25 09:20:53 -07:00
Jérôme Nadaud
cc1fddd52d [+] BO : Product "For" and new carriers select list 2013-07-25 16:24:43 +02:00
Kevin Granger
488cf0919a // BO attributes 2013-07-25 15:51:41 +02:00
Jérôme Nadaud
3f83dd9222 [+] BO : Product "For" 2013-07-25 14:33:14 +02:00
Jérôme Nadaud
d6b38635f9 [+] BO : Product "For" 2013-07-25 14:02:36 +02:00
Gregory Roussac
56aa91a3fa Merge pull request #296 from samy-r/dev-address-update 
[*] CORE : Add mobile phone in default adress layout update
 2013-07-25 03:05:36 -07:00
Kevin Granger
b5ae321ea5 // fix input + switch 2013-07-25 11:55:27 +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
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
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
Kevin Granger
f7d1743c8a // fix tags in helper 2013-07-24 11:42:47 +02:00
Francois Gaillard
2e3f13db95 [-] Controller : AdminTranslationsController - Fixed bug with simple & double quotes 2013-07-23 18:47:35 +02:00