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 |
|
lLefevre
|
8671928caf
|
// added toolbar in cart_rules form.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10811 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-30 16:08:30 +00:00 |
|
lLefevre
|
a8e8b25194
|
// fix small bugs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10806 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-30 14:55:49 +00:00 |
|
lLefevre
|
72b833fe31
|
// added list of tables and attributes in AdminRequestSqlController + change export request
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10803 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-30 13:25:14 +00:00 |
|
bMancone
|
1913786e66
|
// Stock: updated controllers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10796 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-30 10:32:55 +00:00 |
|
lLefevre
|
dda2735056
|
// fix small bug in AdminTaxRulesGroupController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10793 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-30 10:27:21 +00:00 |
|
vKham
|
2abd646ca4
|
// new layout page stats, substitute fieldset by div, legend by h2, delete stylesheet on html delete engines
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10761 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-29 17:43:12 +00:00 |
|
vKham
|
ad65287eeb
|
// new layout page stats, substitute fieldset by div, legend by h2, delete stylesheet on html
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10760 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-29 17:42:38 +00:00 |
|
bMancone
|
c5dab89eb5
|
// AdminSupplyOrdersController: fixed bugs when adding products to the order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10758 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-29 17:04:43 +00:00 |
|
lLefevre
|
31bf5b5864
|
// fix remove button delete for AdminCountriesController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10747 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-29 15:18:10 +00:00 |
|
bMancone
|
2ff4ce919f
|
// AdminSupplyOrdersController: added confirm message before using a template to create an order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10746 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-29 14:47:06 +00:00 |
|
bMancone
|
e918d53dfa
|
// AdminSupplyOrdersController: it now possible to create supply order templates, and use them to create actual supply orders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10745 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-29 14:36:15 +00:00 |
|
vKham
|
1d1c9966ea
|
//custom new button all page product, new class bt-icon, consistency table product, add min-width button toolbar action
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10721 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-28 17:36:45 +00:00 |
|
dSevere
|
37d215522a
|
// Product Suppliers : Add wholesale price management for each supplier
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10719 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-28 17:16:39 +00:00 |
|
tDidierjean
|
e474dc01b5
|
// AdminControllers cleanup
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10716 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-28 16:32:33 +00:00 |
|
vKham
|
9b5f3b8c03
|
//consistency title page product, description, new form search header, new icon images package fatcow toolbar action
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10709 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-28 14:45:31 +00:00 |
|
bMancone
|
7fd28f56b6
|
// Stock - interfaces updated : (reason=>label, state=>status)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10700 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-28 11:12:17 +00:00 |
|
rGaillard
|
73148dda1d
|
// Change urls of prestashop api
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10696 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-28 10:22:58 +00:00 |
|
rGaillard
|
3a5a061717
|
// Change URLs calling for prestashop.com
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10686 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-25 18:45:07 +00:00 |
|
rGaillard
|
19749a2102
|
// Fix link in backoffice with multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10685 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-25 17:52:44 +00:00 |
|
mDeflotte
|
506773b46c
|
// Adding reference in admin order details
// Adding reference in payment return of cheque and bankwire module
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10669 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-25 15:45:38 +00:00 |
|
vKham
|
447d6a5f01
|
fix height bug sidebar, delete div class clear
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10668 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-25 15:16:32 +00:00 |
|
rGaillard
|
af8875217e
|
// Fix links on order view
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10662 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-25 13:31:55 +00:00 |
|