Skip to content

Commit

Permalink
Version 11.0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@papyrussolution
papyrussolution committed Mar 21, 2021
1 parent 193ad26 commit 7e55baf
Show file tree
Hide file tree
Showing 36 changed files with 536 additions and 83 deletions.
Binary file modified ManWork/LaTex/ppmanual.pdf
View file
Binary file not shown.
10 changes: 10 additions & 0 deletions ManWork/LaTex/ppmanual.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36354,6 +36354,16 @@
������ ������, � ����� ������������ ��������� ����������� �����������.
��� �������� �� ������������ ������� �������� ��� ������������ ��������, �� �����, ����������
���������.

\item[������������ ������������� ��������� �� ���� �������]
��������� �������� �, ���� �����������, ������������ ������������� ���������� ��������
��� ���� ������� ������. �������� ��������� �������� ��� ���� �� �������������.

\item[�������������� �������� � ������ ������]
����������� �����, ����������� �������� ��� ������� �������� ������ � ������ ������
�� ����������� ��������� �������������, ������� �������� ������-�������� ���������
� ��������������� ������������ ������������������ ������ � ������������ � ���� �������,
������� ��� ����� �������� ���� ��������.
\end{description}

%endtopic
Expand Down
Binary file modified ManWork/Pict/PNG/dlg-f-csess.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Src/Build/versel.dll
View file
Binary file not shown.
10 changes: 10 additions & 0 deletions Src/BuildVC2017/DL600c.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,15 @@
</CustomBuild>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="libjpeg.vcxproj">
<Project>{270b7cae-41a6-43ae-a53d-d06dd9ee84e9}</Project>
</ProjectReference>
<ProjectReference Include="libpng.vcxproj">
<Project>{04aa636d-9d3e-4e79-9c2e-b8d0470719da}</Project>
</ProjectReference>
<ProjectReference Include="libxml.vcxproj">
<Project>{82523a80-856a-4957-bcea-1a5738139141}</Project>
</ProjectReference>
<ProjectReference Include="onig.vcxproj">
<Project>{d115c575-b8ee-3bd7-8046-688a4d145686}</Project>
</ProjectReference>
Expand All @@ -176,6 +185,7 @@
<ClInclude Include="..\Include\Db.h" />
<ClInclude Include="..\Include\dl600.h" />
<ClInclude Include="..\Include\SLIB.H" />
<ClInclude Include="..\Tools\DL600\dl600c.tab.hpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Expand Down
5 changes: 5 additions & 0 deletions Src/BuildVC70/Utils.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DL600c", "DL600c.vcproj", "
ProjectSection(ProjectDependencies) = postProject
{C23C2B5B-224B-475D-8AE3-82289A87602C} = {C23C2B5B-224B-475D-8AE3-82289A87602C}
{D507E468-21FC-4209-A5A8-DE1F055866DC} = {D507E468-21FC-4209-A5A8-DE1F055866DC}
{04AA636D-9D3E-4E79-9C2E-B8D0470719DA} = {04AA636D-9D3E-4E79-9C2E-B8D0470719DA}
{82523A80-856A-4957-BCEA-1A5738139141} = {82523A80-856A-4957-BCEA-1A5738139141}
{0796C89C-07E1-4BDA-BDAE-F023AEB5366C} = {0796C89C-07E1-4BDA-BDAE-F023AEB5366C}
{270B7CAE-41A6-43AE-A53D-D06DD9EE84E9} = {270B7CAE-41A6-43AE-A53D-D06DD9EE84E9}
{530693B1-8B95-4993-8BCF-C0D0E225F4DF} = {530693B1-8B95-4993-8BCF-C0D0E225F4DF}
{D7C20AC1-2566-446F-B49A-598FE7A67094} = {D7C20AC1-2566-446F-B49A-598FE7A67094}
{26070AD0-2D76-41A2-AB8B-864EA198CC6F} = {26070AD0-2D76-41A2-AB8B-864EA198CC6F}
{6DF114F3-4C83-4F5E-AA2C-2CB451949336} = {6DF114F3-4C83-4F5E-AA2C-2CB451949336}
EndProjectSection
Expand Down
4 changes: 3 additions & 1 deletion Src/Doc/VERSION.TXT
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16384,7 +16384,7 @@ Ver 1.2 Date 13/09/96
-FIX: {�����-���������} [11.0.2] ������ � ����� ������� ������������ �����-���������� �� ������� �����-����������
����� ����.
-FIX: {������} ������ � ���������� ������ ������ �� ��������� (������ ��������� ��� ��������� ���������� �����).
20/03/2021 v11.0.4
21/03/2021 v11.0.4
��������!
��� ������ ������� ����������� ����������� ������ TSession � TSessLine.
��� ��, ��������� ������ ������ �������: ������ ���������� �������� �� ���� ��������.
Expand All @@ -16398,6 +16398,8 @@ Ver 1.2 Date 13/09/96
- {DL600} � ���������� ��������� GoodsRest ��������� ������� GetCVatAmount � GetVatAmount ������������ ����� ���
� ����� ����������� � ����� ����������, ��������������. � ������, ���� ����� ������������� ��� ����� "������������ ���"
������� ���������� 0.
- {�������� ������} ������� ��������� ��������� ������������� ����������, �������������� � ����� �������� �������� ������.
����������� ��� ���� �� ��������� ������ � ��������� ��������� �������� ������.
-DEV: ������������ �������� static_assert ��� �������� �����������, ��������� �� ����� ����������.
-DEV: ������� ������� ���������� likely � unlikely ������������� �� ���� ������������ ����������� � �������
�� LIKELY � UNLIKELY ���������������
Expand Down
1 change: 1 addition & 0 deletions Src/Include/Pp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15008,6 +15008,7 @@ class CSessGrouping {
int Grouping(PPID sessID, CSessTotal * pTotal, const LAssocArray * pSubstList, int use_ta);
int UndoGrouping(PPID sessID, LAssocArray * pSubstList, int use_ta);
int ConvertToBills(PPID sessID, PPID locID, const char * pMsg, uint sessNo, uint sessCount, int use_ta);
int TurnAccBill(PPID sessID, PPID locID, int use_ta);
int ConvertTempSessToBills(const PPIDArray * pSessList, PPID locID, PPID * pBillID, int use_ta);
int AttachSessToSupersess(PPID nodeID, PPID sessID, PPID * pSuperSessID, int use_ta);
int CompleteSession(PPID sessID);
Expand Down
16 changes: 8 additions & 8 deletions Src/Include/Private/VERDATA.INC
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
//
// ..\INCLUDE\PRIVATE\VERDATA.INC
// 2021-03-20T18:25:07
// 2021-03-21T15:41:19
// Automaticaly generated file
// Don't modify!
//
0x24, 0x00, 0x00, 0x00, 0x33, 0x30, 0x79, 0x61, 0x52, 0x42, 0x44, 0x33, 0x44, 0x4f, 0x57, 0x45, 0x68, 0x31, 0x52, 0x66, 0x56, 0x32, 0x70, 0x74, 0x74, 0x7a, 0x51, 0x4a, 0x50, 0x59, 0x7a, 0x44,
0x4a, 0x00, 0x0e, 0xb6, 0x00, 0x01, 0x00, 0x00, 0x21, 0xb5, 0x60, 0x0c, 0xca, 0x1c, 0x52, 0xdb, 0xfc, 0x36, 0x99, 0x8a, 0xb0, 0x02, 0x29, 0x2f, 0xfc, 0x76, 0x22, 0xb8, 0x88, 0x70, 0x7a, 0xbf,
0x9a, 0x4c, 0x33, 0xf7, 0x89, 0x2d, 0xbd, 0xd2, 0x17, 0xcb, 0x9e, 0x9f, 0x81, 0x3e, 0x70, 0x3b, 0xd0, 0x5f, 0xc5, 0x1f, 0xa8, 0x8b, 0x93, 0x61, 0xc1, 0x4d, 0x35, 0x5f, 0xdb, 0xb8, 0x21, 0x53,
0x94, 0xce, 0x0e, 0x84, 0xbc, 0x6c, 0xf0, 0xc4, 0x0a, 0x0f, 0xfd, 0x0e, 0xfa, 0xf8, 0x15, 0xa9, 0x16, 0x47, 0x9d, 0x29, 0xe5, 0x3b, 0xf8, 0x23, 0xd3, 0xd7, 0x9b, 0xc6, 0x1a, 0x59, 0xa5, 0x84,
0x51, 0xcf, 0x50, 0x74, 0xeb, 0xeb, 0x4b, 0xc6, 0x0c, 0x1b, 0xe5, 0xf8, 0xde, 0xd5, 0xba, 0x93, 0xc7, 0xad, 0x2f, 0x99, 0x56, 0xd4, 0x67, 0xb2, 0x76, 0xd8, 0x80, 0x5b, 0x8f, 0x21, 0x9d, 0xfc,
0xa3, 0xc3, 0xd0, 0xf8, 0xd2, 0x5b, 0xa5, 0x4d, 0x1f, 0x7b, 0xa0, 0xfd, 0xf7, 0xd4, 0xe1, 0xe5, 0xdf, 0x4e, 0x53, 0x05, 0xc4, 0x39, 0xbb, 0x5b, 0x7e, 0x6c, 0x04, 0x1d, 0x6a, 0x88, 0x89, 0x42,
0xc2, 0x29, 0xad, 0x02, 0xc1, 0xb5, 0xc8, 0x9f, 0x82, 0xf0, 0xc0, 0x65, 0x4d, 0xac, 0xf4, 0x2d, 0x1f, 0x48, 0xe3, 0xec, 0x96, 0xa3, 0x24, 0xc9, 0x91, 0x7e, 0xc0, 0x40, 0xb3, 0x28, 0x62, 0x6f,
0x61, 0xb4, 0x3b, 0x55, 0xfc, 0x34, 0xb8, 0x0b, 0xdc, 0x6c, 0x6d, 0x03, 0xd7, 0x15, 0xa0, 0xe7, 0x8f, 0x2f, 0x03, 0xff, 0x2f, 0xac, 0xa5, 0xd2, 0x79, 0x17, 0xaa, 0x34, 0x79, 0x16, 0xd6, 0x55
0x4a, 0x00, 0x76, 0x11, 0x00, 0x01, 0x00, 0x00, 0x21, 0xb5, 0x60, 0x0c, 0xca, 0x1c, 0x52, 0xdb, 0xfc, 0x36, 0x99, 0x8a, 0xb0, 0x02, 0x29, 0x2f, 0xfc, 0x76, 0x22, 0xc6, 0x88, 0x70, 0x7a, 0xbf,
0x18, 0xde, 0x72, 0x01, 0x55, 0x10, 0xb4, 0x09, 0x59, 0xc0, 0xde, 0x3e, 0xc8, 0x32, 0xed, 0xb6, 0x76, 0xd4, 0xbe, 0x02, 0xb6, 0x4a, 0xe8, 0xb5, 0x4e, 0x25, 0xb1, 0x66, 0x21, 0xc9, 0x16, 0x92,
0xfd, 0x68, 0x33, 0xaf, 0xca, 0x5c, 0x3c, 0x8b, 0x33, 0x76, 0x25, 0x4b, 0xd1, 0x3b, 0xbf, 0x92, 0x14, 0xab, 0x9c, 0x88, 0x7a, 0x05, 0x34, 0xd3, 0xd6, 0x85, 0x61, 0xad, 0x83, 0x1f, 0x5a, 0xc2,
0x51, 0x05, 0x3d, 0x15, 0x1d, 0x7f, 0x66, 0xdc, 0x72, 0x44, 0x91, 0x33, 0x5f, 0xde, 0xbc, 0xd5, 0x49, 0xa1, 0xd6, 0x77, 0x68, 0xfd, 0xcb, 0x14, 0x76, 0x19, 0x31, 0xb2, 0xbf, 0x98, 0xf6, 0xd3,
0x29, 0x90, 0x77, 0x94, 0x8a, 0x4b, 0x2d, 0xc4, 0x3f, 0xa7, 0xb7, 0x13, 0x56, 0xd3, 0x57, 0x56, 0x0c, 0x8f, 0xcc, 0x6f, 0xf8, 0xfa, 0xd2, 0x58, 0x4c, 0x99, 0x98, 0x03, 0x16, 0x59, 0x32, 0xbc,
0xb3, 0x03, 0x35, 0x2d, 0xc4, 0x5e, 0xe4, 0xca, 0x9c, 0xa6, 0xec, 0xba, 0x54, 0x30, 0x68, 0x4f, 0xb5, 0xca, 0xe0, 0x8f, 0x8e, 0x46, 0xe5, 0x01, 0xc6, 0x08, 0x46, 0xbe, 0x56, 0x61, 0x6a, 0xa4,
0x33, 0x43, 0x0c, 0x2c, 0xdb, 0x95, 0x09, 0x36, 0x11, 0x59, 0xbd, 0x94, 0xd6, 0x27, 0x9b, 0x75, 0x46, 0xee, 0x5f, 0x98, 0x25, 0x3e, 0xdd, 0xf2, 0x37, 0xe9, 0x7a, 0x45, 0xae, 0xea, 0xc0, 0x71
37 changes: 19 additions & 18 deletions Src/Include/dl600.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,14 @@ enum DlOperator {
#define DL6FI_REF 205
#define DL6FI_LAST 999

class SetScopeBlk; // @Muxa
class DlScope;
class DlContext;
class DlRtm;
class SCoClass;
class PPView;
class SetScopeBlk; // @Muxa
class DlScope;
class DlContext;
class DlRtm;
class SCoClass;
class PPView;
struct CtmToken;
struct CtmPropertySheet;

typedef uint DLSYMBID;
typedef int (*DlFuncImpl)(SdRecord * pArgList);
Expand Down Expand Up @@ -327,16 +329,6 @@ class DlScope : public SdRecord {
layoutRalative,
layoutAbsolute
};
/* Layout parameters
size: rect
nominal_bounds: rect
padding: rect
margin: rect
justify_content: alignment
grow_factor: float
shrink_factor: float
basis: float
*/
//
// Descr: Идентификаторы констант, используемых для описания опций областей
//
Expand All @@ -354,7 +346,7 @@ class DlScope : public SdRecord {
// Опции диалогов и других элементов UI
//
cuiRect, // raw Координаты области пользовательского интерфейса
cuifCtrlKind, // uint32 Вид управляющего элемента
cuifViewKind, // uint32 Вид управляющего элемента
cuifCtrlText, // string Текст управляющего элемента
cuifCtrlScope, // uint32 Ассоциированная область управляющего элемента
cuifCtrlCmd, // uint32 ИД команды кнопки
Expand Down Expand Up @@ -391,7 +383,8 @@ class DlScope : public SdRecord {
cuifLayoutGrowFactor, // @v10.9.12 float Доля от размера всех элементов контейнера по продольной оси (определяемой флагами fContainerRow и fContainerCol)
cuifLayoutShrinkFactor, // @v10.9.12 float
cuifLayoutBasis, // @v10.9.12 float
cuifLayoutAspectRatio // @v10.9.12 float Отношение высоты к ширине. Используется в случае, если одна из размерностей не определена
cuifLayoutAspectRatio, // @v10.9.12 float Отношение высоты к ширине. Используется в случае, если одна из размерностей не определена
cuifViewTabStop // @v11.0.4 bool
};
struct IfaceBase {
bool FASTCALL IsEqual(const IfaceBase & rS) const { return (ID == rS.ID && Flags == rS.Flags); }
Expand Down Expand Up @@ -532,6 +525,7 @@ class DlScope : public SdRecord {
#ifdef DL600C // {
int AddTempFldConst(COption id, const CtmExprConst & rConst);
int AcceptTempFldConstList(uint fldID);
int AcceptBrakPropList(const CtmPropertySheet & rS); // @v11.0.4
void InitLocalIdCounter(DLSYMBID initVal) { LastLocalId = initVal; }
DLSYMBID GetLocalId() { return ++LastLocalId; }
#endif
Expand Down Expand Up @@ -596,6 +590,12 @@ struct CtmToken {
int Create(uint code, const char * pStr);
int Create(uint code, DLSYMBID id);
CtmToken & Copy(const CtmToken & rS);
bool IsEmpty() const;
//
// Descr: Возвращает true если элемент является идентификатором.
//
bool IsIdent() const;
bool IsString() const;
double GetDouble(uint * pCastFlags) const;
float GetFloat(uint * pCastFlags) const;
int GetInt(uint * pCastFlags) const;
Expand Down Expand Up @@ -964,6 +964,7 @@ class DlContext {
int AddTempFldProp(const CtmToken & rSymb, double val);
int AddTempFldProp(const CtmToken & rSymb, const char * pStr);
int AddTempFldProp(const CtmToken & rSymb, const void * pData, size_t sz);
int ApplyBrakPropList(DLSYMBID scopeID, const CtmPropertySheet & rS);
//
// } Compile-time
// Run-time {
Expand Down
98 changes: 98 additions & 0 deletions Src/PPLib/CCHECK.CPP
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4835,6 +4835,104 @@ int CSessGrouping::Convert(PPID sessID, PPID locID, const void * pData, CSessTot
return ok;
}

int CSessGrouping::TurnAccBill(PPID sessID, PPID locID, int use_ta) // @v11.0.4
{
//
// @todo Эта функция практически один-в-один повторяет соответствующий блок функции CSessGrouping::ConvertToBills
// После отладки и проверки в реальных условиях необходимо объединить эти 2 реализации.
//
int ok = -1;
const PPEquipConfig & r_eq_cfg = CC.GetEqCfg();
if(r_eq_cfg.WrOffAccOpID) {
CSessionTbl::Rec sess_rec;
PPObjAmountType amt_obj;
TaxAmountIDs tais;
BVATAccmArray bva_list;
amt_obj.GetTaxAmountIDs(&tais, 1);
const int do_calc_vat = BIN(r_eq_cfg.WrOffAccOpID && (tais.VatAmtID[0] || tais.VatAmtID[1] || tais.VatAmtID[2]));
THROW(GetSess(sessID, &sess_rec) > 0);
if(sess_rec.Incomplete == CSESSINCMPL_COMPLETE) {
PPObjBill * p_bobj = BillObj;
int is_new_bill = 1;
PPBillPacket pack;
//
CSessTotal total;
THROW(GL.CalcSessTotal(sessID, &total));
THROW(CC.GetSessTotal(sessID, CS.GetCcGroupingFlags(sess_rec, sessID), &total, &bva_list));
//
{
for(PPID bill_id = 0; p_bobj->P_Tbl->EnumMembersOfPool(PPASS_CSESSBILLPOOL, sessID, &bill_id) > 0;) {
BillTbl::Rec bill_rec;
if(p_bobj->Search(bill_id, &bill_rec) > 0 && bill_rec.OpID == r_eq_cfg.WrOffAccOpID) {
THROW(p_bobj->ExtractPacket(bill_id, &pack) > 0);
is_new_bill = 0;
}
}
}
{
PPTransaction tra(use_ta);
THROW(tra);
if(is_new_bill) {
THROW(pack.CreateBlank2(r_eq_cfg.WrOffAccOpID, sess_rec.Dt, locID, 0));
}
else
pack.Rec.Dt = sess_rec.Dt;
p_bobj->SubstMemo(&pack);
THROW(pack.Amounts.Put(PPAMT_MAIN, 0L/*curID*/, total.Amount, 1, 1));
THROW(pack.Amounts.Put(PPAMT_DISCOUNT, 0L/*curID*/, total.Discount, 1, 1));
THROW(pack.Amounts.Put(PPAMT_CS_CASH, 0L/*curID*/, total.Amount - total.BnkAmount - total.CSCardAmount, 1, 1));
THROW(pack.Amounts.Put(PPAMT_CS_BANK, 0L/*curID*/, total.BnkAmount, 1, 1));
THROW(pack.Amounts.Put(PPAMT_CS_CSCARD, 0L/*curID*/, total.CSCardAmount, 1, 1));
THROW(pack.Amounts.Put(PPAMT_CS_AGGRSUM, 0L/*curID*/, total.AggrAmount, 1, 1));
THROW(pack.Amounts.Put(PPAMT_CS_AGGRREST, 0L/*curID*/, total.AggrRest, 1, 1));
if(do_calc_vat) {
if(!is_new_bill) {
THROW(pack.Amounts.Put(tais.VatAmtID[0], 0L/*curID*/, 0.0, 1, 1));
THROW(pack.Amounts.Put(tais.VatAmtID[1], 0L/*curID*/, 0.0, 1, 1));
THROW(pack.Amounts.Put(tais.VatAmtID[2], 0L/*curID*/, 0.0, 1, 1));
}
for(uint i = 0; i < bva_list.getCount(); i++) {
const BVATAccm & r_bva_item = bva_list.at(i);
if(r_bva_item.PRate == fdiv100i(tais.VatRate[0])) {
double vatamt = r_bva_item.PTrnovr * SalesTaxMult(fdiv100i(tais.VatRate[0]));
THROW(pack.Amounts.Put(tais.VatAmtID[0], 0L /* curID */, vatamt, 1, 1));
}
else if(r_bva_item.PRate == fdiv100i(tais.VatRate[1])) {
double vatamt = r_bva_item.PTrnovr * SalesTaxMult(fdiv100i(tais.VatRate[1]));
THROW(pack.Amounts.Put(tais.VatAmtID[1], 0L /* curID */, vatamt, 1, 1));
}
else if(r_bva_item.PRate == fdiv100i(tais.VatRate[2])) {
double vatamt = r_bva_item.PTrnovr * SalesTaxMult(fdiv100i(tais.VatRate[2]));
THROW(pack.Amounts.Put(tais.VatAmtID[2], 0L /* curID */, vatamt, 1, 1));
}
}
}
pack.Rec.Amount = total.Amount;
pack.SetPoolMembership(PPBillPacket::bpkCSess, sessID);
//
// Что бы при ручном редактировании не снесли рассчитанные суммы зафиксируем их.
//
pack.Rec.Flags |= BILLF_FIXEDAMOUNTS;
THROW(pack.InitAmounts());
THROW(p_bobj->FillTurnList(&pack));
if(is_new_bill) {
THROW(p_bobj->TurnPacket(&pack, 0));
Logger.LogAcceptMsg(PPOBJ_BILL, pack.Rec.ID, 0);
}
else {
THROW(p_bobj->UpdatePacket(&pack, 0));
}
THROW(tra.Commit());
}
}
}
CATCH
ok = 0;
Logger.LogLastError();
ENDCATCH
return ok;
}

int CSessGrouping::ConvertToBills(PPID sessID, PPID locID, const char * pMsg, uint sessNo, uint sessCount, int use_ta)
{
int ok = 1;
Expand Down
43 changes: 39 additions & 4 deletions Src/PPLib/V_csess.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1965,25 +1965,60 @@ int PPViewCSess::CompleteSession(PPID sessID)

int PPViewCSess::RecalcSession(PPID sessID)
{
// options
// 0
// 1
// 2
// 3
// 4
// 5
//
int ok = -1;
uint v = 0;
int r = SelectorDialog(DLG_RCVRCSESS, CTL_RCVRCSESS_WHAT, &v);
if(r > 0) {
if(oneof3(v, 0, 1, 2)) {
if(sessID && CsObj.Search(sessID) > 0) {
int level = 0;
if(v == 1)
v = 5;
level = 5;
else if(v == 2)
v = 10;
ok = CsObj.ReWriteOff(sessID, v, 1) ? 1 : PPErrorZ();
level = 10;
ok = CsObj.ReWriteOff(sessID, level, 1) ? 1 : PPErrorZ();
}
}
else if(v == 3) {
PPIDArray sess_list;
PPViewCSess::GetSessList(&sess_list);
CsObj.Recover(sess_list);
}
else if(v == 4) {
else if(v == 4) { // @v11.0.4
PPObjCashNode cn_obj;
PPIDArray sess_list;
PPViewCSess::GetSessList(&sess_list);
if(sess_list.getCount()) {
THROW(CsObj.CheckRights(CSESSRT_CORRECT));
{
CSessGrouping csg;
CSessionTbl::Rec sess_rec;
PPCashNode cn_rec;
{
PPWaitStart();
for(uint i = 0; i < sess_list.getCount(); i++) {
const PPID sess_id = sess_list.get(i);
if(csg.GetSess(sessID, &sess_rec) > 0) {
if(cn_obj.Search(sess_rec.CashNodeID, &cn_rec) > 0) {
csg.TurnAccBill(sess_id, cn_rec.LocID, 1/*use_ta*/);
}
}
PPWaitPercent(i+1, sess_list.getCount());
}
PPWaitStop();
}
}
}
}
else if(v == 5) { // @v11.0.4 4-->5
PPIDArray sess_list;
PPViewCSess::GetSessList(&sess_list);
if(sess_list.getCount()) {
Expand Down
16 changes: 15 additions & 1 deletion Src/PPLib/dlscope.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// DLSCOPE.CPP
// Copyright (c) A.Sobolev 2007, 2008, 2009, 2010, 2011, 2015, 2016, 2017, 2018, 2019, 2020
// Copyright (c) A.Sobolev 2007, 2008, 2009, 2010, 2011, 2015, 2016, 2017, 2018, 2019, 2020, 2021
// @codepage UTF-8
//
#include <pp.h>
Expand Down Expand Up @@ -821,6 +821,20 @@ static const /*DlScopePropIdAssoc*/SIntToSymbTabEntry DlScopePropIdAssocList[] =
return ok;
}

int DlScope::AcceptBrakPropList(const CtmPropertySheet & rS) // @v11.0.4
{
int ok = 1;
const uint _c = SVectorBase::GetCount(rS.P_List);
for(uint i = 0; i < _c; i++) {
const CtmProperty * p_prop = rS.P_List->at(i);
if(p_prop) {
//if(p_prop->Key.Code == T_IDENT) {
//}
}
}
return ok;
}

int DlScope::AcceptTempFldConstList(uint fldID)
{
if(fldID == 0) {
Expand Down
Loading

0 comments on commit 7e55baf

Please sign in to comment.