Browse Source

核销单:应收转应收、应付转应付修改

dingyl 7 years ago
parent
commit
6e48d869e0
1 changed files with 2 additions and 2 deletions
  1. 2 2
      frontend/saas-web/app/view/money/verification/FormPanel.js

+ 2 - 2
frontend/saas-web/app/view/money/verification/FormPanel.js

@@ -953,11 +953,11 @@ Ext.define('saas.view.money.verification.FormPanel', {
                     ],
                     ],
                     receivable_to_receivable: ['ifnull(sl_currency,\'RMB\') = \'{vc_currency}\' and ifnull(sl_custid,0)={vc_custid} and ifnull(sl_namount,0)<>0 ' +
                     receivable_to_receivable: ['ifnull(sl_currency,\'RMB\') = \'{vc_currency}\' and ifnull(sl_custid,0)={vc_custid} and ifnull(sl_namount,0)<>0 ' +
                         ' and sl_ym<=DATE_FORMAT(str_to_date(\'{vc_date}\', \'%Y-%m-%d\'),\'%Y%m\')' +
                         ' and sl_ym<=DATE_FORMAT(str_to_date(\'{vc_date}\', \'%Y-%m-%d\'),\'%Y%m\')' +
-                        ' and sl_kind in (\'出货单\',\'销售退货单\',\'期初余额\')'
+                        ' and sl_kind in (\'出货单\',\'销售退货单\',\'期初余额\',\'收款单\')'
                     ],
                     ],
                     payable_to_payable: ['ifnull(sl_currency,\'RMB\') = \'{vc_currency}\' and ifnull(sl_vendid,0)={vc_vendid} and ifnull(sl_namount,0)<>0' +
                     payable_to_payable: ['ifnull(sl_currency,\'RMB\') = \'{vc_currency}\' and ifnull(sl_vendid,0)={vc_vendid} and ifnull(sl_namount,0)<>0' +
                         ' and sl_ym<=DATE_FORMAT(str_to_date(\'{vc_date}\', \'%Y-%m-%d\'),\'%Y%m\')' +
                         ' and sl_ym<=DATE_FORMAT(str_to_date(\'{vc_date}\', \'%Y-%m-%d\'),\'%Y%m\')' +
-                        ' and sl_kind in (\'采购验收单\',\'采购验退单\',\'期初余额\')'
+                        ' and sl_kind in (\'采购验收单\',\'采购验退单\',\'期初余额\',\'付款单\')'
                     ]
                     ]
                 }
                 }
             },
             },