https://mafint.atlassian.net/browse/MAF-4148

https://mafint.atlassian.net/browse/MAF-4175

https://mafint.atlassian.net/browse/MAF-4179

share app or dashboard access permission level issue

1. move API function from shared blueprint to the original function blueprint

2. make some modification in get_access_permission_list to ensure user_id is sharing user_id

3. dismiss shared blueprint eventually.

for shared app, now it is the same access level as owner’s app.

we will dismiss shared API access level.

so in this case, the owner of the app should have the same issue : two root portfolio.

if so, then we consider it works well.

Add new condition checking for loading.

In PH, PSL, Receive, Issue, Stock table, since our insert and update API is separated, please add different loading variable key for insert and update.

Update or Insert rows in the following table:
PS Ledgers , Receive / Issue Invoice , Stock Details and see the loading will show when save button is pressed. (FE only do some enhancements on loading icon)

开票页 未开票数量为0的合同仍在列表里

有几个合同，未开票数量和未开票金额为0，但在开票页面一直有，请帮忙查一查是什么原因

开票页 未开票数量和未开票金额计算错误

1. BE already fixed 0 issue. I believe those are old data. so just need do recalculate

2. seems like recalculate function got issue. I think we only need fix this issue.

FE not calculate 未开票数量 when user click recalculate button in issue table

group p/l error

the issue is from daily position recal.

coz our testing data server memory is not enough to do daily recal. so the position of portfolio is not updated yet.

once recal portfolio (in portfolio page). it should be okay.

error message in dashboard

Not an issue, those portfolio have been deleted. need reselect portfolios

APP ENHANCEMENTS for 4. 出入库计划表 STOCK MGMT PLANS

in STOCK MGMT PLANS app

1. it should have two warehouse name columns in app

   1. 1st warehouse should from actual warehouse (stock mgmt table), the columns before stock qty

   2. 2nd warehouse should from phy trade, contract warehouse, the columns is before un_stock_qty

2. add un_stock_qty, which is the same as phy trade table un_stock_qty.

Contract WH column added in Stock Management Plans, the value is from Contract WH in Trades tab.

Assigned licence page cannot be viewable

when swap function

1. we only update qty, but should also update contract qty accordingly

2. stock type in swap out row should be the same as original row stock type

3. stock type in swap in row should be the stock type selected by user in swap panel.

for point 1, I think it works well. qty is the figure that user would like to swap in/out or reallocate in/out partially

for point 2, I think their suggestion is good. so in this case

1. we need to combine swap and reallocate into one. so please remove Reallocate In/Out from BE

2. in swap function, we also allow user to fill up updated warehouse, default is original warehouse.

   1. if they also change warehouse, then we need to update warehouse as well

      1. swap out → warehouse is original warehouse

      2. swap in → warehouse is updated/selected warehouse.

outstanding psl payment app

same as phy trade table

QTY: should be contract actual qty or qty

BAL AMT: should be (contract actual qty or qty) * contract actual price

outstanding invoice app

QTY should be contract acutal qty or qty

cancelled trades enhancement 取消的合同后续处理

in cancel trades page

1. add an icon called DEL SETTLEMENT

2. use is able to multiple select cancelled trade and click it

3. call BE

   1. delete phy_pricing

   2. remove pricing_id from trade execution

   3. delete trades

4. for delete trades, please use the code below coz it will trigger recal

once del settlement, it means no trade in portfolio, no p/l calculation. if user change those cancelled trade to normal trade, they need re-insert settlement.

当一个现货合同取消以后，需要满足以下要求 when a contract is cancelled, the following requirements need to be met:

1. 已取消的合同不应该再计算盈亏，在交易组合盈亏明细或是组别盈亏报表里如何不体现已取消的合同？The cancelled contract should no longer be considered for profit and loss calculations. How can the cancelled contract be excluded from the portfolio's p/l details or group p/l app?

1. check if related trade deleted

2. check if related settlement deleted (remove from update settlement table, appear into settlement table)

in delete API for phy trade API, BE will delete more other things, such as

1. delete phy trade

2. delete deal/portfolio if empty

3. delete inc/exp

4. …

to delete settlement (current delete), we only

1. delete phy_pricing

2. update trade execute to remove pricing_id

