diff --git a/bi_professional_reports_templates/delivery_report/fency_report_deliveryslip.xml b/bi_professional_reports_templates/delivery_report/fency_report_deliveryslip.xml index 56f70d7..2b546ec 100644 --- a/bi_professional_reports_templates/delivery_report/fency_report_deliveryslip.xml +++ b/bi_professional_reports_templates/delivery_report/fency_report_deliveryslip.xml @@ -263,7 +263,7 @@
- Deleivery Given by + Delivery Given by
diff --git a/bi_professional_reports_templates/purchase_report/fency_report_purchaseorder.xml b/bi_professional_reports_templates/purchase_report/fency_report_purchaseorder.xml index 87803f0..a54adad 100644 --- a/bi_professional_reports_templates/purchase_report/fency_report_purchaseorder.xml +++ b/bi_professional_reports_templates/purchase_report/fency_report_purchaseorder.xml @@ -133,7 +133,7 @@ t-field-options='{"widget": "monetary", "display_currency": "o.currency_id"}'/> - + Total - \ No newline at end of file + diff --git a/bi_professional_reports_templates/sale_report/fency_report_saleorder.xml b/bi_professional_reports_templates/sale_report/fency_report_saleorder.xml index 5db9b4f..04a1970 100644 --- a/bi_professional_reports_templates/sale_report/fency_report_saleorder.xml +++ b/bi_professional_reports_templates/sale_report/fency_report_saleorder.xml @@ -26,19 +26,19 @@

- Order # +  Order # - Quotation # +  Quotation # - +  

- Your References -

+  Your References +  

@@ -62,8 +62,8 @@
- Validity -

+  Validity +  

