Skip to content
Snippets Groups Projects
Commit 8384b489 authored by Prajkta Patkar's avatar Prajkta Patkar
Browse files

Merge branch 'createuser' into 'devel'

Changes in Create User, Create Customer/Supplier, Create Customer/Supplier Popup and Edit Customer/Supplier

1. In Create user for Godown In charge user table heading is given i.e. List of Godowns.

2. In Customer/Supplier  'Phone No.'  is replaced with 'Contact Number'.

See merge request !6
parents d582f68b ef92fca6
2 merge requests!29Devel into master,!6Changes in Create User, Create Customer/Supplier, Create Customer/Supplier Popup and Edit Customer/Supplier
......@@ -89,7 +89,7 @@
<input class="form-control input-sm"type="email" id="add_cussup_email" accesskey="">
</div>
<div class="form-group col-sm-6">
<label for="add_cussup_phone">{% trans %}Phone No:{% endtrans %}</label>
<label for="add_cussup_phone">{% trans %}Contact Number:{% endtrans %}</label>
<input class="form-control input-sm" type="text" id="add_cussup_phone"></input>
</div>
</div>
......@@ -175,7 +175,7 @@
<input class="form-control input-sm"type="email" id="add_cussup_email" accesskey="">
</div>
<div class="form-group">
<label for="add_cussup_phone">{% trans %}Phone No:{% endtrans %}</label>
<label for="add_cussup_phone">{% trans %}Phone Number:{% endtrans %}</label>
<input class="form-control input-sm" type="text" id="add_cussup_phone"></input>
</div>
<div class="form-group">
......
......@@ -123,7 +123,7 @@ th {
<input class="form-control input-sm"type="email" id="add_cussup_email" accesskey="">
</div>
<div class="form-group col-sm-6">
<label for="add_cussup_phone">{% trans %}Phone No:{% endtrans %}</label>
<label for="add_cussup_phone">{% trans %}Contact Number:{% endtrans %}</label>
<input class="form-control input-sm" type="text" id="add_cussup_phone"></input>
</div>
</div>
......@@ -210,7 +210,7 @@ th {
<input class="form-control input-sm"type="email" id="add_cussup_email" accesskey="">
</div>
<div class="form-group">
<label for="add_cussup_phone">{% trans %}Phone No:{% endtrans %}</label>
<label for="add_cussup_phone">{% trans %}Contact Number:{% endtrans %}</label>
<input class="form-control input-sm" type="text" id="add_cussup_phone"></input>
</div>
<div class="form-group">
......
<label>{% trans %}List of Godowns{% endtrans %} : </label>
<table id="latable" class="table shadow table-bordered">
<thead>
<tr>
......
......@@ -125,7 +125,7 @@
<input class="form-control input-sm"type="email" id="edit_cussup_email">
</div>
<div class="form-group hidden-load col-sm-6" hidden>
<label for="edit_cussup_phone">{% trans %}Phone No:{% endtrans %}</label>
<label for="edit_cussup_phone">{% trans %}Contact Number:{% endtrans %}</label>
<input class="form-control input-sm" type="text" id="edit_cussup_phone"></input>
</div>
</div>
......@@ -205,7 +205,7 @@
<input class="form-control input-sm"type="email" id="edit_cussup_email">
</div>
<div class="form-group hidden-load " hidden>
<label for="edit_cussup_phone">{% trans %}Phone No:{% endtrans %}</label>
<label for="edit_cussup_phone">{% trans %}Contact Number:{% endtrans %}</label>
<input class="form-control input-sm" type="text" id="edit_cussup_phone"></input>
</div>
<div class="form-group hidden-load" hidden>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment