Commit Graph

1554 Commits

Author SHA1 Message Date
Michael RICOIS
2cdfbdb833 Date update only if it's a thread 2018-02-22 17:56:47 +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
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
David
cbf9b268ce new duplicates management
fix in formula
2018-02-02 15:37:43 +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
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
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
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
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