Michael RICOIS
|
427258606c
|
CS
|
2018-02-27 14:36:05 +01:00 |
|
Michael RICOIS
|
563bd0c7df
|
Change display
|
2018-02-27 10:44:27 +01:00 |
|
Michael RICOIS
|
7cea4e23ba
|
Language
|
2018-02-26 16:13:35 +01:00 |
|
Michael RICOIS
|
73563b0ca8
|
Remove .hg
|
2018-02-26 15:30:58 +01:00 |
|
Michael RICOIS
|
2cdfbdb833
|
Date update only if it's a thread
|
2018-02-22 17:56:47 +01:00 |
|
Michael RICOIS
|
48f2940d2d
|
Merge branch 'ticket-14739-PackLogistic'
|
2018-02-22 09:35:41 +01:00 |
|
Michael RICOIS
|
d303a06b7e
|
Merge branch 'ticket/r15587-refund-paypal'
|
2018-02-21 17:21:32 +01:00 |
|
Michael RICOIS
|
7163d60447
|
Detect if is a full refund
|
2018-02-21 16:42:43 +01:00 |
|
Michael RICOIS
|
af4f1270c8
|
Merge branch 'ticket/r15587-refund-paypal'
|
2018-02-21 14:54:23 +01:00 |
|
Michael RICOIS
|
8c24fe9fc6
|
Display items refund
|
2018-02-21 14:53:13 +01:00 |
|
Michael RICOIS
|
f82639ca09
|
Save refund message and transaction for shipping cost
|
2018-02-21 13:04:53 +01:00 |
|
Michael RICOIS
|
395aa0cd8a
|
Merge remote-tracking branch 'origin/ticket/r15587-refund-paypal'
|
2018-02-21 09:43:41 +01:00 |
|
Michael RICOIS
|
2a1c162040
|
Reload ajax page after submit
|
2018-02-20 15:46:42 +01:00 |
|
Michael RICOIS
|
f7a4656e9d
|
Update libs multiselect
|
2018-02-20 14:41:46 +01:00 |
|
David
|
eba305a933
|
Merge branch 'ticket-14436-excel-format'
|
2018-02-20 12:00:35 +01:00 |
|
David
|
0c1e1a7b21
|
git export management
|
2018-02-20 11:46:34 +01:00 |
|
David
|
7f8f72089a
|
Merge branch 'ticket-14436-excel-format'
|
2018-02-20 11:34:20 +01:00 |
|
David
|
88d1284171
|
Added new calculation for best sales
|
2018-02-14 18:53:23 +01:00 |
|
Michael RICOIS
|
1903c42573
|
Enable/Disable credit display
|
2018-02-14 14:54:13 +01:00 |
|
Michael RICOIS
|
8ff1af50df
|
Test
|
2018-02-14 12:16:16 +01:00 |
|
Michael RICOIS
|
a348fd8328
|
Exchange order pack first, single after
|
2018-02-14 09:36:36 +01:00 |
|
Michael RICOIS
|
bb7d8d133d
|
Merge branch 'ticket-14739-PackLogistic'
|
2018-02-13 17:42:41 +01:00 |
|
Michael RICOIS
|
ee76fb5feb
|
Display action
|
2018-02-13 17:35:12 +01:00 |
|
Michael RICOIS
|
4e88bd364a
|
Merge branch 'ticket-14739-PackLogistic'
|
2018-02-13 16:46:08 +01:00 |
|
Michael RICOIS
|
fb61d8b1ad
|
id_order
|
2018-02-13 16:45:38 +01:00 |
|
Michael RICOIS
|
7a207b2010
|
CS
|
2018-02-13 12:42:39 +01:00 |
|
Michael RICOIS
|
3851c2e70f
|
Merge branch 'ticket-14739-PackLogistic'
|
2018-02-12 17:06:59 +01:00 |
|
Michael RICOIS
|
54781041ee
|
Merge branch 'ticket/r15782-stats'
|
2018-02-06 16:48:32 +01:00 |
|
Michael RICOIS
|
3cc9394547
|
Form name
|
2018-02-06 16:47:39 +01:00 |
|
Michael RICOIS
|
a3c2e56824
|
Merge branch 'ticket/r15782-stats'
|
2018-02-06 15:50:33 +01:00 |
|
Michael RICOIS
|
1097c2111e
|
Fix ajax / https
|
2018-02-06 15:41:39 +01:00 |
|
Michael RICOIS
|
cd1d3caeb6
|
Merge branch 'ticket/r15782-stats'
|
2018-02-06 15:23:05 +01:00 |
|
Michael RICOIS
|
75633bb6e2
|
Domain + https
|
2018-02-06 15:21:12 +01:00 |
|
Michael RICOIS
|
d3077cf244
|
Merge remote-tracking branch 'origin/ticket/r15782-stats'
|
2018-02-06 14:49:48 +01:00 |
|
Michael RICOIS
|
1e0baff8cd
|
https
|
2018-02-06 14:47:52 +01:00 |
|
Michael RICOIS
|
3768576288
|
Add fix for spam
|
2018-02-06 10:48:30 +01:00 |
|
Michael RICOIS
|
42b5f95c1f
|
Update from logistics module
|
2018-02-06 09:31:12 +01:00 |
|
Michael RICOIS
|
a12ab8132a
|
Merge remote-tracking branch 'origin/ticket/r15782-stats'
|
2018-02-05 12:00:56 +01:00 |
|
David
|
dd923fa2d7
|
Merge branch 'ticket-14436-excel-format'
|
2018-02-02 22:01:19 +01:00 |
|
David
|
7c218242be
|
Added doubled ean recovery options
|
2018-02-02 21:59:26 +01:00 |
|
Michael RICOIS
|
134af30198
|
Harmonisation
|
2018-02-02 17:46:57 +01:00 |
|
David
|
cbf9b268ce
|
new duplicates management
fix in formula
|
2018-02-02 15:37:43 +01:00 |
|
Michael RICOIS
|
d7ea10a2bb
|
Mails
|
2018-02-02 12:28:49 +01:00 |
|
Michael RICOIS
|
e73277ec38
|
Export in ajax
|
2018-02-01 17:39:33 +01:00 |
|
Michael RICOIS
|
1ae7e28abe
|
Async export
|
2018-02-01 09:34:23 +01:00 |
|
Michael RICOIS
|
2c91058ece
|
Text
|
2018-01-31 12:36:51 +01:00 |
|
Michael RICOIS
|
9cadd3e8af
|
Don't save shipping number in dropshipping
|
2018-01-31 12:05:57 +01:00 |
|
Michael RICOIS
|
70afb97e26
|
Column name
|
2018-01-31 11:34:17 +01:00 |
|
Michael RICOIS
|
a71a5c9eac
|
Remove glob
|
2018-01-31 10:50:00 +01:00 |
|
Michael RICOIS
|
a6cf9bd87f
|
Replace BETWEEN instruction
|
2018-01-31 09:39:24 +01:00 |
|
Michael RICOIS
|
40468043c9
|
CS
|
2018-01-30 18:00:48 +01:00 |
|
Michael RICOIS
|
db36c1026b
|
fix js errors
|
2018-01-30 17:49:53 +01:00 |
|
Michael RICOIS
|
84a1b37f50
|
Check quantity
|
2018-01-30 17:47:03 +01:00 |
|
Michael RICOIS
|
8b15ef46a6
|
Rework for dropshipping
|
2018-01-30 17:15:33 +01:00 |
|
Michael RICOIS
|
4fd935962e
|
Merge branch 'ticket-14739-PackLogistic'
|
2018-01-30 12:30:01 +01:00 |
|
Michael RICOIS
|
60cef82038
|
Get file from server
|
2018-01-30 12:17:53 +01:00 |
|
Michael RICOIS
|
12507d60c3
|
Not an ajax admin
|
2018-01-30 11:57:37 +01:00 |
|
Michael RICOIS
|
04399b0f6b
|
Add cookie as global
|
2018-01-30 10:53:00 +01:00 |
|
Michael RICOIS
|
3aca7c4e2e
|
Add hookCancelShipping
|
2018-01-29 16:47:51 +01:00 |
|
Michael RICOIS
|
7a7cc4d7fe
|
Merge remote-tracking branch 'origin/ticket/r11982-ganalytics'
|
2018-01-29 14:36:38 +01:00 |
|
Michael RICOIS
|
807fc023f3
|
Test
|
2018-01-29 14:34:59 +01:00 |
|
Michael RICOIS
|
02def68974
|
Rewrite
|
2018-01-26 16:24:00 +01:00 |
|
Marion Muszynski
|
a24ebc48d9
|
deleting useless files
|
2018-01-26 15:24:11 +01:00 |
|
Marion Muszynski
|
c978c25373
|
add module ant logistic for test
|
2018-01-26 15:24:10 +01:00 |
|
Michael RICOIS
|
b907ac0e66
|
CS
|
2018-01-26 11:56:03 +01:00 |
|
Michael RICOIS
|
67b9dd85be
|
CS
|
2018-01-26 10:50:02 +01:00 |
|
Michael RICOIS
|
063ce25d01
|
CS and comment
|
2018-01-26 10:06:48 +01:00 |
|
Michael RICOIS
|
0b787dd69b
|
Comment
|
2018-01-25 17:21:15 +01:00 |
|
David
|
daa9f31bc0
|
Major rework
|
2018-01-24 16:50:32 +01:00 |
|
Michael RICOIS
|
85f4874ac8
|
Validation
|
2018-01-23 17:10:17 +01:00 |
|
Michael RICOIS
|
9b3f4d087b
|
Add counter for purchase transaction
|
2018-01-23 16:38:06 +01:00 |
|
Michael RICOIS
|
d0c9e8f59b
|
Timestamp set at 10 minutes
|
2018-01-23 15:56:33 +01:00 |
|
Michael RICOIS
|
6915872212
|
CS
|
2018-01-22 10:40:55 +01:00 |
|
David
|
17cb1fdc7c
|
Added conditionnal formatting
|
2018-01-18 18:29:59 +01:00 |
|
David
|
f52f89ad64
|
Code cleanup
Background format
Bold format
Conditionnal in comments
|
2018-01-18 17:49:10 +01:00 |
|
Michael RICOIS
|
3a5aed3c7f
|
Merge remote-tracking branch 'origin/ticket/r15224-balises'
|
2018-01-17 17:49:30 +01:00 |
|
Michael RICOIS
|
e9b0ef0dae
|
Fix
|
2018-01-17 17:48:37 +01:00 |
|
Michael RICOIS
|
1481338cac
|
Merge remote-tracking branch 'origin/ticket/r15365-logistic-reshipping'
|
2018-01-17 14:57:47 +01:00 |
|
Michael RICOIS
|
9670db71e9
|
Fix carrier name for delete action
|
2018-01-17 14:55:15 +01:00 |
|
Michael RICOIS
|
a762200fc2
|
Typo
|
2018-01-16 14:38:21 +01:00 |
|
Michael RICOIS
|
90a09e1ce7
|
Merge remote-tracking branch 'origin/ticket/r15365-logistic-reshipping'
|
2018-01-15 16:27:20 +01:00 |
|
Michael RICOIS
|
741b69f733
|
Bad SQL
|
2018-01-15 16:27:03 +01:00 |
|
Michael RICOIS
|
35e9afa6d9
|
Merge remote-tracking branch 'origin/ticket/r15365-logistic-reshipping'
|
2018-01-15 16:04:15 +01:00 |
|
Michael RICOIS
|
65cec1825d
|
Set philea as first
|
2018-01-15 16:03:18 +01:00 |
|
Michael RICOIS
|
6cdeaba17f
|
CS
|
2018-01-15 15:45:33 +01:00 |
|
Michael RICOIS
|
e459ed17c3
|
CS
|
2018-01-15 15:38:14 +01:00 |
|
Michael RICOIS
|
d063c3ef40
|
Merge remote-tracking branch 'origin/ticket/r15365-logistic-reshipping'
|
2018-01-15 14:26:15 +01:00 |
|
Michael RICOIS
|
9afceeca10
|
Merge branch 'ticket/r15319-multi-voucher'
|
2018-01-15 10:18:00 +01:00 |
|
Michael RICOIS
|
fd6b00ed78
|
Merge branch 'ticket/r15296-import'
|
2018-01-15 10:17:27 +01:00 |
|
Michael RICOIS
|
a018ea7833
|
Merge remote-tracking branch 'origin/ticket/r15224-balises'
|
2018-01-15 09:24:39 +01:00 |
|
Michael RICOIS
|
bd363dbd21
|
Check if id_category_default is set, on all lines
|
2018-01-12 16:02:19 +01:00 |
|
Michael RICOIS
|
18f7642e3d
|
remove debug
|
2018-01-12 15:22:13 +01:00 |
|
Michael RICOIS
|
637fea818f
|
Set philea when delete
|
2018-01-12 14:58:02 +01:00 |
|
Michael RICOIS
|
bede86e06b
|
Add possibilty to re-send order when first is by philea
|
2018-01-12 12:32:59 +01:00 |
|
Michael RICOIS
|
f32ca94f43
|
CS
|
2018-01-12 12:19:23 +01:00 |
|
Michael RICOIS
|
ee7ec89a87
|
Add mark philea
|
2018-01-11 16:22:25 +01:00 |
|
Michael RICOIS
|
a66a711598
|
CS
|
2018-01-11 14:55:22 +01:00 |
|
Michael RICOIS
|
dbc9d4b8e3
|
CS
|
2018-01-11 13:19:25 +01:00 |
|
Michael RICOIS
|
9228227d89
|
CS
|
2018-01-11 13:03:54 +01:00 |
|
Michael RICOIS
|
391d526942
|
Merge remote-tracking branch 'origin/ticket/r15314-generate-label'
|
2018-01-10 15:04:36 +01:00 |
|