Merge branch 'master' into #1

# Conflicts:
#	importE5EDISales.php
This commit is contained in:
Michał Zieliński
2025-08-27 07:35:09 +02:00
10 changed files with 156 additions and 106 deletions

View File

@@ -62,8 +62,8 @@ function checkEDISales()
$s->number = $number;
$s->document_no = $s->formatNumber($number);
$s->edi_file = $order;
$s->type = 'sales_order';
$s->status = 's60';
$s->type = 'abf8f342-13de-bb9f-7848-687897a3b953';
$s->status = 's30';
$s->ecmlanguage = 'pl_pl';
$a = new Account();
$a->retrieve($s->parent_id);
@@ -78,7 +78,7 @@ function checkEDISales()
}
$s->total_netto = $sum_netto;
if ($s->parent_id == 134 || $s->parent_id == '134') {
if ($s->parent_id == 134 || $s->parent_id == '134') { // carrefour
$s->shop_number = null;
}