Commit Graph

187 Commits

Author SHA1 Message Date
lLefevre
f0f658df52 // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17889 b9a71923-0436-4b27-9f14-aed3839534dd
2012-10-17 09:29:43 +00:00
lLefevre
e924469a70 // #PSCFV-5017 : update bad licenses in all files
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17884 b9a71923-0436-4b27-9f14-aed3839534dd
2012-10-17 06:18:59 +00:00
vAugagneur
d34dabaa7e [-] BO : fixed bug #PSCFV-4865
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17874 b9a71923-0436-4b27-9f14-aed3839534dd
2012-10-16 12:41:13 +00:00
rGaillard
54cf5fda7b // Fix #PSCFV-4916
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17847 b9a71923-0436-4b27-9f14-aed3839534dd
2012-10-12 13:25:12 +00:00
rGaillard
e77bcda56a // Fix customer filter on adminorders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17799 b9a71923-0436-4b27-9f14-aed3839534dd
2012-10-08 13:23:22 +00:00
rGaillard
4863e60cc3 // now can reinject quantities on partial refund
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17758 b9a71923-0436-4b27-9f14-aed3839534dd
2012-10-04 14:27:09 +00:00
rGaillard
50206f1bef // Fix #PSCFV-4169
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17753 b9a71923-0436-4b27-9f14-aed3839534dd
2012-10-04 13:32:28 +00:00
rGaillard
17e546a3e7 // fix for product addition on order edition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17737 b9a71923-0436-4b27-9f14-aed3839534dd
2012-10-03 18:05:54 +00:00
rGaillard
58da54df23 // Fix #PSCFV-4556
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17728 b9a71923-0436-4b27-9f14-aed3839534dd
2012-10-03 15:25:53 +00:00
rGaillard
ec021a44c3 // fix currencies update on admin orders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17726 b9a71923-0436-4b27-9f14-aed3839534dd
2012-10-03 15:00:08 +00:00
rGaillard
432e0122ed // Fix #PSCFV-4543
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17723 b9a71923-0436-4b27-9f14-aed3839534dd
2012-10-03 14:05:21 +00:00
dMetzger
62097b8774 // State history optimized #PSCFV-4564
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17638 b9a71923-0436-4b27-9f14-aed3839534dd
2012-10-01 12:24:42 +00:00
rGaillard
d67656c6c0 // Fix #PSCFV-4520
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17622 b9a71923-0436-4b27-9f14-aed3839534dd
2012-09-28 16:45:23 +00:00
dMetzger
14ccde1851 // Back office optimization begun (memory & SQL) and will resume tomorrow
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17573 b9a71923-0436-4b27-9f14-aed3839534dd
2012-09-26 17:52:27 +00:00
rGaillard
f2caec512c // Fix #PSCFV-4327
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17542 b9a71923-0436-4b27-9f14-aed3839534dd
2012-09-25 17:10:10 +00:00
rGaillard
40093d3884 // Fix #PSCFV-4057
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17510 b9a71923-0436-4b27-9f14-aed3839534dd
2012-09-24 15:25:08 +00:00
lLefevre
c686552b2a [-] BO : fix #PSCFV-4167
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17414 b9a71923-0436-4b27-9f14-aed3839534dd
2012-09-19 09:17:09 +00:00
rGaillard
fc41a01686 // Small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17207 b9a71923-0436-4b27-9f14-aed3839534dd
2012-09-06 09:21:04 +00:00
rGaillard
765a144478 // Small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17206 b9a71923-0436-4b27-9f14-aed3839534dd
2012-09-06 09:19:31 +00:00
rGaillard
302f0abe9d // Order slips must be generated when an invoice is available
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17194 b9a71923-0436-4b27-9f14-aed3839534dd
2012-09-05 14:51:42 +00:00
rGaillard
d4bbdd7207 // Amount of order payment may be negative
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17192 b9a71923-0436-4b27-9f14-aed3839534dd
2012-09-05 14:10:29 +00:00
rGaillard
3d7a80671a // Small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17168 b9a71923-0436-4b27-9f14-aed3839534dd
2012-09-04 17:44:56 +00:00
vAugagneur
27014976fa [+] BO : in order tab you have new information of new customer message
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17158 b9a71923-0436-4b27-9f14-aed3839534dd
2012-09-04 08:24:39 +00:00
dMetzger
1f033138cd // #PSCFV-3859
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17137 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-31 15:00:20 +00:00
rGaillard
554e2f240a // don't allow carts without customer to create a new BackOffice orders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17122 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-31 09:12:30 +00:00
dMetzger
4e4576ec97 // Wrong id given to the Cart class #PSCFV-3739
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16980 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-23 17:12:45 +00:00
dMetzger
e930b9b8ed // Huge code cleaning on order edition, a lot of values were inconsistent
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16829 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-13 16:26:40 +00:00
rGaillard
ca80cbc4b1 // Fix small bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16724 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-06 13:55:43 +00:00
rGaillard
7149dacb74 [-] BO: Fix PSCFV-2994
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16648 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-01 14:43:44 +00:00
rGaillard
ea35da0a1a // Small fix context is all when multishop is not activated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16627 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-31 12:33:43 +00:00
rGaillard
d16dfdab01 [-] BO: Fix PSCFV-3315 bad invoice after deleting a product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16622 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-31 09:47:09 +00:00
rGaillard
22d4e61e54 // Fix currency storage in backoffice orders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16611 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-30 15:32:22 +00:00
rGaillard
2ce01cc89e [-] BO: Fix PSCFV-3345 display of prices with a currency different than default on backoffice orders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16610 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-30 15:24:29 +00:00
fBrignoli
d30f381961 [-] BO : Bug fixed related to #PSCFV-2954 - order slip do not include VAT on carriers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16569 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-25 13:57:15 +00:00
lLefevre
f2233e08d0 [-] BO : fix #PSCFV-3278 : add a parameter id_shop in a method Mail::send() && normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16549 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-24 14:13:11 +00:00
lLefevre
810692e577 [-] BO : fix #PSCFV-3244
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16467 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-18 09:17:33 +00:00
fBrignoli
b2ba507b03 [-] BO : Bug Fixed ##PSCFV-3128 - part 2
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16455 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-17 14:14:24 +00:00
fBrignoli
26c3e81764 [-] BO : Bug Fixed #PSCFV-3128 - Incorrect voucher value via product return
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16453 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-17 09:31:11 +00:00
fBrignoli
7af140d285 [-] PDF : Canadian taxes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16386 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-12 16:45:14 +00:00
mDeflotte
dc35aaa83c [-] BO : #PSCFV-3000 - Send an email on changing an order from the BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16372 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-12 12:05:19 +00:00
lLefevre
9bc7869e2b [*] TR : update English translations key for Errors
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16371 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-12 10:14:41 +00:00
lLefevre
868eaa32fd // Fix translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16307 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-10 13:03:23 +00:00
lLefevre
2f361c3bde [*] BO : #PSCFV-3007 : Now you can create a voucher when you create a partial refund on the BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16303 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-10 10:03:35 +00:00
mDeflotte
1dec53057d [-] BO : #PSCFV-3126 - Change mail object. Mail object must be unique for a specific template
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16301 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-10 09:38:20 +00:00
lLefevre
ddbd363946 [-] BO : fix #PSCFV-3087
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16261 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-06 12:55:48 +00:00
lLefevre
991938edad [-] BO : #PSCFV-3036 : fix bug and fix notice and fix deprecated function
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16248 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-05 15:35:13 +00:00
mDeflotte
1997bf6efb [-] BO : #PSCFV-3011 - Add details of refund and returned products on the BO order page.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16222 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-05 07:40:11 +00:00
mDeflotte
3c1c6fb7e0 [-] FO : #PSCFV-2920 - Hidding order number, use order reference instead
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16136 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-26 15:19:35 +00:00
mDeflotte
dbcff517b4 [-] BO : #PSCFV-2739 - Hide button merchandise return if disable
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15952 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-08 08:44:50 +00:00
rGaillard
161f32b9e6 // Fix freeshipping on backoffice Order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15930 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-07 14:56:48 +00:00