3. delete trade (trigger recal)

this is because we do not delete phy_trade data.

filter issue in psl allocate table

1. apply filter in lower table

2. add trade into middle table

3. remove trade from middle table

4. lower table filter gone.

we should keep filter in lower table

OPEN POSITION DETAILS app

1. add PRICED IN tick box in settings

2. key: inc_priced_in

   1. True if ticked else false

   2. default is unticked

   3. keep value without reset.

fyi if tick priced in, will show all priced in true and false, if never tick then will only show priced in false

cancel phy trade validation check

before user convert phy trade contract to cancel, BE need to do validation

1. if there is any exp_inc linked to the phy_trade

2. if there is stock_mgmt linked to the phy_trade

3. if there is psl linked to the phy_trade

4. if there is invoice linked to the phy_trade

if any, raise error to FE.

entity management table export issue 230815 公司数据设置导出格式

new app: 1. 发票存量表 INVOICE BALANCE REPORT

new app: 4. 出入库计划表 STOCK MGMT PLANS

new app: 5.在库库存表 INVENTORY DETAILS

delete phy deal and portfolio in delete settlement

when delete settlement, we need to check if delete the deal and portfolio, the steps are

1. remove phy_deal_id from cancelled phy trade

2. check if the phy_deal is empty

   1. if empty, delete phy_deal and linked portfolio.

reference code could be found in deal phy trade function

Digital invoice

HT-230727 全电开票申请

add a new issue icon to for digital invoice

1. add a new issue icon → DIGITAL INVOICE

2. select rows (un-issue), click DIGITAL INVOICE

   1. only available in un-issue table

   2. selected rows must have INVOICE SERIES NO value (BE will add it), otherwise, disable DIGITAL INVOICE icon

3. export two excels

   1. same logic as our current ISSUE icon

   2. excel format as below

1. 1st excel: for all INVOICE TYPE is special

   1. header must be in Chinese, follow the table below

   2. how to map to MAF

   3. sheet 1:

   4. sheet 2:

2. 2nd excel: for all INVOICE TYPE is normal

3. 1st excel and 2nd excel header seems like the same.

4. we need to export header and value in the each sheet (1 and 2 sheet), ensure the order of header is the same as the file attached from haitian saide.

5. need to add invoice code column in issue table, please refer to below logic - basically add invoice code column (non uneditable) in issue table, so will auto fill up invoice code according to the counterparty. invoice code is

   • not must item in company data (entity mgmt) table

   • but must item in issue table (as invoice code is required for issuing digital invoice), non editable so will auto fill from company data

6. then they can issue digital invoice after fill up.

7. in 1-发票基本信息 sheet, FE will show one row if any duplicate row

   1. unique key: [invoice series no, counterparty and invoice code]

ps ledger allocate wrong - ps ledger calculation incorrect

Unstock Qty should be = ( CONTRACT ACTUAL QTY if have else using QTY ) - STOCK QTY

After deleted stock details for this phy trade id, UNSTOCK QTY is empty, from the issue mentioned above should be equals to ( CONTRACT ACTUAL QTY if have else using QTY )

ps ledger bug

digital invoice issue 230808 全电开票申请导出格式错误

issue 1:

1. in 1-发票基本信息 sheet, FE will show one row if any duplicate row

   1. unique key: [invoice series no, counterparty and invoice code]

issue 2:

when export into digital invoice, please change all number to positive. and must be in number format.

1. when upload file in issue table, those columns linked to items (inv setting table in company data) should get value from dropdown list of items, instead of reading value from uploaded file

2. those columns in issue table linked to items, should not be editable.

3. if can not find contract no, then raise error to remind user

4. if can not find items, then raise error to remind user too.

230809 收票分批错误

invoice unissued table, add a new row or click any row at the top and key in all the required fields and save and got this error

issue bottom table calculation issue

in issue invoice, when click on digital invoice, it should auto jump from unassigned table to assigned table

add common term into API controller

for controlling settings for entity management in company data

ps ledger allocate wrong

不能保存的问题

付款金额44439，几个合同的尾款正好也是44439，但是分批里面选了合同以后，还有尾款金额

issue 1:

1. in 1-发票基本信息 sheet, FE will show one row if any duplicate row

   1. unique key: [invoice series no, counterparty and invoice code]

