From e6612fc8be93f71ffdab828b8ad77ff145cc9099 Mon Sep 17 00:00:00 2001 From: sonal arora Date: Sun, 13 Sep 2020 08:59:13 +0000 Subject: [PATCH] work on report --- .../purchase_requisition.cpython-36.pyc | Bin 5766 -> 6044 bytes .../__pycache__/sale_order.cpython-36.pyc | Bin 5080 -> 4470 bytes .../__manifest__.py | 1 + .../fency_report_deliveryslip.xml | 3 +- .../models/account_invoice.py | 4 +- .../models/inter_company_transfer_ept.py | 93 ++++++++++-------- intercompany_transaction_ept/models/sale.py | 4 +- .../__pycache__/__init__.cpython-36.pyc | Bin 205 -> 166 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 212 -> 173 bytes .../models/__pycache__/groups.cpython-36.pyc | Bin 962 -> 935 bytes reports/__manifest__.py | 2 +- reports/__pycache__/__init__.cpython-36.pyc | Bin 197 -> 158 bytes reports/__pycache__/account.cpython-36.pyc | Bin 1230 -> 976 bytes reports/views/account_report.xml | 2 +- reports/views/report_payment_receipt.xml | 2 +- .../__pycache__/__init__.cpython-36.pyc | Bin 190 -> 169 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 198 -> 242 bytes .../models/__pycache__/product.cpython-36.pyc | Bin 782 -> 911 bytes tra_backend_Product/models/account_move.py | 2 +- .../__pycache__/__init__.cpython-36.pyc | Bin 202 -> 163 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 216 -> 177 bytes .../__pycache__/job_contracts.cpython-36.pyc | Bin 995 -> 982 bytes 22 files changed, 64 insertions(+), 49 deletions(-) diff --git a/MKS_Tradex_Backend_2/models/__pycache__/purchase_requisition.cpython-36.pyc b/MKS_Tradex_Backend_2/models/__pycache__/purchase_requisition.cpython-36.pyc index 50e4ab7eb9e1915af5f2c276e5c463387ce328d2..a5d3f335499feab1f23365bb9b3d59e76dc9309a 100644 GIT binary patch delta 536 zcmYk1&r2IY6vyZ7&i-gZj9OijXlwil5lj*Pfq+GOkRmmg4uu$f6J5}N4>96NnED{*_IxMhfQ%k_kX23p8&%aGwyJI2n^41~;bS$7nvtw;Du;fp@YGSVO#!A>7Ps8;-G@-1ZI UqPGUEc+*>kQXF_iKHg`}Umrt(L;wH) delta 287 zcmbQE-=0R)Q)E(PQ{+2BKH;S1UWjFgU zJF_q2mFFpf40pO+%~8L6`|#rCAhj&@`(ST!3g zk3(VhyTU?I{>pX?XYafl46+r$!S+n6*%S^Y-)2kxjk@j8wz4DNu)?N7#iHy}?yUsL zbH3wQp6xV(c+;-j_M3sa#9c1#a0udpd%kGAO)g@F!vRXRLYPDvB{_VbS>g@PsufCD z$ajM-v*Og7zQ;`w#!WYj>usWdBM1`f*&yb6ZI0k;j}(Wo37Ly7vVpZqbd|9Y`6{-Y zJw$9I;obG57?(@&<&FuAi4Z0!+bi1>y=+uIkH21-#(>s!+Ghy4A3%DD$6*73D*<*%MY}Vbv`g<+Ws4|wB=>`=2$fFlms7bx>F2t44bb0x2)ZJ4@&{Y~5c&J%FS$j7&I>Z{JTP&L z(q)3n1O~w}!4-n51lI^QzQ})Hl1N}8j?0~s^PRi){bqM|ZuU2`JL5l( z{XA`*D;BLI4?nR_SD#q2|47p`t~D5F4INk`#f?@P-heZ37S6#8oQDf=5iY?j%&p|1 z3ZpQF?;+4({BgFCfeASLP-|r22uz|h;V2wKnS)p0I7$mnz!b_nOv6c(1*pNRD2wnK zoI+WG;_FbyK^acp)N1qc3Y*bASN7Q4)sfGfwhK_14I{Uy_O-W1q3v`! zB3R|{_sHsw>D~3ofq^PF1qU~hKd`DS=tm0qn@*dDlOGG@ixICLM?Ibo zd0Oz0M@!PSenoeS`7w50evx17$03%`qGl!W?1nN&RCc3Xpy{5-FtMb)Oz;jtoQ?Nr zGzjb^aiNJCb(&I^Mp91u+OwI$L59Sx7bjw3C*(K9!~JXIC}wy7N45O_FuYFY3j}*; zS}&s67)q{|-33);p zH}p&6OZSO#6@G^hX~4D^(>Aph+tOmGZ)rV-^HhtfSl?njoo0|4)moWNwC<%gQ?0D{ z7SW^;7`UE;^r*I#>gl_)$Rg`a2K@|V!Q63~18Yl%EY9HFp!W9%>Vb-Es{(x0Z%uAh z*>l8wI}B_mv_oX7ip_2q1)kk@)`M;&KBqA9NUh23q?(6fIyUgIDclZu+8A*~JxNzs z@8iH;bA7<53<_yuI1WA8nb$oYhSUsl=vWL>q^2^W^$u6LRhO^D!Kxg^n1r1sZK$&G zB8HNQ9I?V9O06I92T{^>^d;etucGMB6Jv|}VOMZF@VVM=FC!g0&ix=MNpamH(-eA3 z+8O0tRcyh1Jiy(Qrd$Y>aW@Fss<7rp_u?ADomGx#+rH!RS~@8@>}q{2K0jp+wo<8P z^x*j(M!Sq8>9W7-2H3ReB4F|%z@_jkg2v4FDX|L6umie|vkcR>pAyP_sbpqs>oz9o z^4WnHMef^&vB$fdFF%sAm4!TYPH~Rl1NnP?;^ZwFh6KC4IQiosT^1pOZ&;TZBWEyg8Xr{9FJNe~M^ - @@ -198,7 +197,7 @@ - + diff --git a/intercompany_transaction_ept/models/account_invoice.py b/intercompany_transaction_ept/models/account_invoice.py index 76b3885..54c77ec 100644 --- a/intercompany_transaction_ept/models/account_invoice.py +++ b/intercompany_transaction_ept/models/account_invoice.py @@ -11,9 +11,9 @@ class AccountInvoice(models.Model): @api.model def create(self, vals): res = super(AccountInvoice, self).create(vals) - order_id = self.env['sale.order'].search([('name', '=', res.origin)]) + order_id = self.env['sale.order'].search([('name', '=', res.name)]) if not order_id: - order_id = self.env['purchase.order'].search([('name', '=', res.origin)]) + order_id = self.env['purchase.order'].search([('name', '=', res.name)]) if order_id and order_id.intercompany_transfer_id: res.intercompany_transfer_id = order_id.intercompany_transfer_id.id return res diff --git a/intercompany_transaction_ept/models/inter_company_transfer_ept.py b/intercompany_transaction_ept/models/inter_company_transfer_ept.py index 04ddfb1..392cce9 100644 --- a/intercompany_transaction_ept/models/inter_company_transfer_ept.py +++ b/intercompany_transaction_ept/models/inter_company_transfer_ept.py @@ -193,11 +193,11 @@ class InterCompanyTransfer(models.Model): if configuration_record.auto_confirm_orders: for order in sale_orders: order.write({'origin':record.name or ''}) - order.sudo(sale_user_id).action_confirm() + order.with_user(sale_user_id).action_confirm() for order in purchase_orders: order.write({'origin':record.name or ''}) - order.sudo(purchase_user_id).button_confirm() + order.with_user(purchase_user_id).button_confirm() @@ -207,11 +207,11 @@ class InterCompanyTransfer(models.Model): context = {"active_model": 'sale.order', "active_ids": [order.id], "active_id": order.id, 'open_invoices':True} if sale_journal: context.update({'default_journal_id':sale_journal.id}) - payment_id = sale_advance_paymentobj.sudo(sale_user_id).create({'advance_payment_method': 'delivered'}) - result = payment_id.with_context(context).sudo(sale_user_id).create_invoices() + payment_id = sale_advance_paymentobj.with_user(sale_user_id).create({'advance_payment_method': 'delivered'}) + result = payment_id.with_context(context).with_user(sale_user_id).create_invoices() result = result.get('res_id', False) - invoice_id = invoice_obj.sudo(sale_user_id).browse(result) - invoice_id.sudo(sale_user_id).write({'date_invoice':str(datetime.today()), 'intercompany_transfer_id':self.id}) + invoice_id = invoice_obj.with_user(sale_user_id).browse(result) + invoice_id.with_user(sale_user_id).write({'date_invoice':str(datetime.today()), 'intercompany_transfer_id':self.id}) vendor_bill_id = False @@ -221,26 +221,26 @@ class InterCompanyTransfer(models.Model): context.update({'default_journal_id':record.destination_company_id.purchase_journal.id}) invoice_dict = self.prepare_invoice_dict(record, purchase_partner_id, porder) - invoice_vals = invoice_obj.sudo(purchase_user_id).with_context(context).new(invoice_dict) + invoice_vals = invoice_obj.with_user(purchase_user_id).with_context(context).new(invoice_dict) invoice_vals.purchase_id = porder.id - invoice_vals.journal_id = invoice_vals.sudo(purchase_user_id)._default_journal() - invoice_vals.sudo(purchase_user_id).purchase_order_change() - invoice_vals.sudo(purchase_user_id)._onchange_partner_id() + invoice_vals.journal_id = invoice_vals.with_user(purchase_user_id)._default_journal() + invoice_vals.with_user(purchase_user_id).purchase_order_change() + invoice_vals.with_user(purchase_user_id)._onchange_partner_id() invoice_vals.date_invoice = str(datetime.today()) - invoice_vals.sudo(purchase_user_id)._onchange_payment_term_date_invoice() - invoice_vals.sudo(purchase_user_id)._onchange_origin() + invoice_vals.with_user(purchase_user_id)._onchange_payment_term_date_invoice() + invoice_vals.with_user(purchase_user_id)._onchange_origin() invoice_vals.currency_id = record.currency_id for line in invoice_vals.invoice_line_ids: line.quantity = line.purchase_line_id and line.purchase_line_id.product_qty or 0.0 - line.sudo(purchase_user_id)._compute_price() + line.with_user(purchase_user_id)._compute_price() vendor_bill_id = invoice_obj.sudo(purchase_user_id).with_context({'type':'in_invoice'}).create(invoice_vals._convert_to_write(invoice_vals._cache)) vendor_bill_id.intercompany_transfer_id = self.id if configuration_record.auto_validate_invoices: - invoice_id.sudo(sale_user_id).action_invoice_open() - vendor_bill_id.sudo(purchase_user_id).action_invoice_open() + invoice_id.with_user(sale_user_id).action_invoice_open() + vendor_bill_id.with_user(purchase_user_id).action_invoice_open() record.write({'state':'processed', 'processed_date':datetime.today(), 'message':'ICT processed successfully by %s' % (self.env.user.name)}) @@ -272,6 +272,7 @@ class InterCompanyTransfer(models.Model): def create_internal_transfer(self): + procurements = [] picking_obj = self.env['stock.picking'] procurementgroup_obj = self.env['procurement.group'] stocklocation_route_obj = self.env['stock.location.route'] @@ -282,13 +283,24 @@ class InterCompanyTransfer(models.Model): group_id = procurementgroup_obj.create({'name': self.name, 'partner_id': dest_wh.partner_id.id}) self.group_id = group_id.id route_ids = stocklocation_route_obj.search([('supplied_wh_id', '=', dest_wh.id), ('supplier_wh_id', '=', source_wh.id)]) + print('routeuuuuuuuuuuuuuuuuuuuuuuuuu',route_ids) if not route_ids: raise ValidationError(_("No routes are found. \n Please configure warehouse routes and set in products.")) if not self.intercompany_transferline_ids : raise ValidationError(_("No Products found. \n Please add products to transfer.")) for line in self.intercompany_transferline_ids: - procurementgroup_obj.run(line.product_id, line.quantity, line.product_id.uom_id, dest_wh.lot_stock_id, self.name, False, values={'warehouse_id':dest_wh, 'route_ids':route_ids and route_ids[0], 'group_id':self.group_id}) + print('comppppppppppppppppp',self.source_warehouse_id.company_id) + #values={'warehouse_id':dest_wh, 'route_ids':route_ids and route_ids[0], 'group_id':self.group_id,'product_id':line.product_id.id,'qty_rounded':line.quantity,'product_uom':line.product_id.uom_id,'location_id':dest_wh.lot_stock_id,'name':self.name,'company_id':self.source_company_id.id } + #procurementgroup_obj.run([values]) + values={'warehouse_id':dest_wh, 'route_ids':route_ids and route_ids[0], 'group_id':self.group_id} + #procurementgroup_obj.run(line.product_id, line.quantity, line.product_id.uom_id, dest_wh.lot_stock_id, self.name, False, values) + procurements.append(self.env['procurement.group'].Procurement( + line.product_id,line.quantity,line.product_id.uom_id,dest_wh.lot_stock_id,self.name,'abc',self.source_company_id,values + + )) + procurementgroup_obj.run(procurements) + print('lllllllllllllll',procurementgroup_obj) pickings = picking_obj.search([('group_id', '=', group_id.id)]) @@ -317,25 +329,25 @@ class InterCompanyTransfer(models.Model): source_warehouse_id = record.source_warehouse_id intercompany_user = source_company.sudo().intercompany_user_id.id or False partner_id = record.destination_company_id.sudo().partner_id - order_vals = sale_obj.sudo(intercompany_user).new({'partner_id':partner_id.id, 'warehouse_id':source_warehouse_id.id, 'pricelist_id':self.price_list_id.id}) - order_vals.sudo(intercompany_user).onchange_partner_id() + order_vals = sale_obj.with_user(intercompany_user).new({'partner_id':partner_id.id, 'warehouse_id':source_warehouse_id.id, 'pricelist_id':self.price_list_id.id}) + order_vals.with_user(intercompany_user).onchange_partner_id() order_vals.warehouse_id = source_warehouse_id.id - order_vals.sudo(intercompany_user)._onchange_company_id() - order_vals.fiscal_position_id = partner_id.sudo(intercompany_user).property_account_position_id.id + order_vals.with_user(intercompany_user)._onchange_company_id() + order_vals.fiscal_position_id = partner_id.with_user(intercompany_user).property_account_position_id.id order_vals.pricelist_id = self.price_list_id.id if record.crm_team_id: order_vals.team_id = record.crm_team_id.id - order_vals = order_vals.sudo(intercompany_user) - sale_order = sale_obj.sudo(intercompany_user).create(order_vals._convert_to_write(order_vals._cache)) + order_vals = order_vals.with_user(intercompany_user) + sale_order = sale_obj.with_user(intercompany_user).create(order_vals._convert_to_write(order_vals._cache)) so_lines_list = [] for line in record.intercompany_transferline_ids: - line_vals = saleline_obj.sudo(intercompany_user).new({'order_id':sale_order.id, 'product_id':line.product_id}) - line_vals.sudo(intercompany_user).product_id_change() - line_vals.sudo(intercompany_user).product_uom_qty = line.quantity + line_vals = saleline_obj.with_user(intercompany_user).new({'order_id':sale_order.id, 'product_id':line.product_id}) + line_vals.with_user(intercompany_user).product_id_change() + line_vals.with_user(intercompany_user).product_uom_qty = line.quantity line_vals.price_unit = line.price - line_vals = line_vals.sudo(intercompany_user)._convert_to_write(line_vals._cache) + line_vals = line_vals.with_user(intercompany_user)._convert_to_write(line_vals._cache) so_lines_list.append((0, 0, line_vals)) - sale_order.sudo(intercompany_user).write({'order_line':so_lines_list, 'intercompany_transfer_id':record.id}) + sale_order.with_user(intercompany_user).write({'order_line':so_lines_list, 'intercompany_transfer_id':record.id}) so_list.append(sale_order) return so_list @@ -349,22 +361,25 @@ class InterCompanyTransfer(models.Model): destination_company = record.destination_company_id intercompany_user = destination_company.sudo().intercompany_user_id.id or False print('intercompany_user$$$$$$$$$$$$$$$$$$$$$$',intercompany_user) - order_vals = purchase_obj.sudo(intercompany_user).new({'currency_id':self.currency_id.id, 'partner_id':record.source_warehouse_id.sudo().company_id.partner_id.id, 'company_id':destination_company.id}) - order_vals.sudo(intercompany_user).onchange_partner_id() + order_vals = purchase_obj.with_user(intercompany_user).new({'currency_id':self.currency_id.id, 'partner_id':record.source_warehouse_id.sudo().company_id.partner_id.id, 'company_id':destination_company.id}) + print('partner_idtest++++++++++++++++++', record.source_warehouse_id.sudo().company_id.partner_id.id) + order_vals.with_user(intercompany_user).onchange_partner_id() + print('order_valse+++++++++++++++', order_vals) order_vals.currency_id = self.currency_id.id order_vals.picking_type_id = self.destination_warehouse_id.sudo().in_type_id - purchase_order_id = purchase_obj.sudo(intercompany_user).create(order_vals.sudo(intercompany_user)._convert_to_write(order_vals._cache)) + purchase_order_id = purchase_obj.with_user(intercompany_user).create(order_vals.with_user(intercompany_user)._convert_to_write(order_vals._cache)) po_lines_list = [] for line in record.intercompany_transferline_ids: - line_vals = purchase_line_obj.sudo(intercompany_user).new({'order_id':purchase_order_id.id, 'product_id':line.product_id, 'currency_id':self.currency_id}) - line_vals.sudo(intercompany_user).onchange_product_id() + line_vals = purchase_line_obj.with_user(intercompany_user).new({'order_id':purchase_order_id.id, 'product_id':line.product_id, 'currency_id':self.currency_id}) + line_vals.with_user(intercompany_user).onchange_product_id() line_vals.product_qty = line.quantity line_vals.price_unit = line.price line_vals.product_uom = line.product_id.uom_id - line_vals = line_vals.sudo(intercompany_user)._convert_to_write(line_vals._cache) + line_vals = line_vals.with_user(intercompany_user)._convert_to_write(line_vals._cache) po_lines_list.append((0, 0, line_vals)) - purchase_order_id.sudo(intercompany_user).write({'order_line':po_lines_list, 'intercompany_transfer_id':record.id}) + purchase_order_id.with_user(intercompany_user).write({'order_line':po_lines_list, 'intercompany_transfer_id':record.id}) po_list.append(purchase_order_id) + print('po_list+++++++++++++++++++++',po_list,purchase_order_id) return po_list @@ -381,7 +396,7 @@ class InterCompanyTransfer(models.Model): def action_reverse_process(self): stockreturn_picking_obj = self.env['stock.return.picking'] - accountinvoice_refund_obj = self.env['account.invoice.refund'] + accountinvoice_refund_obj = self.env['account.move'] stock_move_obj = self.env['stock.move'] stock_picking_obj = self.env['stock.picking'] account_invoice_obj = self.env['account.move'] @@ -470,12 +485,12 @@ class InterCompanyTransfer(models.Model): for sorder in self.intercompany_transfer_id.saleorder_ids: for invoice in sorder.invoice_ids.filtered(lambda inv : inv.type == 'out_invoice'): customer_invoice_id = invoice.search([('refund_invoice_id', '=', invoice.id)], order='id desc' , limit=1) - default_inovoice_vals = accountinvoice_refund_obj.with_context({'active_id':invoice.id}).default_get(['filter_refund', 'description', 'date_invoice', 'date']) + default_inovoice_vals = accountinvoice_refund_obj.with_context({'active_id':invoice.id,'type':'out_refund'}).default_get(['filter_refund', 'description', 'date_invoice', 'date']) configuration_record = self.env.ref('intercompany_transaction_ept.intercompany_transaction_config_record') if configuration_record.filter_refund: default_inovoice_vals['filter_refund'] = configuration_record.filter_refund default_inovoice_vals.update({'description':'%s' % (configuration_record and configuration_record.description or ('for %s' % self.name))}) - customer_refund = accountinvoice_refund_obj.with_context({'active_id':invoice.id}).create(default_inovoice_vals) + customer_refund = accountinvoice_refund_obj.with_context({'active_id':invoice.id,'type':'out_refund'}).create(default_inovoice_vals) if customer_refund.with_context({'active_ids':invoice.id}).invoice_refund(): invoice_id = account_invoice_obj.search([('refund_invoice_id', '=', invoice.id)], order='id desc', limit=1) if invoice_id: @@ -490,12 +505,12 @@ class InterCompanyTransfer(models.Model): for porder in self.intercompany_transfer_id.purchaseorder_ids: for vendor_invoice in porder.invoice_ids.filtered(lambda inv : inv.type == 'in_invoice'): - default_inovoice_vals = accountinvoice_refund_obj.with_context({'active_id':vendor_invoice.id}).default_get(['filter_refund', 'description', 'date_invoice', 'date']) + default_inovoice_vals = accountinvoice_refund_obj.with_context({'active_id':vendor_invoice.id,'type':'in_refund'}).default_get(['filter_refund', 'description', 'date_invoice', 'date']) configuration_record = self.env.ref('intercompany_transaction_ept.intercompany_transaction_config_record') if configuration_record.filter_refund: default_inovoice_vals['filter_refund'] = configuration_record.filter_refund default_inovoice_vals.update({'description':'%s' % (configuration_record and configuration_record.description or ('for %s' % self.name))}) - vendor_refund = accountinvoice_refund_obj.with_context({'active_id':vendor_invoice.id}).create(default_inovoice_vals) + vendor_refund = accountinvoice_refund_obj.with_context({'active_id':vendor_invoice.id,'type':'in_refund'}).create(default_inovoice_vals) invoice_id = False if vendor_refund.with_context({'active_ids':vendor_invoice.id}).invoice_refund(): invoice_id = account_invoice_obj.search([('refund_invoice_id', '=', vendor_invoice.id)], order='id desc', limit=1) diff --git a/intercompany_transaction_ept/models/sale.py b/intercompany_transaction_ept/models/sale.py index f3f4f60..a628ab6 100644 --- a/intercompany_transaction_ept/models/sale.py +++ b/intercompany_transaction_ept/models/sale.py @@ -13,9 +13,9 @@ class SaleOrder(models.Model): def _prepare_invoice(self): if self.intercompany_transfer_id: - journal_id = self.env['account.invoice'].default_get(['journal_id'])['journal_id'] + journal_id = self.env['account.move'].default_get(['journal_id'])['journal_id'] vals = super(SaleOrder, self.with_context({'journal_id':journal_id}))._prepare_invoice() return vals else: vals = super(SaleOrder, self)._prepare_invoice() - return vals \ No newline at end of file + return vals diff --git a/inventory_groups/__pycache__/__init__.cpython-36.pyc b/inventory_groups/__pycache__/__init__.cpython-36.pyc index 2d1e9f835d5667df029e2ba6f0f9cd1c57b552c4..fd2406de351227f9288f7f5ea639ce2260f91d60 100644 GIT binary patch delta 43 ycmX@hxQvnAn3tEU`dR2i_HYRk{rrLw{rr^td_!aXlA^@;q{QUx)V!35a}59{EDnYM delta 82 zcmZ3+c$Sgfn3tEUr9yNfd$@hHenx(7s(xZYVtQ(xetCXTc5y*sa;koEX>mz@ZhT@& lN`79kewm@MesX?pZhoF_acWUnW^$@-a%x^lQR>7p0|0g99Yp{D diff --git a/inventory_groups/models/__pycache__/__init__.cpython-36.pyc b/inventory_groups/models/__pycache__/__init__.cpython-36.pyc index a0bfa609c984ca6a1c95508a438933a7b276c89e..0388fac131a5d58c8617469bb6af42381e2bee81 100644 GIT binary patch delta 43 ycmcb@xR#OKn3tEU`dR2i_HYSn{rrLw{rr^td_!aXlA^@;q{QUx)V!35bIk!MJPx7& delta 82 zcmZ3>c!iPOn3tDpTeav!_Hg?o{fzwFRQ<$)#PrlW{qp>x?BasNEG6{W3#i{p9@I-26P<;?$zD%;Z$v=I1IA^I8lxvBbz1&QgYdHUt~McKs#iOH$@$)&|5`ML3l aDJl7R#rkE2#`=Y&naSB81)I&83K#)?2^mHJ diff --git a/reports/__manifest__.py b/reports/__manifest__.py index e59a7aa..8b3cdf3 100644 --- a/reports/__manifest__.py +++ b/reports/__manifest__.py @@ -10,7 +10,7 @@ 'maintainer': '', 'website': "", 'depends': [ - 'base', 'account', 'bi_professional_reports_templates' + 'base','report', 'account', 'bi_professional_reports_templates' ], 'data': [ 'views/invoice_report.xml', diff --git a/reports/__pycache__/__init__.cpython-36.pyc b/reports/__pycache__/__init__.cpython-36.pyc index f18141640628e6162ed81b4c5090d07a2525d737..0a3dfeafb4ebefebbdcac3a989e5367e28fbddb5 100644 GIT binary patch delta 31 mcmX@gIFFItn3tEU@mc6Z_6Qzr{rrLw{rr^td_&`jlZ*k98VSPy delta 70 zcmbQoc$AUdn3tEU%S>@1dxUY2enx(7s(xZYVtQ(xetCXTc5y*sa;koEX>mz@ZhT@& XN`79kewm@Meqm{5ayCf8#B5^#A6^)A diff --git a/reports/__pycache__/account.cpython-36.pyc b/reports/__pycache__/account.cpython-36.pyc index a73b701160f8380df974189d7ea2942b92276227..3481b4b0e13bdc63dee5208c35205768c7643fb4 100644 GIT binary patch literal 976 zcmZuw&1%~~5Z=|UWLdG@q=eE#8*)_(F(J@XDJ=<<9%2GbDG16UYc`Es{Wz;tuuXC( z&b1HHSK4c#&{ycGv$CBSYKa-`jAk_7H#0iwc7yM~KZ%zPA-~Al#qs5?NhnlO}Ol4@N+rQ2pcEaw5>t4hP1)l!1XZP4y>|Ve9Ez{J-h?Qca?oN2z|rte3ab;WmjPV hz_-hy(_Aj+eQN)iCS_9{>CG&7mutm|f8>{0TDNLPC2M0$#L{3(lT()mQ1{%`O>n#}r{ma1D= zCVHv$k5ko^#X*x=SBg?4Xmt5ph2I5@A~BUDb|j6Nayy=MrZo1e9m9a%owx?4K>D&) zofc#u7tTo>%23u}t;+_av1seBlSB{la$gVCxFKeTjSNpqpN+^1k(8;<*Wd1p7mBo% zE4hAjYL^q8^#-Nls1oJCC`h?BSB}H?Ce6!rtiayAwCtgdS5?t@Nm!8wvJFyv0T_Lp zkR9^%-5H(G4l%nE(xH;Bl8!Sa9VQ*gP=Cx?bV|>h(fY&z>&6+Iu#P*S-0MF-Bz?d1 zJGCjP&i)~g0(H6vx4|SR-u1(rXbIVjdv~Dqw+WLhO zCTZJw-CXB3yspAv=GH5<6sJuWK2hCc%Zy5F4I}YXS|)Y!gP4b4c<~`>>r6$WCt50x zzG-t(^hBbfWKfhk<3dWE7t!$9X4D^~$q5=nr4jr{Bqu7Dkx@Nu$|AaCsCQ}>z;6Sj zKp-@vK3xM`a>i>nNZt5f0`|bk2wDy;-I^2N|AT;)zX)(=1l-zm6M}zJ2WWZ*Gd7C| zO9*!WuG)MA?KJmLy@GHb;Q<2naR!fYR|7zOfsU`sA3wgW_^UZRXf|xXISv5lHsl=c z-vH?1w!wLSAiDE60Z;R`GHGdWO0B!y7AE$~Q4YkK)k?Jk^KF)4TQO1Pb0fzp+bU5X zOi(JG0_q}1z)}zz)WQt9T54?^^aTGLGK(1CRVmX<%?E8C{}a_0w*|4mi&-ICc)1F6 Kyg~!oV1EEAMl%oq diff --git a/reports/views/account_report.xml b/reports/views/account_report.xml index e4ae6f2..64533e8 100644 --- a/reports/views/account_report.xml +++ b/reports/views/account_report.xml @@ -10,7 +10,7 @@ 0 0 Portrait - 8 + 30 0 3 0 diff --git a/reports/views/report_payment_receipt.xml b/reports/views/report_payment_receipt.xml index 25b640f..b61baa2 100644 --- a/reports/views/report_payment_receipt.xml +++ b/reports/views/report_payment_receipt.xml @@ -4,7 +4,7 @@
-

Cash/Check Payment Voucher

+

Cash/Cheque Payment Voucher

diff --git a/tra_backend_Product/__pycache__/__init__.cpython-36.pyc b/tra_backend_Product/__pycache__/__init__.cpython-36.pyc index d217f1056b2046a2ff8e28669dcb955de0b4fc5c..a5e2afec19f0a3177ca1dcc5bfbca728055606e7 100644 GIT binary patch delta 43 ycmdnTxRR0Gn3tEU@mc6Z_HYSv{rrLw{rr^td_!aXlA^@;q{QUx)V!35-NpbV9u9N> delta 64 zcmZ3L21!jUGX?;Ctrf2T diff --git a/tra_backend_Product/models/__pycache__/__init__.cpython-36.pyc b/tra_backend_Product/models/__pycache__/__init__.cpython-36.pyc index 2de26b83f5111248c98ca1499ee1daae845670ed..f15395deb7b2e74dac042e43f2767d5a4d117932 100644 GIT binary patch literal 242 zcmYk#OA5j;5C-5pS`}&UVK)ZpR*EMOLELl`VvYOdz8g54C@&lrmeH8 zmwu#h-e?C*gp{^7o;UWaw^=kG7ydXJB7(RfHwg~$E|_gSv&!04&b$-+DC9{S^>4oW h{$Y((y6za~m8m@E%l0zN)-ddAUBqy$3+EG@;13FDJVXEh literal 198 zcmXr!<>i{sBp6@Cz`*brh~a<<$Z`PUVgVqL!jQt4!;s4u#mLBz!W7J)$^4QLD6GkN zi@l&IKczIe#7~py7DEw8(@KUS79a&Ceg*4igT8A z=Yt7DWBtO?%;ap4lzvH3Vti6!a&~H7N_+ssT>aeql+>JJ{rLFIyv&mLc)fzkTO2k( Q!P1;mJ651Q#X!se0J6L^5&!@I diff --git a/tra_backend_Product/models/__pycache__/product.cpython-36.pyc b/tra_backend_Product/models/__pycache__/product.cpython-36.pyc index 50c057859c830f1f4601015277268228ef223bbe..88f25fdc0de1f42609a4c2979d437b0930379ad7 100644 GIT binary patch delta 281 zcmeBU>u2XQ=H=yTd=?sicp~QuE>;Ex1_vN6j+^+~Ss|4ri!+6znK6nR$l^)iOyNr5 zPT}cgj^a(>4Q9~fo9x0E7gEI&l$uwPn4{oclwVp<#Zz38pPa3i4&oHwVuc8*1gGYt zCYLCHMHSNWixf&SQWcU*i;93+6$*;-Q%aLdG#PKPWTfU4_yG-G%9!F6#SfBA%!vo< ziqA~B#o?QnS80@=mwJl>Cbp8HNDk;;F!9S)Kfj~$j?pHPb^4GPtDUW&o9a@E=WvH)z44K&j%BR#`=Y&naSB8smc48 f40ySKdN~+bnD`iha55uvf&kn!h`G{}3z_8rMXDrn diff --git a/tra_backend_Product/models/account_move.py b/tra_backend_Product/models/account_move.py index 9caaa65..dde6d0e 100644 --- a/tra_backend_Product/models/account_move.py +++ b/tra_backend_Product/models/account_move.py @@ -10,7 +10,7 @@ class AccountMove(models.Model): # ==== Business fields ==== - overdue_by = fields.Float(string='Overdue By', index=True, compute='calculate_overdue_date') + overdue_by = fields.Float(string='Overdue By', index=True)#, compute='calculate_overdue_date') def calculate_overdue_date(self): diff --git a/tradex_rental/__pycache__/__init__.cpython-36.pyc b/tradex_rental/__pycache__/__init__.cpython-36.pyc index 1e23652f8eaa0cba01a1e9a7d3f9a9a333f63dce..bac38b9233b29fcd2f3e4f3cdbf54b5d31da6e24 100644 GIT binary patch delta 31 mcmX@bxR{aMn3tEU@mc6Z_HZ6U{rrLw{rr^td_&`j6Dx?BasNEG6{W3#i{le1Bx?BasNEG6{W3#i{le1BaTR*D&K diff --git a/tradex_rental/models/__pycache__/job_contracts.cpython-36.pyc b/tradex_rental/models/__pycache__/job_contracts.cpython-36.pyc index b10f77716f48a66fc60effa5876f45019b9cec19..060523688af175f244c3fa9f9587396f81d809a9 100644 GIT binary patch delta 316 zcmaFNevO^in3tEU@mXm62Sx^l$CC?~L?qwx7+IM37$@&yj0r9R@%=Q}i`YS0I6wp^h~NSdOdx^>MDT(LxTz2p zKS)dfNN@vjF$<6YnOh_ zcO^p+Hvm$o?nz*T#%TYs-Ik1T#}y~pO})8pI5A3W@xNm zSeluf4N@>Ui_wOI1!w{XBMZ~y4U92iw^;lVb5nu#6tRH}W(N@*Ac7M_Fae2MEY2B; zMYmY;fa(yoLs&c@MZ7?Q3y6zh1{d*8j%V7yjbz|tDP}84xXY3B3Ig>BOwMICHUpVb e1ma?|;}(ZaZhlH>PO2Rv$Rd!*0?a~eLTmtI`$F~r