This commit is contained in:
sonal arora
2020-09-25 13:45:37 +00:00
parent 9e228b95ce
commit ff164554ff
28 changed files with 18 additions and 18 deletions

View File

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

View File

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

View File

@@ -26,19 +26,19 @@
<div style=" background-color: #3498DB;"> <div style=" background-color: #3498DB;">
<h2> <h2>
<span t-if="doc.state not in ['draft','sent']"> <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>
<span t-if="doc.state in ['draft','sent']"> <span t-if="doc.state in ['draft','sent']">
<font color="#fff">Quotation # </font> <font color="#fff">&#160;Quotation # </font>
</span> </span>
<font color="#fff"><span t-field="o.name"/></font> <font color="#fff">&#160;<span t-field="o.name"/></font>
</h2> </h2>
<div class="row mt32 mb32"> <div class="row mt32 mb32">
<div class="col-3"> <div class="col-3">
<font color="#fff"> <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>
<div class="col-3" t-if="o.date_order"> <div class="col-3" t-if="o.date_order">
@@ -62,8 +62,8 @@
<div class="row mt32 mb32"> <div class="row mt32 mb32">
<div class="col-3"> <div class="col-3">
<font color="#fff"> <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>
<div class="col-3" t-if="o.date_order"> <div class="col-3" t-if="o.date_order">

View File

@@ -31,7 +31,7 @@
</field> </field>
</record> </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="name">employee.shift.kanban</field>
<field name="model">resource.calendar</field> <field name="model">resource.calendar</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
@@ -72,7 +72,7 @@
</field> </field>
</record> </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="name">Shift Working Time</field>
<field name="res_model">resource.calendar</field> <field name="res_model">resource.calendar</field>
<field name="view_mode">kanban,tree,form</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 Define working hours and time table that could be scheduled to your project members
</p> </p>
</field> </field>
</record> </record>-->
<menuitem name="Shifts" id="menu_shift" <menuitem name="Shifts" id="menu_shift"
groups="hr.group_hr_manager" groups="hr.group_hr_manager"

View File

@@ -5,7 +5,7 @@
<field name="name">employee.salary.rule.tree</field> <field name="name">employee.salary.rule.tree</field>
<field name="model">employee.salary.rule</field> <field name="model">employee.salary.rule</field>
<field name="arch" type="xml"> <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="number"/>
<field name="date_from"/> <field name="date_from"/>
<field name="date_to"/> <field name="date_to"/>

View File

@@ -279,13 +279,13 @@ class InterCompanyTransfer(models.Model):
source_wh = self.source_warehouse_id source_wh = self.source_warehouse_id
dest_wh = self.destination_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}) group_id = procurementgroup_obj.create({'name': self.name, 'partner_id': dest_wh.partner_id.id})
self.group_id = group_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)]) route_ids = stocklocation_route_obj.search([('supplied_wh_id', '=', dest_wh.id), ('supplier_wh_id', '=', source_wh.id)])
print('routeuuuuuuuuuuuuuuuuuuuuuuuuu',route_ids) 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 : if not self.intercompany_transferline_ids :
raise ValidationError(_("No Products found. \n Please add products to transfer.")) raise ValidationError(_("No Products found. \n Please add products to transfer."))