issue 2:

when export into digital invoice, please change all number to positive. and must be in number format.

全电开票申请导出格式错误

全电开票申请导出问题：

1. 发票基本信息：一个发票流水号只显示一条，不能重复显示(下面这个流水号是2的有两条记录，应该只保留一条记录)

2. 发票明细信息：

1） 导出的开票申请数量必须是正数，且是数值格式

2） 单价必须是数值格式

3） 金额必须是正数，且是数值格式

收票分批错误

在收票里进行分批时，选中合同号到中间框里后，分类账种类红色错误

new phy trade button go to issue tab instead of trades tab

invoice calculation issue - balance amt is 0.01

230807 合同页未收货/出库数量计算错误

如下图，

1）合同数量31.9吨，出入库数量63.8吨，未收货数量应该=合同数量（有实际数量用实际数量，无实际数量用合同数量）-出入库数量=-31.9吨，但是现在显示却是31.9吨，

2）当一个合同没有出入库数量时，未收货数量应该等于合同数量，但是现在显示是空白

1. Unstock Qty should be = ( CONTRACT ACTUAL QTY if have else using QTY ) - STOCK QTY

2. After deleted stock details for this phy trade id, UNSTOCK QTY is empty, from the issue mentioned above should be equals to ( CONTRACT ACTUAL QTY if have else using QTY )

ps ledger bug

这个问题又带出一个新的BUG,今天我们同事在分批认领的时候没有注意，认领完发现不对，就取消了分批，当时金额就不对了，重新合并以后金额也还是不对

这笔金额原本是4250061.90，现在在MAF里变成了10347976.80.

the bug should be fixed if two tickets above fixed.

btw, the user data is not able to change back. need them to change the amt manually.

ps ledger allocate issue when copy paste in amount in 2nd table will have error

还是采销资金分批的问题，第一个视频是我同事的账号操作的，认款认完还剩一点尾款，所以想放进一笔合同里去，可是上面那个金额不会变成0

下面那个视频是我的账号操作的，上面那个金额会变成0，我们都是用的中国服务器，也都刷新过几次

这会跟权限有关系吗？

in psl ledger table and allocate table, un payment amt link to Amount decimal point in settings.

test

1. Group P/L Chart use it as dropdown and Portfolio P/L Details use it to map the label of company

2. paper and broker table

to check if company in dropdown list correct.

i put temp solution.

when go to phy_trade and stock mgmt table, BE will get stock dropdown list in company level.

How to test:

1. two users from two different groups to create stock rows in stock table

2. any one of the user go to phy trade and stock mgmt page/table is able to find both stock rows in dropdown list of stock.

each one create one

but they are not in the same group

so go to phy trade and stock mgmt tables, each user should be able to view both warehouses in dropdown list. coz it is company data

both user in phy trade and stock mgmt select API are group level

counterparty missing if dont select contract no in ps ledger

Enhancement

new phy trade button go to issue tab instead of trades tab

Enhancement

uppercase labels in company data page

Enhancement

upload issue invoice and stock mgmt template error

upload ps ledger and received invoice but no contract no uploaded - no issue need adjust date range

cannot load issue invoice and stock mgmt after adjusting date range

warehouse duplicate

warehouse data should be in company lvl for all of groups. please change access permission to company level.

stock mgmt table group row issue

1. in stock mgmt page, group row by WH NAME will have this issue

2. unable to group MATCH ID row also

issued table bottom table trade mode missing

dashboard outstanding invoice not translated

ps ledger allocate issue

• sign of amount should be on ledger type. positive for paid and negative for received.

• basically for a purchase contract the qty/amt should be positive value. but in the event that the unpayment amt becomes negative (they should receive the amount instead of paying) so if the psl amount and unpayment amt are the same, 1st table should be 0, 2nd table should be unpayment amount, 3rd table original is unpayment amount, after clicking it will shift to 2nd table so unpayment amt is 0

invoice bug - inv date empty, inv amount and inv qty not empty, after deleting invoice item in issued invoice table

• click on reset psl and invoice button to reset

1. Change Reset PSL to Reset PSL and Invoice - button should reset both psl and invoice data

2. works for both ps ledger and invoice if tick individual contract and reset, but if tick all it does not work

