Page Comparison

Make columns no editable in PSL & Invoice

update restriction (it means those rows have psl_id)

In PSL, RECEIVE and ISSUE, both assigned and unassigned (only tables, not include allocate window), set all columns no editable except CONTRACT NO.

for insert new one, still allow user to edit before saving.

Enhancement

1) in new phy trade, if the trade mode is import/export, contract ccy is USD but the received invoice is in CNY, because the value added tax invoice is issued by the customs and not the counterparty, so there will be 2 issues

1. contract ccy and invoice (receive) ccy will be different

2. contract counterparty and invoice (received) counterparty will be different (they can input manually as usually the file they upload does not include invoice (received) counterparty, can refer to the attachment),

so in these situations, how they assign the contract no? the issue is:

1. both contract and invoice (received) have different currencies so they cannot assign the contract no

2. contract and invoice (received) have the same quantity but invoice (received) amount and tax amount do not match those in the contract, because contract is USD amount, but invoice (received) amount is converted from USD into CNY based on customs' own exchange rate to calculate tax amount (same qty is referring to total qty, because each import contract may involved multiple custom declarations. So each import contract may have several invoices but the final invoice total quantity will be exactly the same as the actual contract quantity)

 2) domestic purchase contract, export sale contract (similar to import purchase contract)

for domestic purchase contract they will receive value added tax invoice from counterparty. for domestic sale contract they will issue a value added tax invoice, so the input tax can be offset against the output tax

however, for domestic purchase contract that correspond to export sale contract, the export sale contract is usually denominated in USD. In this case, they will need to deduct the quantity and amount corresponding to the purchase contract from the invoice reserve. This means they have to virtually issue an invoice with a quantity matching the contract qty and an amount matching the corresponding purchase contract's amount.

The problem arises when the sales contract is in USD, but the invoicing currency is CNY. In this situation, the invoice and the contract will have the same quantities, but the invoice amount should correspond to the amount in the purchase contract, not the USD amount in the export sales contract. As a result, the invoice amount will not match the contract amount. How should we handle this situation?

1. ADD column to display trade mode (IMPORT/EXPORT e.g., from contract no) in both unassigned and assigned table; only assigned will have trade mode from contract no

2. if contract no is IMPORT/EXPORT

   1. FE allow user to change CCY and counterparty

3. allow to change in the table only

Enhancement

Copy paste the value, the value is parsed as 29 instead and does not consist any comma on it

• basically affect all physical trade and paper trade number values as they do not support comma

1. check file upload in bulk update settlement

2. copy paste in old execution table, settlement and update settlement tables

3. key in old execution table, settlement and update settlement tables

4. also check other columns with numbers format

dashboard some apps cannot open

Enhancement

estimated price and settlement price in updated settlement table

• Pricing Mode for Fix cant change Ested Price. - so disable edit

• Unable to set settlement price empty for Pricing Mode Fix - so set as red highlight if empty

Enhancement

BE: KGI 2 yrs note pricing issue.

Enhancement

enter any trade execution and click on save got this error

Enhancement

stock mgmt table

• search button doesnt work

stock mgmt table - back to back page:

• according to previous logic qty variation should not be editable when add new row

• according to previous logic counterparty (in) and counterparty (out) should not be editable when add new row

Enhancement

phy trade settlement issue trade qty different from settlement actual qty

this issue is because update phy trade access level is group, which makes user can not update phy_pricing, trade and portfolio calculation accordingly.

How test:

1. user A and user B, and they are in different groups with the same company

   1. user A phy_trade update in group level

2. A create a phy trade

3. B insert settlement price (with a new deal no), without actual qty

4. then A change phy trade Qty

5. then check portfolio trades and p/l correct or not.

if it is correct, then this ticket fixed.

Enhancement

stock management pair details update

stock in/out page branch out into 2 pages - stock in/out and back to back

if btb, user will input in btb page directly

1. in BTB page, if edit either one, the other one will be auto updated

• stock date on the right side is equal to stock date on the left side

• stock type on the left = stock type on the right

• contract qty (in) = qty (in)

2. in BTB page

• when add new row, qty (out) will autofill qty (in)

• after save, when edit qty (out), it will not auto change qty (in)

• if qty (in) is different from qty (out), highlight in green

so new logic for stock in/out - user will not add new row in stock in/out page to input. user will only input stock in and out details and then pair them directly via the pair button in stock details page, and all paired items will appear in the stock in/out page.

1. clash with the current logic of selecting contract no will autofill qty.

so in BTB page, when select contract no., same current logic remains but dont need to auto fill these qty cus they will usually manually input qty

• contract qty (out) 提货数量（出库)

• qty (out) 磅单（出库）

• contract qty (in) 提货数量（入库)

• qty (in) 卸货磅单（入库）

so above written logic is correct, they will only need to input qty (out), so qty (in) and contract qty (in) will be autofilled with qty (out)

qty variation column formula in BTB table = qty (in) - qty (out)

so this should match with bal qty in stock details page

Enhancement

table auto size issue fixed

Enhancement

in new phy trade table, the stock qty column should use contract qty in stock management page, if dont have then use qty in stock management page,

unstock qty calculation is the same logic = UNSTOCK QTY = CONTRACT ACTUAL QTY/QTY(physical trade table) - STOCK QTY (physical trade table) [for reference stock qty is also CONTRACT QTY(stock details)]

Enhancement

in settlement table, the summary calculation at the bottom is wrong

Enhancement

代理执行 allow parent group user to input data on behalf of other child user under its group, other users should be able to view the data input as well

1. add PROXY USER in login page

2. default is untick, disable to edit

3. user is able to tick, then user is able to key in proxy user email

4. after login, BE will return proxy_user_token

   1. if no key in proxy user email, token will be empty

   2. if proxy user email is not in login user groups (including children groups), will raise error

5. In new phy trade, psl payment, inv issue, inv receive 4 page only ATM

   1. show proxy_user email at top before Language

6. if there is proxy_user_token, please pass it to BE by arg

7. Once BE detect if there is proxy_user_token, then will use proxy_user_token to play role in API.

8. check if email shown at the top if login with proxy user email

9. try to insert/update/delete/view with proxy user, see if works

10. when insert or update, check creator or updator is proxy user

Enhancement

Pair:

1. add iron for Pair button

2. select one In row

3. select one or multiple out rows

4. enable Pair Icon

5. click Pair Icon

6. update all match IDs to In row stock ID

7. FE validation (if user select multiple In rows, Pair Icon disabled, by default Pair Icon is disabled)

8. BE validation (if multiple In rows to BE, raise error)

9. for testing purpose, please done point 8 first, if done, then go back to start point 7.

Unpair:

1. default is disabled

2. select multiple Out rows

3. enable Unpair icon

4. click Unpair Iron, remove all match IDs to be empty

5. validation

   1. if there is In row/rows, BE raise error (test first before point 4.b done)

   2. if there is In row/rows, Unpair disabled

Select out rows, Click Pair button than select In row to performance pair function.

contract qty (out) and qty (out) should always be negative

out is always negative

in is always positive

bal qty should only appear in the original stock in row, yes, only original stock in (means only stock id is match id)

Enhancement

add a new API to remove payment_amt, inv_amt or inv_qty if the phy trade is no longer link to psl_payment or inv side

add a new API which could remove payment_amt, inv_amt or inv_qty if the phy trade is no longer link to psl_payment or inv side

testing server

1. phy_trade_id 102910

   1. I purposely remove the contract from inv and psl, but the payment amt, inv amt and inv qty still in the phy trade row. click reset, it is supposed to remove payment amt, inv amt and inv qty

2. phy_trade_id 102917

   1. it is still linked to psl. so click reset, the payment amt should not be changed.

Enhancement

add execution status column into top table in invoice - issue

Enhancement

translate AUTO CO in new phy trade to 生成合同编号

Enhancement

new phy trade - allow select multiple warehouses

stock management update

1. rsp key change from psl to stmg

2. in phy_trade_id dropdown list, wh_id becomes list of wh_id, need FE to update accordingly.

   1. if it is multiple wh_id in the list, FE can show

      1. WH_NAME1/WH_NAME2

      2. WH_ADD1/WH_DDD2

      3. …

3. if wh_id in stmg row not in phy_trade_id wh_id list, highlight to info user that stmg wh is different from wh_id in phy trade

4. auto fill wh_id in stmg row if select contract_no. the wh_id will be 1st wh_id in the list

Enhancement

we need to modify match id logic for swap and reallocate

e.g.,

1. original In row: stock id is 234

2. new swap (reallocate) out:

3. new swap (reallocate) in

logic: (update match id for original row and new out raw and match id = original stock id)

