소스 검색

Lines 25-36 introduced symbols and types, partner by type

marton levente 7 달 전
부모
커밋
d3ae021073
2개의 변경된 파일28개의 추가작업 그리고 18개의 파일을 삭제
  1. 14 9
      pymt940/templates/body_incomes.txt
  2. 14 9
      pymt940/templates/body_payments.txt

+ 14 - 9
pymt940/templates/body_incomes.txt

@@ -22,18 +22,23 @@ TotalDocumente={{ TotalDocumente }}
         [Document{{ num_doc }}-Incasare{{ loop.index }}]
         DocIncasare=BT54
         NrDocument={{ LunaLucru }}
-        Reprezinta=ALIMENTARE CREDIT
-        {% if clients[inc_day][loop.index - 1] == "" %}
-            Client={{ std_client }}
-            {% set cl_name = std_client %}
+        Reprezinta={{ represents[inc_day][loop.index - 1] }} {# ALIMENTARE CREDIT #}
+        {% set tip = represents[inc_day][loop.index - 1] %}
+        {% if tip == "ALIMENTARE CREDIT" %}
+            {% if clients[inc_day][loop.index - 1] == "" %}
+                Client={{ std_client }}
+                {% set cl_name = std_client %}
+            {% else %}
+                Client={{ clients[inc_day][loop.index - 1] }}
+                {% set cl_name = clients[inc_day][loop.index - 1] %}
+            {% endif %}
+            {# % set cl_name = clients[loop.index - 1] % #}
+            CodClient={{ cods[cl_name] }}
         {% else %}
-            Client={{ clients[inc_day][loop.index - 1] }}
-            {% set cl_name = clients[inc_day][loop.index - 1] %}
+            Client=
         {% endif %}
-        {# % set cl_name = clients[loop.index - 1] % #}
-        CodClient={{ cods[cl_name] }}
         ValIncasata={{ amount[inc_day][loop.index - 1] }}
-        Cont={{ cont }}
+        Cont={{ cont[inc_day][loop.index - 1] }}
         Observatii={{ obs[inc_day][loop.index - 1] }}
     {% endfor %}
 {% endfor %}

+ 14 - 9
pymt940/templates/body_payments.txt

@@ -22,18 +22,23 @@ TotalDocumente={{ TotalDocumente }}
         [Document{{ num_doc }}-Plata{{ loop.index }}]
         DocPlata=BT54
         NrDocument={{ LunaLucru }}
-        Reprezinta=ALIMENTARE CREDIT
-        {% if clients[inc_day][loop.index - 1] == "" %}
-            Furnizor={{ std_client }}
-            {% set cl_name = std_client %}
+        Reprezinta={{ represents[inc_day][loop.index - 1] }} {# ALIMENTARE CREDIT #}
+        {% set tip = represents[inc_day][loop.index - 1] %}
+        {% if tip == "ALIMENTARE CREDIT" %}
+            {% if clients[inc_day][loop.index - 1] == "" %}
+                Furnizor={{ std_client }}
+                {% set cl_name = std_client %}
+            {% else %}
+                Furnizor={{ clients[inc_day][loop.index - 1] }}
+                {% set cl_name = clients[inc_day][loop.index - 1] %}
+            {% endif %}
+            {# % set cl_name = clients[loop.index - 1] % #}
+            CodFurnizor={{ cods[cl_name] }}
         {% else %}
-            Furnizor={{ clients[inc_day][loop.index - 1] }}
-            {% set cl_name = clients[inc_day][loop.index - 1] %}
+            Furnizor=
         {% endif %}
-        {# % set cl_name = clients[loop.index - 1] % #}
-        CodFurnizor={{ cods[cl_name] }}
         ValPlatita={{ amount[inc_day][loop.index - 1] }}
-        Cont={{ cont }}
+        Cont={{ cont[inc_day][loop.index - 1] }}
         Observatii={{ obs[inc_day][loop.index - 1] }}
     {% endfor %}
 {% endfor %}