when delete ps ledger or invoice (receive and issue) that consist of contract no that do not belong to user or user group under applicable access permission settings, raise error - already exist

error in physical trade

select contract warehouse in new phy trade table not company level

temp solution:

when go to phy_trade and stock mgmt table, BE will get stock dropdown list in company level.

How to test:

1. two users from two different groups to create stock rows in stock table

2. any one of the user go to phy trade and stock mgmt page/table is able to find both stock rows in dropdown list of stock.

each one create one

but they are not in the same group

so go to phy trade and stock mgmt tables, each user should be able to view both warehouses in dropdown list. coz it is company data

both user in phy trade and stock mgmt select API are group level

issue invoice bottom table specification is missing

outstanding psl payment and outstanding invoice shared link different data in live server

• it is because access permission level different. please make sure shared API select in company level.

outstanding psl payment app summary is missing in group dashboard

in received invoice, once i select company and select contract no, the dropdown list should only filter by below, but now it still shows all trade modes besides import/export:

• we do not save phy trade mode.

1. if user select phy trade mode as import/export, then dropdown list contact no filter key will be

   1. company id

   2. phy trade mode = import/export

can ignore this for received invoice, but already done for issued invoice

if user already select contract no, then just auto fill up phy trade mode.

if phy trade mode is import/export based on contract no selected, then we allow different

1. counterparty

2. curreny

otherwise, we do not allow.

Dashboard new app 未了结发票表 outstanding invoice

basically, API is to select phy trade on condition

1. date start from to

2. stock qty is not 0

3. inv qty != stock qty

4. outstanding inv qty = stock qty - inv qty

5. outstanding inv amt = outstanding inv qty * (actual_price or contract_actual_price)

   1. actual_price is settlement price in settlement table

add INVOICE SERIES NO after INVOICE ID in issue invoice table

key: inv_series_no

format: text

not must

chinese: 发票流水号

upload ps ledger and received invoice but no contract no uploaded - no issue need adjust date range

ps ledger missing contract no

the reason can not find contract no due to from date to date

those contract nos which are not seen are happened before from date, so can not show the contract no.

it should due to data migration some phy trade from one group to another group. e.g,

另外增加一条，产品是“PS-EB”的从能化-塑料迁移到”能化-EB“

in this case, 能化-塑料 group can not view the assigned psl due to those assigned contract no now is in 能化-EB.

I guess if 能化-EB group user should be able to see the assigned psl.

Dashboard new app 未了结款项表 outstanding psl payment

basically, API is to select phy trade on condition

1. date start from to

2. unstock qty close to 0

3. BAL AMT is not close to 0

   1. if user select PSL

Cancelled Trades ps ledger and stock mgmt enhancement for completed payment/stock in/out 取消的合同后续处理

add bulk stock in/out and bulk psl in cancel trade table, same as bulk stock in/out in phy trade table.

bulk psl in cancel table:

it is the same idea as bulk stock in/out.

1. select cancelled trades

2. click bulk psl

3. pop up table for psl with contract no those base information

4. then use fill up other necessary info in the row

5. save to insert into psl

合同页添加实际出入库数量和磅盈/磅亏 add QTY and QTY VARIATION columns into the new physical trade table

Due to the current practice of logistics team being responsible for recording in stock management page, and since logistics team is the parent group of the business team, the business team cannot view the stock management data recorded by logistics team. Therefore, it is necessary to add QTY and QTY VARIATION columns (from stock mgmt table: stock details) into the new physical trade table (place next to STOCK QTY column). This will enable the business team to clearly see the discrepancies between the contracted quantities and the actual quantities, and qty variation

solution:

1. in our phy trade table, there is a STOCK QTY, i believe it is linked to stock_contract_qty. please add one more column called STOCK ACTUAL QTY, link to stock_qty. same logic as STOCK QTY calculation

2. add one more column called QTY VARIATION after STOCK ACTUAL QTY, same formula in stock management table.

save trade got error for some contracts

issue invoice undo and save button

new app - 6.每日出入库表

Just enable group function for stock detail table.

aggregate qty and contract_qty

received invoice allocate function doesnt work, last panel is empty, currently import/export trades dont work in issue and received invoice

export excel issue

trade mode in receive invoice is number in assigned table