1. original row Match ID = 234

2. new swap (reallocate) out Match ID = 234

3. new swap (reallocate) in Match ID is empty (this one is different from our current logic)

Enhancement

PAIR DETAILS update

1. change Pair Details to STOCK IN/OUT

2. only stock in/out pair need show in this table (both sides must be stock out and stock in) - Only stock action 1 ,2 will be in Pair Details?

Enhancement

ps ledger add and delete contract no cannot save bug fixed

allow psl amt > contract amt

Enhancement

accidental sorting caused issue - all headers that are sorted will be shown in yellow colour

Enhancement

change translation label for stock mgmt stock in/out details

Enhancement

stock mgmt stock in/out table access fixed

Enhancement

1. we use match id instead of link contract no (no more link contract no) all items in stock mgmt with match id will auto appear in pair details table. add new row is only for matching stock in and stock out. swap/reallocate in/out to be done in stock details table using the 2 buttons. if stock in and out is not required to be paired, can do in stock details table

2. one in row could map to many out rows, e.g.

   1. stock in (swap in or reallocate in) 1000 MT, stock id = 122

   2. stock out 200 MT with match id = 122

   3. stock out 100 MT with match id = 122

   4. in above case, there will be two rows

3. in the table, we will show bal qty in the table from select API bal qty = add all match id in stock mgmt’s actual quantity (qty column)

   1. bal qty will base on match id

   2. update bal qty from select API only

   3. FE wont do real time update, it means update bal qty after saving only

4. match id is uneditable, not allowed to edit

5. there are 2 scenarios to insert for match id when add new row, left side stock action is stock out and right side stock action is stock in by default. so user can have multiple stock outs for the same stock in

   1. if user does not select match id (match id is empty), user select contract no instead

      1. insert two rows (stock in and stock out)

      2. match id will be new stock in stock id and assign to the two new rows

      3. stock in columns are editable

6. for update

   1. Only allow update Contract qty and qty for both In and Out

7. change column stock in id, stock out id to IN ID and OUT ID

   1. add a new column for IN and OUT each

      1. STOCK ACTION (not editable)

8. when insert, if no match id, stock action always stock out and stock in

change bal qty to calculate using actual quantity (qty column) instead of contract qty

stock details:

bal qty formula = add all match id’s actual quantity (qty column)

stock in/out details:

1. Bal Qty should only available with IN side

2. Bal qty = In actual qty - out actual qty (simple minus)

3. Bal qty is only needed in pair details table. So i guess we can dismiss Bal qty calculation API

in pair details page, if have wh name, it should auto fill also once select contract no.

in pair details page, when add new row, stock action on left auto fill as STOCK OUT, and on the right auto fill as STOCK IN

if need edit or delete anything, go back stock details page

bal qty = actual qty (in) - actual qty (out)

if out, qty/contract qty is always negative

if in, qty/contract qty is always positive

1. after swap or reallocate, all rows should be reflected in pair details pageyes, two rows

   1. 1st rows is stock in and swap/reallocate out

   2. 2nd rows is swap/reallocate in

2. we use First in and First out to match based on date

3. in 2nd rows, we only have In side, for out side, it is empty.

4. in 2nd rows, bal qty should be in actual qty, since out is empty.

change header with “Sales” to “Out”; “Purchase” to “In”

Qty (Sales) -> Qty (Out) ...

Enhancement

Reallocate and swap in stock mgmt table

when using swap and reallocate function,

1. the match_id value will be insert into 2 rows and match id value is original stock id

   1. original row march_id

   2. new row as long as it is in [reallocate out, swap out, stock out] march_id

2. original match id should be self’s stock_id

3. new out row match id should be original stock_id

4. new in row match id should be empty

Enhancement

New Physical Trades

UNSTOCK QTY logic change in new physical trade table

Now: UNSTOCK QTY = CONTRACT ACTUAL QTY/QTY(physical trade) - CONTRACT QTY(stock details)

new logic: UNSTOCK QTY = CONTRACT ACTUAL QTY/QTY(physical trade) - QTY(stock details)

Enhancement

New Physical Trades

Portfolio Total P/L by Instrument Contract loading message

Portfolio Total P/L by Instrument Contract - when click submit in setting, the loading message shouldnt show “Position Matrix Table”

Enhancement

-

add a new column SIGNED

dropdown

validation: yes

Enhancement

-