1
Changeset fd8c1c5 – MultiMag

Changeset fd8c1c5


Ignore:
Timestamp:
Dec 2, 2019, 1:51:53 AM (3 years ago)
Author:
GitHub <noreply@…>
Branches:
master
Children:
a653dec
Parents:
5f22008 (diff), 97f4fe3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
lazersib <blacklight@…> (02/12/19 01:51:53)
git-committer:
GitHub <noreply@…> (02/12/19 01:51:53)
Message:

Merge pull request #5 from magnatiwe/add_inn_or_name_to_selected_option

Добавил вывод инн/наименования предпреятия для выбранного агента в документе

Location:
web/include
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • web/include/doc.nulltype.php

    r5f22008 rfd8c1c5  
    19061906                        var result =
    19071907                                row[0] +
    1908                                 ' (' + row[3] + ')' +
    19091908                                \"<em class='qnt'> тел . \" + row[2] + \"</em>\";
    19101909                        return result;
  • web/include/doc.s.agent.php

    r5f22008 rfd8c1c5  
    9292                                list($nxt[0],$nxt[3])=[$nxt[3],$nxt[0]];
    9393                        }
    94                         $tmpl->addContent("$nxt[0]|$nxt[1]|$nxt[2]|$nxt[3]\n");
     94                        $tmpl->addContent("$nxt[0] ".($nxt[3] ? "($nxt[3])" : "")."|$nxt[1]|$nxt[2]|$nxt[3]\n");
    9595                }
    9696        } elseif ($opt == 'jgetcontracts') {
Note: See TracChangeset for help on using the changeset viewer.