45cc1929d4
// add delivery slip
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11693 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 21:21:41 +00:00
560903fefe
[-] BO : Credit slips now appear in document section
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11653 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 18:02:04 +00:00
71f2f43ca6
[*] BO : Partial refund now handle quantity
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11624 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 15:57:30 +00:00
c197093143
// Fixed getCartProducts()
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11615 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 15:04:26 +00:00
2a5faa0271
// Improvement : target blank on PDF
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11594 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 13:38:00 +00:00
739e51ce9a
// Add specific_price management for backoffice order && fix installer
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11520 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 17:16:46 +00:00
0d0f43f783
// Orders : fixed stock (available quantity & Stock)
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11491 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 14:24:34 +00:00
09c22d9083
// OrderHistory : fixed r11441
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11471 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 11:10:52 +00:00
e813ea996d
// minor notice fix when new order, related to OrderHistory::getLastOrderState() returning false instead of an object
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11441 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 19:04:56 +00:00
5d7a120e50
// management of discount addition when no invoice on current order
...
// update the discount form when new invoice is created
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11389 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 18:24:03 +00:00
016e7b268f
// Removing red error message when orders total is diferent form the total paid if there are multiple orders with the same reference
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11385 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 17:26:17 +00:00
1d2f9e44c4
// Improve collections : where() method reworked (prototype changed) + validation of fields
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11383 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 16:57:28 +00:00
772147a6ee
// Removing some id_warehouse
...
// Adding some checks with advanced_stock_management product attribute
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11375 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 16:01:41 +00:00
2139d3983d
[*] CO : Additional Shipping Cost / Purchase Price / Reduction Amount texc in OrderDetails
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11345 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 10:16:04 +00:00
92805dc869
[+] BO : on order edition, you can add a discount
...
[+] BO : on order edition, you can delete a discount
// Adding two new columns in order_cart_rule table: id_order_invoice, value_tax_excl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11330 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-18 17:18:54 +00:00
d446d77261
// fix bug on Cart rule update in validateOrder
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11326 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-17 17:13:48 +00:00
8415b8136d
// fixed bug on automatic payment addition when put the order to a paid status
...
// fix "Free shipping" when create a new invoice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11321 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 17:17:13 +00:00
896b62978f
// fix bug on tracking number value
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11311 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 15:22:38 +00:00
5a4bc80867
// improve invoice and order payment
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11306 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 15:00:43 +00:00
6f03353f96
[*] BO : no payment is registered on order creation for check and bankwire payment
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11296 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 10:10:48 +00:00
8a73986a76
[*] BO : Improvement invoices management
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11291 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 09:14:11 +00:00
13a70e1044
[*] Classes: ObjectModel::getTranslationsField|Child() is now deprecated, use ObjectModel::getFieldsLang() if need instead
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11256 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 13:24:03 +00:00
cb984199fc
[+] BO : Add a note on invoice
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11253 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 11:38:01 +00:00
c16aed3424
// you can define invoice on payment addition
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11238 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 18:42:50 +00:00
3f814a3cf0
// little fix about generating first John Doe invoice
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11229 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 17:09:52 +00:00
b48c20d1d5
// BugFix : Adding warehouse on order edition
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11214 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 16:19:05 +00:00
03bd438c7d
// Format definitions
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11173 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 13:41:54 +00:00
225c8523e9
// improve multishop code, id_shop has an id different than 0 even if share_customer or share_order is true
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11172 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 13:37:59 +00:00
5f4972701c
// improve multishop code with id_shop = 0 when share_customer or share_order is true
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11169 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 11:59:41 +00:00
7d67b9cc6e
// revert r11153
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11164 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 09:50:21 +00:00
9329793e65
// Updated OrderHistory / StockManager. Added feature to StockCover: it is now possible to display the number of sales per product / and highlight products which coverage is less than a given threshold
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11163 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 09:48:52 +00:00
fddf4fb89b
[*] Classes: Remove $fieldsRequired, $fieldsSize and $fieldsValidate (and lang properties) properties, use $definition instead
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11155 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 18:10:38 +00:00
c97bac9160
// Remove useless code in OrderHistory
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11154 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 18:08:09 +00:00
ff40a43ac5
// fix bug on setInvoice method
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11153 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 17:45:34 +00:00
afd73899dd
// fix bug on Order class
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11150 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 17:06:16 +00:00
0db603d498
// fix bug on Payment addition
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11148 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 16:51:47 +00:00
6f3972d946
// improve hasInvoice method
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11142 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 15:57:11 +00:00
0a533f970f
// OrderHistory: fixed synchronize/updateQuantity conflits
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11140 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 15:39:48 +00:00
6f80da5b2b
// Updated re-stock
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11139 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 15:25:51 +00:00
85dd573402
// Re-stock (Prices fixed/warehouse fixed)
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11136 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 13:54:17 +00:00
345ad40e3c
// Copy from trunk: #PSCFI-4401 - linebreaks in product return message cause fatal error in BO
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11122 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 11:07:46 +00:00
71b6047692
// Stock decrementation
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11074 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 13:09:32 +00:00
b56d98b66a
// Remove unused $tables property from ObjectModel + improve Cache
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11071 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 10:24:48 +00:00
56c6105c56
// norm
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11052 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 15:14:40 +00:00
af70df72ce
// Adding the OrderCarrier class to handle carriers in an order
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11051 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 15:12:23 +00:00
b6f25900ee
// Removing numerics from order reference
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10978 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 13:18:00 +00:00
187aafaf51
[*] PDF : Licenses + Hook in templates
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10974 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 10:58:20 +00:00
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
86683a963e
// Remove $table and $identifier property from all classes, and add static $definition instead
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10912 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 13:56:03 +00:00
f7250f76d5
// fix bug on Order class
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10897 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 10:40:06 +00:00
aFolletete