|
@@ -295,8 +295,8 @@ class WinMentor(object):
|
|
except KeyError as exc_:
|
|
except KeyError as exc_:
|
|
df_obligall = df_oblig
|
|
df_obligall = df_oblig
|
|
options = ['581', '455', '455.01', '167', '666']
|
|
options = ['581', '455', '455.01', '167', '666']
|
|
- suppliers = ['401', '404', '409', '409.01', '409.02', '409.04']
|
|
|
|
- clients = ['411', '411.01', '419', '472']
|
|
|
|
|
|
+ suppliers = ['401', '404', '409', '409.01', '409.02', '409.03', '409.04']
|
|
|
|
+ clients = ['411', '411.01', '419', '419.01', '419.02', '472', '472.01', '472.02', '472.03']
|
|
df_obligall['TipPartener'] = df_obligall.apply(lambda row: self._part_type(row), axis=1)
|
|
df_obligall['TipPartener'] = df_obligall.apply(lambda row: self._part_type(row), axis=1)
|
|
df_obligall['RestRon'] = df_obligall['Rest'] * df_obligall['Curs']
|
|
df_obligall['RestRon'] = df_obligall['Rest'] * df_obligall['Curs']
|
|
mask = (~df_obligall['Simbol_x'].isin(options)) & (df_obligall['Rest'] != 0)
|
|
mask = (~df_obligall['Simbol_x'].isin(options)) & (df_obligall['Rest'] != 0)
|
|
@@ -338,7 +338,7 @@ class WinMentor(object):
|
|
suppliers = ['401', '403', '404', '408']
|
|
suppliers = ['401', '403', '404', '408']
|
|
adv_suppliers = ['409', '409.01', '409.02', '409.03', '409.04']
|
|
adv_suppliers = ['409', '409.01', '409.02', '409.03', '409.04']
|
|
clients = ['411', '411.01', '418']
|
|
clients = ['411', '411.01', '418']
|
|
- adv_clients = ['419', '419.01', '419.02', '472', '472.01']
|
|
|
|
|
|
+ adv_clients = ['419', '419.01', '419.02', '472', '472.01', '472.02', '472.04']
|
|
if row.loc['Simbol_x'] in suppliers:
|
|
if row.loc['Simbol_x'] in suppliers:
|
|
return 'Furnizor'
|
|
return 'Furnizor'
|
|
elif row.loc['Simbol_x'] in adv_suppliers:
|
|
elif row.loc['Simbol_x'] in adv_suppliers:
|