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

3839 Commits

Author SHA1 Message Date
Gregory Roussac ffb62426d8 Merge pull request #516 from PrestaEdit/patch-41 
[*] BO: more than one image in HelperForm
 2013-07-17 07:44:26 -07:00
gRoussac c9d2cf8ed2 Merge branch 'translate' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-translate 
Conflicts:
	admin-dev/header.inc.php
 2013-07-17 16:31:49 +02:00
Kevin Granger 02921dc9d0 [+] Helper form WIP 2013-07-16 19:23:46 +02:00
sLorenzini 66f64c1baa // update order tab 2013-07-15 17:58:23 +02:00
gRoussac 1a056d5e33 [-] BO : Fix bug #PSCFV-9310 bad type for input in helper thankx @Piotr Moćko 2013-07-15 14:47:38 +02:00
sLorenzini 27571f4d06 //update module tab 2013-07-15 12:02:03 +02:00
sLorenzini 0c4a5bd984 // update module tab positions & payment 2013-07-15 11:55:06 +02:00
Kevin Granger b8babdadb3 // products wip 2013-07-12 19:17:51 +02:00
Damien Metzger 22b73a7339 [*] BO : upgraded cover icon management in product > images 2013-07-12 18:43:49 +02:00
Gregory Roussac 5083cd6b5e Merge pull request #466 from PrestaEdit/patch-39 
[*] BO: hook displayAdminForm / add param fieldset
 2013-07-12 08:56:42 -07:00
sLorenzini 4919d6d81a // update positions module tab 2013-07-12 17:48:07 +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
Gregory Roussac 0453698f50 Merge pull request #557 from BigZ/patch-1 
[-] BO : Update documents listing to display proper prefix
 2013-07-12 08:37:21 -07:00
Kevin Granger c12ce3dd29 // Products 2013-07-12 17:27:25 +02:00
Damien Metzger 4e0723b3cc [-] BO : fixed charts and grids in multishop #PSCFV-8978 2013-07-12 16:29:31 +02:00
sLorenzini 160857bdc3 // update css module tab 2013-07-12 14:30:44 +02: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
Kevin Granger 84c0ccbae6 // products TPL 2013-07-11 18:58:44 +02:00
Piotr Moćko 68d135b4cf Payment currency restriction incorret type of input for radio 
When payment module has currencies restrictions set to radio it still displays as checkbox because in TPL file type of input is not being changed
 2013-07-11 18:56:50 +02:00
sLorenzini 40967e6525 // update modules list tab 2013-07-11 17:27:11 +02:00
Kevin Granger f042d704d2 // field translatable + tpl products + fixs 2013-07-10 19:39:35 +02:00
sLorenzini f847c821ed // update tab modules bootsrap 2013-07-10 18:19:03 +02:00
sLorenzini 8b33ac5aca // quantities product modified + line bootsrap added in order, categories and attributes group controllers 2013-07-10 12:21:22 +02:00
Kevin Granger ec466b8c70 // Porting more product tpl 2013-07-09 19:10:56 +02:00
Kevin Granger 1f33638f32 [+] BO Wip BS -> Products + fix 2013-07-05 18:36:42 +02:00
Rémi Gaillard 12e7e3a44a [-] BO: display vat number field should not depends of the vatnumber module #PSCFV-9672 2013-07-04 17:00:27 +02:00
Kevin Granger 0ad4b44866 // Refactor helper list + fixs 2013-07-02 18:55:43 +02:00
gRoussac 9dfe65cb17 [-] BO : Fix bug #PSCFV-8666 COD module association no more deleted when restrition on other currency 2013-07-02 14:51:25 +02:00
Damien Metzger 006e8718f2 // Improved label of IETF language tag 2013-07-01 12:35:32 +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
Vincent Augagneur 38c4ea2775 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-01 10:11:31 +02:00
Vincent Augagneur d6dcf7058f [-] BO : fixed bug #PSCFV-9622 2013-07-01 10:11:13 +02:00
Kevin Granger d583cf25d2 // Bootstrap3 - Cart_rules > information.tpl + header + Font Awesome + Switch 2013-06-28 19:35:32 +02:00
gRoussac 349a10e2a9 // fix warnings 2013-06-28 17:58:04 +02:00
Damien Metzger a8d96ed0c0 // Removed useless feature 2013-06-28 16:38:08 +02:00
Vincent Augagneur dfc7456980 //replace some escape:'html' by addslashes in .tpl with javascript 2013-06-28 11:06:08 +02:00
Damien Metzger 57dd992c28 [-] FO : fixed entities issue in javascript alerts #PSCFV-9001 2013-06-26 16:22:57 +02:00
Damien Metzger 7427efdb6f // Added addlashes for some js messages 2013-06-26 15:52:40 +02:00
Vincent Augagneur 4627768092 [-] BO : fixed bug #PSCFV-7921 - Language selector (with flags) cant be translated 2013-06-25 15:51:24 +02:00
PrestaEdit f4a5dd1409 [*] BO: more than one image in HelperForm 2013-06-21 23:02:51 +03:00
Kevin Granger aa8d6d5872 //Porting more components to bootstrap 2013-06-21 17:47:05 +02:00
gRoussac 67e7487e3b [*] BO : Reselect current step in AdminOrders 2013-06-20 12:09:19 +02:00
Kevin Granger 40f03d0ba1 [+] BO: Form components 2013-06-18 21:03:43 +02:00
Damien Metzger cb95bf68a1 // Displaaaay 2013-06-18 15:58:32 +02:00
Damien Metzger fd0bc675e5 // Fixed display 2013-06-18 15:54:29 +02:00
sLorenzini c62dc3dc7a [-] BO: fixed bug button on module list 2013-06-18 15:39:48 +02:00
sLorenzini 48db491c2e [-] BO: fixed bug #PSCFV-9463 + improve some css on BO menu 2013-06-18 15:39:46 +02:00
Damien Metzger c04d2626f5 // Improved module list view 2013-06-18 15:34:58 +02:00