Rodney Enciso Arias 7 年 前
コミット
2d9553a861
2 ファイル変更14 行追加5 行削除
  1. BIN
      __init__.pyc
  2. 14 5
      static/src/js/account_bank_statement.js

BIN
__init__.pyc


+ 14 - 5
static/src/js/account_bank_statement.js

@@ -37,7 +37,7 @@ openerp.account_bank_statement_print = function (instance, local) {
         // Consultar Statement
         fecthStatement: function(id){
             var defer = $.Deferred();
-            var fields=['id','name','journal_id','user_id','date','balance_start','total_entry_encoding','balance_end','company_id','closing_date'];
+            var fields=['id','name','journal_id','user_id','date','balance_start','total_entry_encoding','balance_end','company_id','closing_date','state'];
             var domain=[['id','=', id]];
             var Statement = new instance.web.Model('account.bank.statement');
             Statement.query(fields).filter(domain).order_by('id').all().then(function(results){
@@ -124,6 +124,7 @@ openerp.account_bank_statement_print = function (instance, local) {
                 total_entry_encoding : accounting.formatNumber(resStatement[0].total_entry_encoding,'0','.',','),
                 balance_end : resStatement[0].balance_end,
                 company_id : resStatement[0].company_id[1],
+                state : resStatement[0].state
             });
             getColumns.push({
                 title : 'Fecha',
@@ -150,6 +151,7 @@ openerp.account_bank_statement_print = function (instance, local) {
                 dataKey: 'line_positive_amount'
             });
             var rows = docItem;
+            console.log(resStatement);
             pdfDoc.autoTable(getColumns, rows, {
                 styles: { overflow: 'linebreak', fontSize: 8, columnWidth: 'wrap'},
                 columnStyles: {
@@ -184,10 +186,17 @@ openerp.account_bank_statement_print = function (instance, local) {
                     pdfDoc.setTextColor(40);
                     pdfDoc.text('Fecha de apertura: ' + doc[0].date, data.settings.margin.left, 25);
 
-                    pdfDoc.setFontSize(10);
-                    pdfDoc.setFontStyle('normal');
-                    pdfDoc.setTextColor(40);
-                    pdfDoc.text(120,25,'Fecha de cierre: ' + doc[0].closing_date);
+                    if (doc[0].state == 'confirm') {
+                        pdfDoc.setFontSize(10);
+                        pdfDoc.setFontStyle('normal');
+                        pdfDoc.setTextColor(40);
+                        pdfDoc.text(120,25,'Fecha de cierre: ' + doc[0].closing_date);
+                    }else{
+                        pdfDoc.setFontSize(10);
+                        pdfDoc.setFontStyle('normal');
+                        pdfDoc.setTextColor(40);
+                        pdfDoc.text(120,25,'Estado de caja: Abierta');
+                    }
 
                     pdfDoc.setFontSize(10);
                     pdfDoc.setFontStyle('normal');