Commit Graph

809 Commits

Author SHA1 Message Date
lLefevre
c0fae8aa5c // adding the dynamic loading of tabs in products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11124 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 11:15:17 +00:00
mDeflotte
128c5e20a6 // Removing form_shop.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11093 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 16:11:35 +00:00
mDeflotte
eb40bcf854 // Shop association area use tpl file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11082 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 15:40:02 +00:00
tDidierjean
80ecb65475 // Commit new tabs in product edition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11079 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 14:22:46 +00:00
lLefevre
dc9fb17b01 // Fix bugs in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11075 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 13:37:08 +00:00
lLefevre
901def1d12 // Fix bug button add image in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11069 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 17:42:15 +00:00
vKham
e9ee2e68ca // fix bug page commande facture
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11064 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 16:50:34 +00:00
rGaillard
48b1d3b983 // delete console.log
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11058 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 16:05:37 +00:00
rGaillard
aaea29d1b0 // Miss file on last commit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11057 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 16:03:49 +00:00
rGaillard
86b65ef6df [+] BO: Add Specific prices bulk generator
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11056 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 16:01:10 +00:00
lLefevre
884e7492c1 // adding ovverride method initProcess for display Informations Tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11055 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 15:41:12 +00:00
tDidierjean
4b1e7e1082 // Change description class in form.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11050 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 14:18:23 +00:00
rMalie
1c2347ddab // Remove AdminStatsConf controller (conf is already in AdminStatsTab)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11035 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 09:25:10 +00:00
vKham
f5bd143eb6 // re add engine page stats, admin css module account
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11031 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 08:42:55 +00:00
vKham
a2209b5d84 // change layout module position consistency with listing module, new admin stylesheets
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11023 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-07 10:50:11 +00:00
lLefevre
a972dae0ae // adding customization template in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11015 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 18:24:08 +00:00
dSevere
1f42bf8d4e // Bugs fix (Collection, SQL optimizations, Backoffice interfaces improvement, ...) + update db_settings_extends.sql for base datas relative to available quantities and suppliers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11014 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 18:07:06 +00:00
lLefevre
bfcb15b998 // adding attachement template in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11013 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 18:01:14 +00:00
lLefevre
53ffa9dace // fixed bug delete img && update back url
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10997 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 15:21:22 +00:00
lLefevre
efe13abfd0 // fix small bugs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10975 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 12:41:56 +00:00
aFolletete
a96fb0d2e2 [-] BO : fixed calculation error on Product addition
[-] BO : fixed notice error on message addition

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10973 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 10:50:00 +00:00
vKham
ebbfcab754 // add process icon images export csv toolbarstock, new page layout flexible module position, uniformisation stylesheet module
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10957 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 17:47:45 +00:00
bMancone
db15387d07 // SupplyOrders : fixed view
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10950 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 17:18:16 +00:00
dSevere
a5c44ac8bc // Update and fix some bugs on stock display on orders in backoffice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10949 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 17:17:01 +00:00
fBrignoli
fc865e4986 // merge trunk r10863
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10935 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 16:09:08 +00:00
lLefevre
42b200b870 // small modification
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10930 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 15:36:26 +00:00
vKham
22fe972530 // add images css sprites for icon page stats
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10919 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 14:34:44 +00:00
lLefevre
5b7da70eb9 // adding edit action for combination in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10918 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 14:24:59 +00:00
mMarinetti
05ceb6ea96 // fix live_edit when not using multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10911 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 13:53:50 +00:00
aFolletete
2e8abff9a9 // add restriction on addition and edition of an order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10904 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 11:27:26 +00:00
lLefevre
9e6940eb4e // adding button in toolbar for AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10903 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 11:15:21 +00:00
lLefevre
efc5ff8390 // update tab "attributes" in smarty template + update action in list in ajax
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10891 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-04 10:42:05 +00:00
tDidierjean
cdb5de9dd3 // Remove prices from information tab and fix price calculation with tax in AdminProducts
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10888 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 17:37:13 +00:00
dSevere
468ca00519 // Stock Available : Improve BackOffice interfaces with groups of shops management + bugs fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10886 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 17:31:16 +00:00
vKham
45132ef7b8 // add class button bt-export, new stylesheets for page stats, forget password login
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10876 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 16:27:40 +00:00
vKham
ec0bae7a2e // add images sprites for page stats
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10874 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 16:26:15 +00:00
dSevere
10f1a846b7 // Some bugs fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10872 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 16:22:45 +00:00
tDidierjean
579d012427 // AdminProducts refactoring
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10870 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 16:16:36 +00:00
vChabot
ed98703212 [*] BO : you can now affect a zone to multiple countries and to multiple states
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10865 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 15:41:05 +00:00
lLefevre
8a62346471 // Adding a button to top
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10857 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 14:31:08 +00:00
lLefevre
1123ad3aa1 // fix refactoring templates in AdminCustomerThreadsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10852 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 11:19:03 +00:00
dSevere
8b618652bb // Stock Available : Improve BackOffice interface + Update all SQL requests relative to StockAvailable + code refactoring on Product Class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10843 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 19:09:27 +00:00
vKham
8e2102c8ce // add title h2 all tab page product, stylesheets stats
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10841 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 17:39:44 +00:00
fBrignoli
b2f33740fe // OrderInvoice PDF compliant
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10830 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 14:24:17 +00:00
lLefevre
1a6fb756eb // Adding a rollover on the lines of tables
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10828 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 13:49:31 +00:00
bMancone
29c75d7798 // Added CSV class. Allows to export supply order details as CSV, for instance
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10820 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 17:49:51 +00:00
aFolletete
8bbd830446 // fix little bug on AdminOrdersController
[~] Deprecated: Cart::getOrderShippingCost()

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10818 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 17:25:27 +00:00
aFolletete
13bdaf6c3f [*] BO : you can now generate manually the invoice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10814 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 16:41:24 +00:00
lLefevre
003ac6e01b // fix small bugs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10813 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 16:32:51 +00:00
dSevere
577aa781bc // Stock Available : Add shared management for group of shops
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10812 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 16:28:06 +00:00