Skip to content

董杰 / my_addons

转到一个项目
切换导航栏
切换导航栏固定状态
Commit ba0cacb4 由 董杰
选项

0702

1 个父辈 33c52f61
内嵌 并排
正在显示 6 个修改的文件 包含 28 行增加 和 3 行删除
acct_account/report/purchase_invoice_report.py
...@@ -61,6 +61,7 @@ class AccPurchaseInvoice(models.AbstractModel): ...@@ -61,6 +61,7 @@ class AccPurchaseInvoice(models.AbstractModel):
res = {} res = {}
if len(docids)>1: if len(docids)>1:
final_total = 0.0 final_total = 0.0
final_residual = 0.0
po_names = '' po_names = ''
note_str = '' note_str = ''
bank_str = '' bank_str = ''
...@@ -82,6 +83,7 @@ class AccPurchaseInvoice(models.AbstractModel): ...@@ -82,6 +83,7 @@ class AccPurchaseInvoice(models.AbstractModel):
if invoice_model.invoice_number: if invoice_model.invoice_number:
invoice_str += invoice_model.invoice_number + ',' invoice_str += invoice_model.invoice_number + ','
final_total += amount_total final_total += amount_total
final_residual += invoice_model.residual
res = { res = {
'amount_total':final_total, 'amount_total':final_total,
'po_names':po_names, 'po_names':po_names,
...@@ -89,7 +91,7 @@ class AccPurchaseInvoice(models.AbstractModel): ...@@ -89,7 +91,7 @@ class AccPurchaseInvoice(models.AbstractModel):
'bank_str':bank_str, 'bank_str':bank_str,
'invoice_str':invoice_str, 'invoice_str':invoice_str,
'today':today, 'today':today,
'residual':invoice_model.residual 'residual':final_residual
} }
else: else:
po_names = '' po_names = ''
......
acct_purchase/views/acc_purchase_report_view.xml
...@@ -194,7 +194,6 @@ ...@@ -194,7 +194,6 @@
<td class="text-center"> <td class="text-center">
<span t-field="line.product_id.product_tmpl_id.product_describe_cn"/> <span t-field="line.product_id.product_tmpl_id.product_describe_cn"/>
</td> </td>
<td class="text-center"> <td class="text-center">
<span t-field="line.product_id.product_tmpl_id.brand"/> <span t-field="line.product_id.product_tmpl_id.brand"/>
</td> </td>
......
acct_sale/models/acc_crm_lead.py
...@@ -108,6 +108,7 @@ class AccCrmLead(models.Model): ...@@ -108,6 +108,7 @@ class AccCrmLead(models.Model):
toaddrs.append(self.env['res.users'].browse(self._uid).login) toaddrs.append(self.env['res.users'].browse(self._uid).login)
# toaddrs = ['jie.dong@neotel-technology.com'] # toaddrs = ['jie.dong@neotel-technology.com']
subjects = "商机{}变更提醒".format(self.name) subjects = "商机{}变更提醒".format(self.name)
message = "商机“{}<br><br>标题：{}<br><br>供应商：{}<br><br>支付条款：{}<br><br>总价：{}<br><br><br>管理部审批完成,请及时处理<br><br><br>谢谢".format(self.name,self.title,self.partner_id.name,self.payment_rule,self.amount_total)
message = "商机“{}”,关联客户“{}”,销售员已变更为“{}”,详细信息请在erp系统中查看".format(self.name,self.partner_id.name,changeuser.partner_id.name) message = "商机“{}”,关联客户“{}”,销售员已变更为“{}”,详细信息请在erp系统中查看".format(self.name,self.partner_id.name,changeuser.partner_id.name)
self.env['acc.tools'].send_report_email(subjects,message,toaddrs) self.env['acc.tools'].send_report_email(subjects,message,toaddrs)
# create = False # create = False
......
acct_sale/report/acc_contract_report_view.xml
...@@ -194,6 +194,15 @@ ...@@ -194,6 +194,15 @@
<table cellspacing="3" style="width:20%;" align="right"> <table cellspacing="3" style="width:20%;" align="right">
<tr> <tr>
<th> <th>
税金(<span t-field="o.pricelist_id.currency_id.name"/>)
</th>
<td>
<!-- <span t-esc="o.amount_total - o.discount_amount - o.ship_fee" t-options='{"widget": "monetary", "display_currency": o.currency_id}'/> -->
<span t-esc="o.amount_tax" t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
</td>
</tr>
<tr>
<th>
合计(<span t-field="o.pricelist_id.currency_id.name"/>) 合计(<span t-field="o.pricelist_id.currency_id.name"/>)
</th> </th>
<td> <td>
......
acct_sale/report/acc_quotation_report_view.xml
...@@ -222,6 +222,7 @@ ...@@ -222,6 +222,7 @@
</td> </td>
</tr> </tr>
</table> </table>
<br/>
<table cellspacing="3" style="width:25%;" align="right"> <table cellspacing="3" style="width:25%;" align="right">
<tr> <tr>
<td style="width:50%;"> <td style="width:50%;">
......
acct_stock/report/accstock_report_views.xml
...@@ -157,8 +157,14 @@ ...@@ -157,8 +157,14 @@
<th> <th>
订单号 订单号
</th> </th>
<th colspan="2"> <!-- <th>
产品名称
</th>
<th>
料号/描述 料号/描述
</th> -->
<th colspan="2">
品名/型号
</th> </th>
<th> <th>
数量 数量
...@@ -174,7 +180,14 @@ ...@@ -174,7 +180,14 @@
<td class="text-center"> <td class="text-center">
<span t-esc="so_obj.partner_ponumber"></span> <span t-esc="so_obj.partner_ponumber"></span>
</td> </td>
<!-- <td class="text-center">
<span t-esc="line.product_id.product_tmpl_id.name"></span>
</td>
<td class="text-center">
<span t-esc="line.product_id.product_tmpl_id.product_model"></span>
</td> -->
<td colspan="2" class="text-center"> <td colspan="2" class="text-center">
<span t-esc="line.product_id.product_tmpl_id.name"></span>
<span t-esc="line.product_id.product_tmpl_id.product_model"></span> <span t-esc="line.product_id.product_tmpl_id.product_model"></span>
</td> </td>
<td class="text-center"> <td class="text-center">
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!