resolve conflict

bi_professional_reports_templates/delivery_report/fency_report_deliveryslip.xml

@@ -263,7 +263,7 @@
                                 
                             </div>
                             <div class="col-4">
-                                <strong>Deleivery Given by</strong>
+                                <strong>Delivery Given by</strong>
                                 
                             </div>
                         </div>

bi_professional_reports_templates/purchase_report/fency_report_purchaseorder.xml

@@ -133,7 +133,7 @@
                                     t-field-options='{"widget": "monetary", "display_currency": "o.currency_id"}'/>
                             </td>
                         </tr>
-                        <tr style=" background-color: #3498DB;" class="border-black">
+                        <tr class="border-black">
                             <td><strong>Total</strong></td>
                             <td class="text-right">
                                 <span t-field="o.amount_total"
@@ -155,4 +155,4 @@
 </template>
 </data>
 </odoo>
-    
+    

bi_professional_reports_templates/sale_report/fency_report_saleorder.xml

@@ -26,19 +26,19 @@
                         <div style=" background-color:  #3498DB;">
 				<h2>
 					<span t-if="doc.state not in ['draft','sent']">
-                        <font color="#fff">Order #</font>
+                        <font color="#fff" class="text-right">&#160;Order #</font>
                     </span>
 					<span t-if="doc.state in ['draft','sent']">
-                        <font color="#fff">Quotation # </font>
+                        <font color="#fff">&#160;Quotation # </font>
                     </span>
-                        <font color="#fff"><span t-field="o.name"/></font>
+                        <font color="#fff">&#160;<span t-field="o.name"/></font>
                     </h2>
 
                     <div class="row mt32 mb32">
                         <div class="col-3">
                             <font color="#fff">
-				            <strong>Your References</strong>
+				            <strong>&#160;Your References</strong>
-                            <p t-field="o.client_order_ref"/></font>
+                            &#160;<p t-field="o.client_order_ref"/></font>
                         </div>
 
                         <div class="col-3" t-if="o.date_order">
@@ -62,8 +62,8 @@
 			         <div class="row mt32 mb32">
                         <div class="col-3">
                             <font color="#fff">
-                            <strong>Validity</strong>
+                            &#160;<strong>Validity</strong>
-                            <p t-field="o.client_order_ref"/></font>
+                            &#160;<p t-field="o.client_order_ref"/></font>
                         </div>
 
                         <div class="col-3" t-if="o.date_order">

hr_employee_shift/views/hr_employee_shift_view.xml

@@ -31,7 +31,7 @@
             </field>
         </record>
 
-        <record id="shift_template_kanban_view" model="ir.ui.view">
+	<!-- <record id="shift_template_kanban_view" model="ir.ui.view">
             <field name="name">employee.shift.kanban</field>
             <field name="model">resource.calendar</field>
             <field name="arch" type="xml">
@@ -72,7 +72,7 @@
             </field>
         </record>
 
-        <record id="resource.action_resource_calendar_form" model="ir.actions.act_window">
+	<record id="resource.action_resource_calendar_form" model="ir.actions.act_window">
             <field name="name">Shift Working Time</field>
             <field name="res_model">resource.calendar</field>
             <field name="view_mode">kanban,tree,form</field>
@@ -83,7 +83,7 @@
                 Define working hours and time table that could be scheduled to your project members
               </p>
             </field>
-        </record>
+	</record>-->
 
         <menuitem name="Shifts" id="menu_shift"
                   groups="hr.group_hr_manager"
@@ -93,4 +93,4 @@
               action="resource.action_resource_calendar_form"/>
 
     </data>
-</odoo>
+</odoo>

hr_payroll_community/views/hr_payslip_views.xml

@@ -5,7 +5,7 @@
         <field name="name">employee.salary.rule.tree</field>
         <field name="model">employee.salary.rule</field>
         <field name="arch" type="xml">
-		<tree string="Employee Salary Rule" editable="bottom">
+		<tree string="Employee Salary Rule" editable="bottom" create="false">
 		<field name="number"/>
 		<field name="date_from"/>
 		<field name="date_to"/>

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:
+       # if not route_ids:
-            raise ValidationError(_("No routes are found. \n Please configure warehouse routes and set in products."))
+        #    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."))            
                

laundary_mgt/models/sale.py

@@ -86,4 +86,4 @@ class Project(models.Model):
 class ProjectTaskType(models.Model):
     _inherit = 'project.task.type'
 
-    all_project_check = fields.Boolean(string='Show All Project', default=False, copy=False)
+    all_project_check = fields.Boolean(string='Show All Project', default=False, copy=False)