diff --git a/hr_employee_shift/views/hr_employee_shift_view.xml b/hr_employee_shift/views/hr_employee_shift_view.xml index 5541e8b..6b4c66f 100644 --- a/hr_employee_shift/views/hr_employee_shift_view.xml +++ b/hr_employee_shift/views/hr_employee_shift_view.xml @@ -31,7 +31,7 @@ - + - \ No newline at end of file + diff --git a/hr_payroll_community/models/__pycache__/hr_payslip.cpython-36.pyc b/hr_payroll_community/models/__pycache__/hr_payslip.cpython-36.pyc index c8f392d..b0338a5 100644 Binary files a/hr_payroll_community/models/__pycache__/hr_payslip.cpython-36.pyc and b/hr_payroll_community/models/__pycache__/hr_payslip.cpython-36.pyc differ diff --git a/hr_payroll_community/views/hr_payslip_views.xml b/hr_payroll_community/views/hr_payslip_views.xml index 3aaf5ba..6019c8b 100644 --- a/hr_payroll_community/views/hr_payslip_views.xml +++ b/hr_payroll_community/views/hr_payslip_views.xml @@ -5,7 +5,7 @@ employee.salary.rule.tree employee.salary.rule - + diff --git a/intercompany_transaction_ept/__pycache__/__init__.cpython-36.pyc b/intercompany_transaction_ept/__pycache__/__init__.cpython-36.pyc index be76e43..869321b 100644 Binary files a/intercompany_transaction_ept/__pycache__/__init__.cpython-36.pyc and b/intercompany_transaction_ept/__pycache__/__init__.cpython-36.pyc differ diff --git a/intercompany_transaction_ept/models/__pycache__/__init__.cpython-36.pyc b/intercompany_transaction_ept/models/__pycache__/__init__.cpython-36.pyc index 2db8a59..b75aef9 100644 Binary files a/intercompany_transaction_ept/models/__pycache__/__init__.cpython-36.pyc and b/intercompany_transaction_ept/models/__pycache__/__init__.cpython-36.pyc differ diff --git a/intercompany_transaction_ept/models/__pycache__/account_invoice.cpython-36.pyc b/intercompany_transaction_ept/models/__pycache__/account_invoice.cpython-36.pyc index cc65f2f..d076d2c 100644 Binary files a/intercompany_transaction_ept/models/__pycache__/account_invoice.cpython-36.pyc and b/intercompany_transaction_ept/models/__pycache__/account_invoice.cpython-36.pyc differ diff --git a/intercompany_transaction_ept/models/__pycache__/inter_company_transfer_config_ept.cpython-36.pyc b/intercompany_transaction_ept/models/__pycache__/inter_company_transfer_config_ept.cpython-36.pyc index 7fd61dc..dc48875 100644 Binary files a/intercompany_transaction_ept/models/__pycache__/inter_company_transfer_config_ept.cpython-36.pyc and b/intercompany_transaction_ept/models/__pycache__/inter_company_transfer_config_ept.cpython-36.pyc differ diff --git a/intercompany_transaction_ept/models/__pycache__/inter_company_transfer_ept.cpython-36.pyc b/intercompany_transaction_ept/models/__pycache__/inter_company_transfer_ept.cpython-36.pyc index 4760c5c..34b81fa 100644 Binary files a/intercompany_transaction_ept/models/__pycache__/inter_company_transfer_ept.cpython-36.pyc and b/intercompany_transaction_ept/models/__pycache__/inter_company_transfer_ept.cpython-36.pyc differ diff --git a/intercompany_transaction_ept/models/__pycache__/inter_company_transfer_line_ept.cpython-36.pyc b/intercompany_transaction_ept/models/__pycache__/inter_company_transfer_line_ept.cpython-36.pyc index 35aae6b..0c080e0 100644 Binary files a/intercompany_transaction_ept/models/__pycache__/inter_company_transfer_line_ept.cpython-36.pyc and b/intercompany_transaction_ept/models/__pycache__/inter_company_transfer_line_ept.cpython-36.pyc differ diff --git a/intercompany_transaction_ept/models/__pycache__/inter_company_transfer_log_process_ept.cpython-36.pyc b/intercompany_transaction_ept/models/__pycache__/inter_company_transfer_log_process_ept.cpython-36.pyc index 5e9b1de..491d970 100644 Binary files a/intercompany_transaction_ept/models/__pycache__/inter_company_transfer_log_process_ept.cpython-36.pyc and b/intercompany_transaction_ept/models/__pycache__/inter_company_transfer_log_process_ept.cpython-36.pyc differ diff --git a/intercompany_transaction_ept/models/__pycache__/purchase.cpython-36.pyc b/intercompany_transaction_ept/models/__pycache__/purchase.cpython-36.pyc index ce376cb..e86f2e2 100644 Binary files a/intercompany_transaction_ept/models/__pycache__/purchase.cpython-36.pyc and b/intercompany_transaction_ept/models/__pycache__/purchase.cpython-36.pyc differ diff --git a/intercompany_transaction_ept/models/__pycache__/res_company.cpython-36.pyc b/intercompany_transaction_ept/models/__pycache__/res_company.cpython-36.pyc index 44ea374..4779c6d 100644 Binary files a/intercompany_transaction_ept/models/__pycache__/res_company.cpython-36.pyc and b/intercompany_transaction_ept/models/__pycache__/res_company.cpython-36.pyc differ diff --git a/intercompany_transaction_ept/models/__pycache__/sale.cpython-36.pyc b/intercompany_transaction_ept/models/__pycache__/sale.cpython-36.pyc index 7030aee..51598a1 100644 Binary files a/intercompany_transaction_ept/models/__pycache__/sale.cpython-36.pyc and b/intercompany_transaction_ept/models/__pycache__/sale.cpython-36.pyc differ diff --git a/intercompany_transaction_ept/models/__pycache__/stock_picking.cpython-36.pyc b/intercompany_transaction_ept/models/__pycache__/stock_picking.cpython-36.pyc index 654e64c..e686c97 100644 Binary files a/intercompany_transaction_ept/models/__pycache__/stock_picking.cpython-36.pyc and b/intercompany_transaction_ept/models/__pycache__/stock_picking.cpython-36.pyc differ diff --git a/intercompany_transaction_ept/models/inter_company_transfer_ept.py b/intercompany_transaction_ept/models/inter_company_transfer_ept.py index 392cce9..409f555 100644 --- a/intercompany_transaction_ept/models/inter_company_transfer_ept.py +++ b/intercompany_transaction_ept/models/inter_company_transfer_ept.py @@ -279,13 +279,13 @@ class InterCompanyTransfer(models.Model): source_wh = self.source_warehouse_id dest_wh = self.destination_warehouse_id - + print('source++++++++++++++++++++++++++++++++++++',source_wh,dest_wh) 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 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.")) diff --git a/intercompany_transaction_ept/report/__pycache__/__init__.cpython-36.pyc b/intercompany_transaction_ept/report/__pycache__/__init__.cpython-36.pyc index 010ba86..daeeddb 100644 Binary files a/intercompany_transaction_ept/report/__pycache__/__init__.cpython-36.pyc and b/intercompany_transaction_ept/report/__pycache__/__init__.cpython-36.pyc differ diff --git a/intercompany_transaction_ept/report/__pycache__/sale_report.cpython-36.pyc b/intercompany_transaction_ept/report/__pycache__/sale_report.cpython-36.pyc index 298bf0f..b2d06dc 100644 Binary files a/intercompany_transaction_ept/report/__pycache__/sale_report.cpython-36.pyc and b/intercompany_transaction_ept/report/__pycache__/sale_report.cpython-36.pyc differ diff --git a/intercompany_transaction_ept/wizard/__pycache__/__init__.cpython-36.pyc b/intercompany_transaction_ept/wizard/__pycache__/__init__.cpython-36.pyc index 6e7e782..c30a168 100644 Binary files a/intercompany_transaction_ept/wizard/__pycache__/__init__.cpython-36.pyc and b/intercompany_transaction_ept/wizard/__pycache__/__init__.cpython-36.pyc differ diff --git a/intercompany_transaction_ept/wizard/__pycache__/import_export_product_list_ept.cpython-36.pyc b/intercompany_transaction_ept/wizard/__pycache__/import_export_product_list_ept.cpython-36.pyc index d0c34f0..3d5bb16 100644 Binary files a/intercompany_transaction_ept/wizard/__pycache__/import_export_product_list_ept.cpython-36.pyc and b/intercompany_transaction_ept/wizard/__pycache__/import_export_product_list_ept.cpython-36.pyc differ diff --git a/intercompany_transaction_ept/wizard/__pycache__/reverse_inter_company_transfer_ept.cpython-36.pyc b/intercompany_transaction_ept/wizard/__pycache__/reverse_inter_company_transfer_ept.cpython-36.pyc index b0e1027..164bf53 100644 Binary files a/intercompany_transaction_ept/wizard/__pycache__/reverse_inter_company_transfer_ept.cpython-36.pyc and b/intercompany_transaction_ept/wizard/__pycache__/reverse_inter_company_transfer_ept.cpython-36.pyc differ diff --git a/laundary_mgt/__pycache__/__init__.cpython-36.pyc b/laundary_mgt/__pycache__/__init__.cpython-36.pyc deleted file mode 100644 index e813b57..0000000 Binary files a/laundary_mgt/__pycache__/__init__.cpython-36.pyc and /dev/null differ diff --git a/laundary_mgt/models/__pycache__/__init__.cpython-36.pyc b/laundary_mgt/models/__pycache__/__init__.cpython-36.pyc index 7a239a6..73abe49 100644 Binary files a/laundary_mgt/models/__pycache__/__init__.cpython-36.pyc and b/laundary_mgt/models/__pycache__/__init__.cpython-36.pyc differ diff --git a/laundary_mgt/models/__pycache__/sale.cpython-36.pyc b/laundary_mgt/models/__pycache__/sale.cpython-36.pyc deleted file mode 100644 index fbcb6f0..0000000 Binary files a/laundary_mgt/models/__pycache__/sale.cpython-36.pyc and /dev/null differ diff --git a/reports/views/.report_payment_receipt.xml.swo b/reports/views/.report_payment_receipt.xml.swo deleted file mode 100644 index 71c3481..0000000 Binary files a/reports/views/.report_payment_receipt.xml.swo and /dev/null differ diff --git a/reports/views/.report_payment_receipt.xml.swp b/reports/views/.report_payment_receipt.xml.swp deleted file mode 100644 index 333f9c9..0000000 Binary files a/reports/views/.report_payment_receipt.xml.swp and /dev/null differ