Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

xj qian

2024-07-26 450912c14ede3f1d45211833ab862ab6f1259107

Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

 jrj/project/business/AP/list.RefundGDNLine.Entity.xarch.cpp

@@ -46,12 +46,12 @@
            return 1;
        }

        xstring GetEntityName(int pr)
        xstring GetEntityName(LPARAM pr)
        {
            return L"RefundGDNLine";
        }
                
        xstring GetEntityID(int pr)
        xstring GetEntityID(LPARAM pr)
        {
            int row = dw_list.GetRow();
            xstring id = dw_list.GetItemString(row,m_entityid.c_str());

 jrj/project/business/AP/list.RefundSourcingLine.Entity.xarch.cpp

@@ -83,12 +83,12 @@
            return 1;    
        }
                
        xstring GetEntityName(int pr)
        xstring GetEntityName(LPARAM pr)
        {
            return L"RefundSourcingLine";
        }
                
        xstring GetEntityID(int pr)
        xstring GetEntityID(LPARAM pr)
        {
            int row = dw_list.GetRow();
            xstring id = dw_list.GetItemString(row,m_entityid.c_str());

 jrj/project/business/AP/list.ap.cpp

@@ -61,12 +61,12 @@
            return xcombobox::GetLBText(cbx_type.GetHWND(), h);
        }

        xstring GetEntityName(int pr)
        xstring GetEntityName(LPARAM pr)
        {
            return L"AP3";
        }

        xstring GetEntityIDName(int /*param*/ pr)
        xstring GetEntityIDName(LPARAM /*param*/ pr)
        {
            return L"APID";
        }

 jrj/project/business/Expense/FreightExpenseInput.cpp

Binary files differ

 jrj/project/business/Expense/FreightExpenseList.cpp

Binary files differ

 jrj/project/business/Expense/SampleFee.cpp

Binary files differ

 jrj/project/business/Expense/SampleRequestForm.cpp

Binary files differ

 jrj/project/business/Expense/TestExpense.cpp

Binary files differ

 jrj/project/business/Expense/list.manage.ap.cpp

Binary files differ

 jrj/project/business/Expense/maint.samplesequest.cpp

Binary files differ

 jrj/project/business/GDN/AdvanceChargeList.cpp

Binary files differ

 jrj/project/business/GDN3.maint.cpp

@@ -248,12 +248,12 @@
        return 1;
    }

    xstring GetEntityID(int /*param*/ pr)
    xstring GetEntityID(LPARAM /*param*/ pr)
    {
        return InvoiceID;
    }

    xstring GetEntityName(int /*param*/ pr)
    xstring GetEntityName(LPARAM /*param*/ pr)
    {
        return L"GDN3";
    }

 jrj/project/business/PO/Maint.PaperCard.PO.hpp

Binary files differ

 jrj/project/business/PO/Maint.PurcherItem.cpp

Binary files differ

 jrj/project/business/SO/Apply.SOItem.cpp

@@ -58,12 +58,12 @@
            return 1;
        }

        xstring GetEntityName(int pr)
        xstring GetEntityName(LPARAM pr)
        {
            return L"SaleItem3";
        }

        xstring GetEntityID(int pr)
        xstring GetEntityID(LPARAM pr)
        {
            int row = dw_list.GetRow();
            xstring id = dw_list.GetGuid(row);

 jrj/project/business/VATNotify/list.vatinvoice.cpp

@@ -52,12 +52,12 @@
            return 1;
        }
        
        xstring GetEntityName(int pr)
        xstring GetEntityName(LPARAM pr)
        {
            return L"VATInvoice3";
        }
        
        xstring GetEntityIDName(int /*param*/ pr)
        xstring GetEntityIDName(LPARAM /*param*/ pr)
        {
            return L"VTAInvoiceID";
        }

 jrj/project/total3/viewex.total2.cpp

@@ -111,7 +111,9 @@
                        if (argStr != L"")
                            ar.AddArg(L"arg", argStr);
                        OpenWindow(L"dev:xpage[view.total.arg.vx]", ar);

                        xstring arstr = ar.GetArgString(L"arg");
                        //alert(arstr);
                        if (arstr != L"" && ar.GetArgString(L"action") == L"ok")
                        {
                            argStr = arstr;

 jrj/project/viewobject/customer.view.hpp

@@ -12,7 +12,7 @@
class CustomerView: public ViewObject
{
public:
    static string GetEntityName(int pr)
    static string GetEntityName(LPARAM pr)
    {
        return L"CustomerV3";
    }

 jrj/project/viewobject/purchaseorder.view.hpp

@@ -12,7 +12,7 @@
class PurchaseOrderView: public ViewObject
{
public:
    static xstring GetEntityName(int pr)
    static xstring GetEntityName(LPARAM pr)
    {
        return L"PurchaseOrder";
    }

 jrj/project/viewobject/supplier.view.hpp

@@ -12,7 +12,7 @@
class SupplierView: public ViewObject
{
public:
    static string GetEntityName(int pr)
    static string GetEntityName(LPARAM pr)
    {
        return L"SupplierV3";
    }