d88857610d
// Toolbar modifs
2013-10-08 18:42:07 +02:00
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
ff16de05de
// fix, design and fun !
2013-08-06 19:06:56 +02:00
9debffe910
// update shipping tab
2013-07-31 15:06:59 +02:00
b528b7b6fc
// update shipping tab
2013-07-29 16:13:07 +02:00
243834ee17
// update shipping tab
2013-07-29 14:14:00 +02:00
c0cf92cbdf
[+] BO: Add a wizard to create and edit your carriers
2013-07-26 18:27:21 +02:00
9e342d5183
[-] BO : fixed bug #PSCFV-7575 - BO shipping price by zones ang weigth error js
2013-02-11 10:30:32 +01:00
57e883d6b2
[-] BO : fixed bug #PSCFV-7575 - BO shipping price by zones ang weigth error js
2013-02-11 10:30:32 +01:00
385c593129
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
714a5e08cc
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
064ba453e6
// Welcome 2013
2013-01-04 11:19:03 +01:00
8baf87eef5
// Welcome 2013
2013-01-04 11:19:03 +01:00
768fcf8f84
Merge pull request #75 from @sebastienhouzet
2012-12-12 11:24:56 +01:00
bfff958b1f
Merge pull request #75 from @sebastienhouzet
2012-12-12 11:24:56 +01:00
1127bbbfcb
Merge pull request #15 from axome/shipping_cost_admin
...
//6 decimals for shipping cost in admin tab
2012-11-29 05:40:56 -08:00
86f720398a
Merge pull request #15 from axome/shipping_cost_admin
...
//6 decimals for shipping cost in admin tab
2012-11-29 05:40:56 -08:00
57388850a3
When you set the "Fees by carrier, geographical zone, and ranges" (in the "Shipping" tab), the prices are tax excluded and displayed with 2 decimals, but the price is saved with 6 decimals in the database.
...
So when you define a shipping fee with 6 decimals it is saved without problem, but when you come back to edit the values, they are rounded (2 decimals) so you are forced to edit the values again, or else saving will replace the previous 6-decimals values with the displayed 2-decimals values.
Having 6 decimals displayed in the BO (not rounded, raw value from the database) is necessary because these values are tax excluded and are displayed tax included on the FO.
2012-11-22 14:14:02 +01:00
034b26f82d
When you set the "Fees by carrier, geographical zone, and ranges" (in the "Shipping" tab), the prices are tax excluded and displayed with 2 decimals, but the price is saved with 6 decimals in the database.
...
So when you define a shipping fee with 6 decimals it is saved without problem, but when you come back to edit the values, they are rounded (2 decimals) so you are forced to edit the values again, or else saving will replace the previous 6-decimals values with the displayed 2-decimals values.
Having 6 decimals displayed in the BO (not rounded, raw value from the database) is necessary because these values are tax excluded and are displayed tax included on the FO.
2012-11-22 14:14:02 +01:00
a1db83ef41
//remove svn keyword @version Release: $
2012-11-22 11:57:40 +01:00
be946319be
//remove svn keyword @version Release: $
2012-11-22 11:57:40 +01:00
946dd2caf7
// Revert Revision 17891 : #PSCFV-5017 : update bad licenses in all files
2012-10-17 10:13:43 +00:00
ece74e27c2
// Revert Revision 17891 : #PSCFV-5017 : update bad licenses in all files
2012-10-17 10:13:43 +00:00
04fc63c2b6
// #PSCFV-5017 : update bad licenses in all files
2012-10-17 09:35:11 +00:00
07ca3c5258
// #PSCFV-5017 : update bad licenses in all files
2012-10-17 09:35:11 +00:00
779cf350af
// Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files
2012-10-17 09:29:43 +00:00
6588f9514c
// Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files
2012-10-17 09:29:43 +00:00
046b51ab99
// #PSCFV-5017 : update bad licenses in all files
2012-10-17 06:18:59 +00:00
398d345362
// #PSCFV-5017 : update bad licenses in all files
2012-10-17 06:18:59 +00:00
9239de5dac
[-] BO : fix #PSCFV-4933 : add recursively index.php file
2012-10-12 12:17:04 +00:00
f6297b081d
[-] BO : fix #PSCFV-4933 : add recursively index.php file
2012-10-12 12:17:04 +00:00
14e6929565
// Welcome 2012²
2012-02-23 16:33:10 +00:00
1dc629a949
// Welcome 2012²
2012-02-23 16:33:10 +00:00
1c288bf01d
// Welcome 2012
2012-02-22 09:28:22 +00:00
677a4e485c
// Welcome 2012
2012-02-22 09:28:22 +00:00
922d7356ec
// fixed bug #PSTEST-578
2012-02-08 14:17:12 +00:00
bdbcf97953
// fixed bug #PSTEST-578
2012-02-08 14:17:12 +00:00
62a71b2be0
[-] BO : BugFix : #PSTEST-350 : "tax excluded" moved near the prices in AdminShipping (fees)
2012-01-11 16:38:34 +00:00
aaf49ca3fd
[-] BO : BugFix : #PSTEST-350 : "tax excluded" moved near the prices in AdminShipping (fees)
2012-01-11 16:38:34 +00:00
4b1eba644c
[-] BO : fix #PSTEST-388
2012-01-10 09:40:24 +00:00
7ef14d3a1d
[-] BO : fix #PSTEST-388
2012-01-10 09:40:24 +00:00
e2dbac517f
// Move controller templates to subfolder controllers/
2012-01-09 17:23:42 +00:00
b1e9cedf42
// Move controller templates to subfolder controllers/
2012-01-09 17:23:42 +00:00
Jerome Nadaud