Przeglądaj źródła

Crear eiru reports corregir quitando timbrado_name.

SEBAS 18 godzin temu
rodzic
commit
fb668e34f2

+ 2 - 8
models.py

@@ -58,7 +58,6 @@ class AccountInvoice(models.Model):
                 'amount_untaxed': invoice.amount_untaxed,
                 'origin': invoice.origin,
 				'comment': invoice.comment,
-				# 'timbrado_name': invoice.timbrado_name,				
                 'residual': invoice.residual,
                 'amount_tax': invoice.amount_tax,
 				'amount_total': invoice.amount_total,
@@ -87,7 +86,7 @@ class AccountInvoice(models.Model):
 				'pricelist_id':[
 					order.pricelist_id.id,
 					order.pricelist_id.name,
-				],
+				],                        timbrado_name: {columnWidth: 20, halign:'center'},
 				'sale_journal':[
 					order.sale_journal.id,
 					order.sale_journal.name,
@@ -145,12 +144,7 @@ class AccountInvoiceLine(models.Model):
 				'supplier_invoice_number':line.invoice_id.supplier_invoice_number,
 				'date_invoice': line.invoice_id.date_invoice,
 				'user_id': [
-					line.invoice_id.   company_id = fields.Many2one(
-        'res.company',
-        string='Compañía',
-        required=True,
-        default=lambda self: self.env.user.company_id
-    )user_id.id,
+					line.invoice_id.user_id.id,
 					line.invoice_id.user_id.name,
 				],
 				'partner_id': [

+ 0 - 5
static/src/js/reports/report_sale_journal.js

@@ -647,7 +647,6 @@ function report_sale_journal(reporting){
                     =======================*/
                     number : item.name,
                     supplier_invoice_number: self.valorNull(item.supplier_invoice_number),
-                    timbrado_name: '',
                     date_invoice : moment(utc._d).format('DD/MM/YYYY'),
                     date : item.date_order,
                     partner_id : self.valorNull(item.partner_id[1]),
@@ -703,7 +702,6 @@ function report_sale_journal(reporting){
                         =======================*/
                         number : item.number,
                         supplier_invoice_number: self.valorNull(item.supplier_invoice_number),
-                        timbrado_name: self.valorNull(item.timbrado_name),
                         date_invoice : moment(item.date_invoice).format('DD/MM/YYYY'),
                         date : item.date_invoice,
                         partner_id : self.valorNull(item.partner_id[1]),
@@ -835,7 +833,6 @@ function report_sale_journal(reporting){
             row.push({
                 number : 'Items: ',
                 supplier_invoice_number: row.length,
-                timbrado_name : ' ',
                 date_invoice : ' ',
                 partner_id : 'TOTALES: ',
                 partner_ruc : ' ',
@@ -868,7 +865,6 @@ function report_sale_journal(reporting){
                     var pdf_columnStyles = {
                         number :{columnWidth: 27, halign:'center'},
                         supplier_invoice_number: {columnWidth: 24, halign:'center'},
-                        timbrado_name: {columnWidth: 20, halign:'center'},
                         date_invoice :{columnWidth: 24, halign:'center'},
                         partner_id :{columnWidth: 52, halign:'left'},
                         partner_ruc : {columnWidth: 18, halign:'left'},
@@ -885,7 +881,6 @@ function report_sale_journal(reporting){
                     var pdf_columnStyles = {
                         number :{columnWidth: 25, halign:'center'},
                         supplier_invoice_number: {columnWidth: 24, halign:'center'},
-                        timbrado_name: {columnWidth: 20, halign:'center'},
                         date_invoice :{columnWidth: 16, halign:'center'},
                         partner_id :{columnWidth: 35, halign:'left'},
                         partner_ruc : {columnWidth: 16.8, halign:'left'},

+ 1 - 1
static/src/reports/report_sale_journal.xml

@@ -114,7 +114,7 @@
                             <tr>
                                 <th data-field="number" data-align="center" data-footer-formatter="Items:">Num.</th>
                                 <th data-field="supplier_invoice_number" data-align="center" data-footer-formatter="itemsCount">N° Fact.</th>
-                                <th data-field="timbrado_name" data-align="center">Timbrado</th>
+                                <!-- <th data-field="timbrado_name" data-align="center">Timbrado</th> -->
                                 <th data-field="date_invoice" data-align="center">Fecha</th>
                                 <th data-field="partner_id" data-align="left" data-width="15%" data-footer-formatter="TOTALES:">Razón Social</th>
                                 <th data-field="partner_ruc" data-align="left" data-width="10%">RUC</th>