1
0
mirror of synced 2024-11-24 22:36:07 +03:00
Commit Graph

418 Commits

Author SHA1 Message Date
Grisha Pomadchin
b79577105a Merge branch 'history' of github.com:intarocrm/bitrix-module 2013-10-29 14:41:46 +04:00
m.korolev
52e6e1d933 fix loading not active products 2013-10-15 15:58:25 +04:00
m.korolev
d4c6d405dd 1. Added load not active products
2. Remake loading ICML
2013-10-10 17:46:14 +04:00
Grisha Pomadchin
3623a8e134 order final fixes 2013-10-09 19:29:07 +04:00
Grisha Pomadchin
59ed1b87cc fix order history 2013-10-09 19:24:28 +04:00
Grisha Pomadchin
eddf81659d revert to 494b5a270 2013-10-08 17:07:55 +04:00
Grisha Pomadchin
78c5ff8252 descr files 2013-10-08 16:48:46 +04:00
Grisha Pomadchin
494b5a2701 Merge branch 'exportExtendedProperties' of github.com:intarocrm/bitrix-module into history 2013-10-08 16:45:22 +04:00
m.korolev
c070e5bec5 Merge branch 'exportExtendedProperties'
Conflicts:
	intaro.intarocrm/export/export_run.php
	intaro.intarocrm/export/export_setup.php
	intaro.intarocrm/install/index.php
	intaro.intarocrm/install/step5.php
	intaro.intarocrm/lang/ru/icml_export_setup.php
2013-10-08 16:39:50 +04:00
Grisha Pomadchin
a616532ae9 version file 2013-10-08 16:24:38 +04:00
Grisha Pomadchin
0a84b8f2ba changed working prot 2013-10-04 16:56:57 +04:00
Grisha Pomadchin
323b67d400 history fix duplicate products 2013-10-04 16:36:43 +04:00
Grisha Pomadchin
3644c385b3 rm var_dump 2013-10-02 17:49:24 +04:00
Grisha Pomadchin
8508c6bebb new orders create 2013-10-02 17:45:28 +04:00
Grisha Pomadchin
0d8d174980 v0.4.1 2013-10-02 17:42:20 +04:00
m.korolev
b2ae04bebb fix complex array storage in bitrix 2013-09-25 20:36:49 +04:00
m.korolev
2b0b5c0049 Merge branch 'exportExtendedProperties' 2013-09-23 18:28:48 +04:00
m.korolev
a6f94494c7 fix JavaScript in step 5 2013-09-23 18:27:47 +04:00
m.korolev
5265c5d5c8 Delete update.php 2013-09-23 18:16:26 +04:00
m.korolev
d058783a60 Add translations to ICML export 2013-09-23 18:05:37 +04:00
m.korolev
62bbcc0f48 Merge branch 'master'
Conflicts:
	intaro.intarocrm/classes/general/ICMLLoader.php
2013-09-23 17:44:26 +04:00
Grisha Pomadchin
f63a3271a6 number fix 2013-09-22 23:12:29 +04:00
Grisha Pomadchin
78087575a8 lang fix 2013-09-22 22:51:12 +04:00
Grisha Pomadchin
66c0d8998b event fixes 2013-09-22 21:28:28 +04:00
Grisha Pomadchin
6c2552881b catalog export fix 2013-09-22 20:03:35 +04:00
Grisha Pomadchin
0e5c9b5b6c fixes due to upload event & upload agent 2013-09-20 19:12:01 +04:00
Grisha Pomadchin
7af1925bb2 uninstallation fix 2013-09-19 00:20:56 +04:00
Grisha Pomadchin
e210a7a26f histore update fixes 2013-09-19 00:18:32 +04:00
Grisha Pomadchin
e13fddda75 +getLocationCityId 2013-09-17 19:02:19 +04:00
Grisha Pomadchin
622dd0e56c fixed order status update 2013-09-17 18:31:15 +04:00
Grisha Pomadchin
e3ceadfe67 fix onOrderUpdateEvent 2013-09-17 18:06:58 +04:00
Grisha Pomadchin
77abe318ac removed test log 2013-09-17 15:40:23 +04:00
Grisha Pomadchin
13f72cc89f options fix 2013-09-17 15:17:39 +04:00
m.korolev
d59d100afc It update old profiles to new format 2013-09-16 15:37:22 +04:00
m.korolev
596709946c Extended properties add to export 2013-09-13 16:15:54 +04:00
Grisha Pomadchin
e8f55aa087 removed repl lines 2013-09-13 14:16:58 +04:00
Grisha Pomadchin
084147eb2b merge fix; v0.4.0 2013-09-12 19:00:46 +04:00
Grisha Pomadchin
90ea4b3eab update icml 2013-09-12 17:31:32 +04:00
Grisha Pomadchin
ebbc5d2763 merge fix 2013-09-12 17:16:54 +04:00
Grisha Pomadchin
4a9375d906 merge 2013-09-12 17:05:02 +04:00
Grisha Pomadchin
903774d57d after merge 2013-09-12 17:01:29 +04:00
Grisha Pomadchin
cbff873be0 install fix 2013-09-12 16:56:14 +04:00
Grisha Pomadchin
597696b692 merge 2013-09-12 16:53:24 +04:00
Grisha Pomadchin
e6731c7a65 Merge branch 'master' of github.com:intarocrm/bitrix-module into mode-discharge 2013-09-12 16:37:34 +04:00
Grisha Pomadchin
3f1840b323 last id fix 2013-09-12 16:29:55 +04:00
Grisha Pomadchin
3e9f019f7e fio fix 2013-09-12 16:27:43 +04:00
Grisha Pomadchin
c6e2a8c1b7 fix order last id in event 2013-09-12 11:32:50 +04:00
m.korolev
6db7bc93e1 Writing offers to file has been paginate 2013-09-11 15:37:50 +04:00
Grisha Pomadchin
5ef7ec6538 mode change in options 2013-09-10 17:15:41 +04:00
m.korolev
0397aad602 Before commit: Collect data about categories, then format this, collect data about offers, then format this, and then write all to file.
After commit: Collect all data, then format all data and write all
2013-09-10 09:25:17 +04:00