From 5e9b3df4794319ae8f080c539034cd1211a041b3 Mon Sep 17 00:00:00 2001
From: mbayopanda <mbayopanda@gmail.com>
Date: Tue, 11 Oct 2022 06:37:46 +0100
Subject: [PATCH] purchase order additional details

---
 .../purchases/create/createUpdate.html        | 377 +++++++++---------
 server/controllers/finance/purchases.js       |   4 +-
 .../reports/purchases.receipt.handlebars      |  33 +-
 3 files changed, 209 insertions(+), 205 deletions(-)

diff --git a/client/src/modules/purchases/create/createUpdate.html b/client/src/modules/purchases/create/createUpdate.html
index fd56a5e98b..bfb51ca4da 100644
--- a/client/src/modules/purchases/create/createUpdate.html
+++ b/client/src/modules/purchases/create/createUpdate.html
@@ -18,212 +18,209 @@
         ng-submit="PurchaseCtrl.submit(PurchaseOrderForm)"
         novalidate>
 
-        <div class="row">
-          <div class="col-xs-12">
-            <div class="panel panel-default">
-              <div class="panel-body">
-                <div class="col-md-4">
-                  <bh-supplier-select
-                    supplier-uuid="PurchaseCtrl.order.details.supplier_uuid"
-                    on-select-callback="PurchaseCtrl.order.setSupplier(supplier)">
-                  </bh-supplier-select>
-
-                  <bh-date-editor
-                    date-value="PurchaseCtrl.order.details.date"
-                    on-change="PurchaseCtrl.order.onDateChange(date)">
-                  </bh-date-editor>
-
-                  <div
-                    class="form-group"
-                    ng-show="PurchaseCtrl.hasMultipleCurrencies"
-                    ng-class="{ 'has-error' : PurchaseCtrl.$submitted && PurchaseCtrl.currency.$invalid }">
-                    <label class="control-label" translate>FORM.LABELS.CURRENCY</label>
-
-                    <ui-select
-                      name="currency"
-                      ng-model="PurchaseCtrl.rate.currency"
-                      ng-change="PurchaseCtrl.selectCurrency()"
-                      required>
-                      <ui-select-match placeholder="{{ 'FORM.PLACEHOLDERS.CURRENCY' | translate }}">
-                        <span>{{ PurchaseCtrl.format($select.selected.id) }}</span>
-                      </ui-select-match>
-                      <ui-select-choices
-                        ui-select-focus-patch
-                        repeat="currency as currency in PurchaseCtrl.currencies">
-                        <span ng-bind-html="PurchaseCtrl.format(currency.id) | highlight:$select.search"></span>
-                      </ui-select-choices>
-                    </ui-select>
-
-                    <div class="help-block"
-                      ng-messages="PurchaseCtrl.currency.$error"
-                      ng-show="PurchaseCtrl.$submitted">
-                      <div ng-messages-include="modules/templates/messages.tmpl.html"></div>
-                    </div>
+        <div class="panel panel-default">
+          <div class="panel-body">
+            <div class="row">
+              <div class="col-md-6">
+                <bh-supplier-select
+                  supplier-uuid="PurchaseCtrl.order.details.supplier_uuid"
+                  on-select-callback="PurchaseCtrl.order.setSupplier(supplier)">
+                </bh-supplier-select>
+  
+                <bh-date-editor
+                  date-value="PurchaseCtrl.order.details.date"
+                  on-change="PurchaseCtrl.order.onDateChange(date)">
+                </bh-date-editor>
+  
+                <div
+                  class="form-group"
+                  ng-class="{'has-error' : PurchaseOrderForm.$submitted && PurchaseOrderForm.notes.$invalid }">
+                  <label class="control-label" translate>FORM.LABELS.NOTES </label>
+                  <textarea
+                    ng-model="PurchaseCtrl.order.details.note"
+                    name="notes"
+                    class="form-control"
+                    rows="2"
+                    ng-maxlength="PurchaseCtrl.maxLength"
+                    required>
+                  </textarea>
+                  <div class="help-block" ng-messages="PurchaseOrderForm.notes.$error" ng-show="PurchaseOrderForm.$submitted">
+                    <div ng-messages-include="modules/templates/messages.tmpl.html"></div>
                   </div>
-
-                  <div ng-if="PurchaseCtrl.rate.currency.id != PurchaseCtrl.enterprise.currency_id"
-                    style="margin-bottom: 1em;">
-                    <span translate>EXCHANGE.CURRENT_RATE</span>:
-                      <i>{{ PurchaseCtrl.currentExchangeRate | currency:PurchaseCtrl.rate.currency.id }}</i>
-                      <i><span translate>FORM.INFO.PER</span> {{PurchaseCtrl.enterprise.currencySymbol}}</i>
+                </div>
+              </div>
+              <div class="col-md-6">
+                <div
+                  class="form-group"
+                  ng-show="PurchaseCtrl.hasMultipleCurrencies"
+                  ng-class="{ 'has-error' : PurchaseCtrl.$submitted && PurchaseCtrl.currency.$invalid }">
+                  <label class="control-label" translate>FORM.LABELS.CURRENCY</label>
+  
+                  <ui-select
+                    name="currency"
+                    ng-model="PurchaseCtrl.rate.currency"
+                    ng-change="PurchaseCtrl.selectCurrency()"
+                    required>
+                    <ui-select-match placeholder="{{ 'FORM.PLACEHOLDERS.CURRENCY' | translate }}">
+                      <span>{{ PurchaseCtrl.format($select.selected.id) }}</span>
+                    </ui-select-match>
+                    <ui-select-choices
+                      ui-select-focus-patch
+                      repeat="currency as currency in PurchaseCtrl.currencies">
+                      <span ng-bind-html="PurchaseCtrl.format(currency.id) | highlight:$select.search"></span>
+                    </ui-select-choices>
+                  </ui-select>
+  
+                  <div class="help-block"
+                    ng-messages="PurchaseCtrl.currency.$error"
+                    ng-show="PurchaseCtrl.$submitted">
+                    <div ng-messages-include="modules/templates/messages.tmpl.html"></div>
                   </div>
-                  <div
-                    class="form-group"
-                    ng-class="{'has-error' : PurchaseOrderForm.$submitted && PurchaseOrderForm.shipping_handling.$invalid }">
-                    <label class="control-label">
-                      <span translate>FORM.LABELS.SHIPPING_HANDLING_COST</span> ({{PurchaseCtrl.rate.currency.symbol}})</label>
-                    <input
-                      ng-model="PurchaseCtrl.order.details.shipping_handling"
-                      name="shipping_handling"
-                      class="form-control"
-                      type="number"
-                      min="0"
-                      ng-change="PurchaseCtrl.onChangeShippingHandling()">
-                    <div class="help-block" ng-messages="PurchaseOrderForm.shipping_handling.$error" ng-show="PurchaseOrderForm.$submitted">
-                      <div ng-messages-include="modules/templates/messages.tmpl.html"></div>
-                    </div>
+                </div>
+  
+                <div ng-if="PurchaseCtrl.rate.currency.id != PurchaseCtrl.enterprise.currency_id"
+                  style="margin-bottom: 1em;">
+                  <span translate>EXCHANGE.CURRENT_RATE</span>:
+                    <i>{{ PurchaseCtrl.currentExchangeRate | currency:PurchaseCtrl.rate.currency.id }}</i>
+                    <i><span translate>FORM.INFO.PER</span> {{PurchaseCtrl.enterprise.currencySymbol}}</i>
+                </div>
+                <div
+                  class="form-group"
+                  ng-class="{'has-error' : PurchaseOrderForm.$submitted && PurchaseOrderForm.shipping_handling.$invalid }">
+                  <label class="control-label">
+                    <span translate>FORM.LABELS.SHIPPING_HANDLING_COST</span> ({{PurchaseCtrl.rate.currency.symbol}})</label>
+                  <input
+                    ng-model="PurchaseCtrl.order.details.shipping_handling"
+                    name="shipping_handling"
+                    class="form-control"
+                    type="number"
+                    min="0"
+                    ng-change="PurchaseCtrl.onChangeShippingHandling()">
+                  <div class="help-block" ng-messages="PurchaseOrderForm.shipping_handling.$error" ng-show="PurchaseOrderForm.$submitted">
+                    <div ng-messages-include="modules/templates/messages.tmpl.html"></div>
                   </div>
-
-                  <div class="form-group">
-                    <label class="control-label">
-                      <span translate>FORM.LABELS.PAYMENT_METHOD</span>
-                      <span
-                        class="text-info fa fa-info-circle"
-                        uib-popover-template="'typePopover.tmpl.html'"
-                        popover-placement="right"
-                        popover-append-to-body="true"
-                        popover-trigger="mouseenter">
-                      </span>
-                    </label>
+                </div>
   
-                    <div class="radio" style="margin-top:0;">
-                      <label>
-                        <input type="radio" name="paymentMethod" id="on-purchase" value="FORM.LABELS.ON_PURCHASE" ng-model="PurchaseCtrl.order.details.payment_method" required>
-                        <span translate>FORM.LABELS.ON_PURCHASE</span>
-                      </label>
-                    </div>
-                    <div class="radio">
-                      <label>
-                        <input type="radio" name="paymentMethod" id="on-delivery" value="FORM.LABELS.ON_DELIVERY" ng-model="PurchaseCtrl.order.details.payment_method" required>
-                        <span translate>FORM.LABELS.ON_DELIVERY</span>
-                      </label>
-                    </div>
-                    <div class="radio">
-                      <label>
-                        <input type="radio" name="paymentMethod" id="other" value="FORM.LABELS.OTHER" ng-model="PurchaseCtrl.order.details.payment_method" required>
-                        <span translate>FORM.LABELS.OTHER</span>
-                      </label>
-                    </div>
+                <div class="form-group">
+                  <label class="control-label">
+                    <span translate>FORM.LABELS.PAYMENT_METHOD</span>
+                    <span
+                      class="text-info fa fa-info-circle"
+                      uib-popover-template="'typePopover.tmpl.html'"
+                      popover-placement="right"
+                      popover-append-to-body="true"
+                      popover-trigger="mouseenter">
+                    </span>
+                  </label>
   
-                    <div class="help-block" ng-messages="PurchaseOrderForm.paymentMethod.$error" ng-show="PurchaseOrderForm.$submitted">
-                      <div ng-messages-include="modules/templates/messages.tmpl.html"></div>
-                    </div>
+                  <div class="radio" style="margin-top:0;">
+                    <label>
+                      <input type="radio" name="paymentMethod" id="on-purchase" value="FORM.LABELS.ON_PURCHASE" ng-model="PurchaseCtrl.order.details.payment_method" required>
+                      <span translate>FORM.LABELS.ON_PURCHASE</span>
+                    </label>
                   </div>
-
-                  <!-- note -->
-                  <div
-                    class="form-group"
-                    ng-class="{'has-error' : PurchaseOrderForm.$submitted && PurchaseOrderForm.notes.$invalid }">
-                    <label class="control-label" translate>FORM.LABELS.NOTES </label>
-                    <textarea
-                      ng-model="PurchaseCtrl.order.details.note"
-                      name="notes"
-                      class="form-control"
-                      rows="2"
-                      ng-maxlength="PurchaseCtrl.maxLength"
-                      required>
-                    </textarea>
-                    <div class="help-block" ng-messages="PurchaseOrderForm.notes.$error" ng-show="PurchaseOrderForm.$submitted">
-                      <div ng-messages-include="modules/templates/messages.tmpl.html"></div>
-                    </div>
+                  <div class="radio">
+                    <label>
+                      <input type="radio" name="paymentMethod" id="on-delivery" value="FORM.LABELS.ON_DELIVERY" ng-model="PurchaseCtrl.order.details.payment_method" required>
+                      <span translate>FORM.LABELS.ON_DELIVERY</span>
+                    </label>
+                  </div>
+                  <div class="radio">
+                    <label>
+                      <input type="radio" name="paymentMethod" id="other" value="FORM.LABELS.OTHER" ng-model="PurchaseCtrl.order.details.payment_method" required>
+                      <span translate>FORM.LABELS.OTHER</span>
+                    </label>
+                  </div>
+  
+                  <div class="help-block" ng-messages="PurchaseOrderForm.paymentMethod.$error" ng-show="PurchaseOrderForm.$submitted">
+                    <div ng-messages-include="modules/templates/messages.tmpl.html"></div>
                   </div>
-
                 </div>
-                <div class="col-md-4">
-                  
-                  <div ng-if="PurchaseCtrl.enterprise.settings.enable_prf_details">
-                    <bh-input-text
-                      key="info_contact_name"
-                      text-value="PurchaseCtrl.order.details.info_contact_name"
-                      label="PURCHASES.INFO.CONTACT_NAME">
-                    </bh-input-text>
+              </div>
+            </div>
 
-                    <bh-input-text
-                      key="info_contact_title"
-                      text-value="PurchaseCtrl.order.details.info_contact_title"
-                      label="PURCHASES.INFO.CONTACT_TITLE">
-                    </bh-input-text>
+            <div class="row" ng-if="PurchaseCtrl.enterprise.settings.enable_prf_details">
+              <!-- purchase order numbers  -->
+              <div class="col-md-4">
+                <bh-input-text
+                  key="info_purchase_number"
+                  text-value="PurchaseCtrl.order.details.info_purchase_number"
+                  label="PURCHASES.INFO.PURCHASE_NUMBER">
+                </bh-input-text>
+                <bh-input-text
+                  key="info_prf_number"
+                  text-value="PurchaseCtrl.order.details.info_prf_number"
+                  label="PURCHASES.INFO.PRF_NUMBER">
+                </bh-input-text>
+              </div>
+              <!-- supplier contact -->
+              <div class="col-md-4">
+                <bh-input-text
+                  key="info_contact_name"
+                  text-value="PurchaseCtrl.order.details.info_contact_name"
+                  label="PURCHASES.INFO.CONTACT_NAME">
+                </bh-input-text>
 
-                    <bh-input-text
-                      key="info_contact_phone"
-                      text-value="PurchaseCtrl.order.details.info_contact_phone"
-                      label="PURCHASES.INFO.CONTACT_PHONE">
-                    </bh-input-text>
+                <bh-input-text
+                  key="info_contact_title"
+                  text-value="PurchaseCtrl.order.details.info_contact_title"
+                  label="PURCHASES.INFO.CONTACT_TITLE">
+                </bh-input-text>
 
-                    <hr>
+                <bh-input-text
+                  key="info_contact_phone"
+                  text-value="PurchaseCtrl.order.details.info_contact_phone"
+                  label="PURCHASES.INFO.CONTACT_PHONE">
+                </bh-input-text>
+              </div>
+              <!-- delivery information -->
+              <div class="col-md-4">
+                <bh-input-text
+                  key="info_delivery_date"
+                  text-value="PurchaseCtrl.order.details.info_delivery_date"
+                  label="PURCHASES.INFO.DELIVERY_DATE">
+                </bh-input-text>
 
-                    <bh-input-text
-                      key="info_purchase_number"
-                      text-value="PurchaseCtrl.order.details.info_purchase_number"
-                      label="PURCHASES.INFO.PURCHASE_NUMBER">
-                    </bh-input-text>
-                    <bh-input-text
-                      key="info_prf_number"
-                      text-value="PurchaseCtrl.order.details.info_prf_number"
-                      label="PURCHASES.INFO.PRF_NUMBER">
-                    </bh-input-text>
-                  </div>
+                <bh-input-text
+                  key="info_delivery_location"
+                  text-value="PurchaseCtrl.order.details.info_delivery_location"
+                  label="PURCHASES.INFO.DELIVERY_LOCATION">
+                </bh-input-text>
 
+                <div
+                  class="form-group">
+                  <label class="control-label" translate>PURCHASES.INFO.DELIVERY_CONDITION</label>
+                  <textarea
+                    ng-model="PurchaseCtrl.order.details.info_delivery_condition"
+                    name="info_delivery_condition"
+                    class="form-control"
+                    rows="2"
+                    ng-maxlength="PurchaseCtrl.maxLength">
+                  </textarea>
                 </div>
-                <div ng-if="PurchaseCtrl.enterprise.settings.enable_prf_details" class="col-md-4">
-
-                  <bh-input-text
-                    key="info_delivery_date"
-                    text-value="PurchaseCtrl.order.details.info_delivery_date"
-                    label="PURCHASES.INFO.DELIVERY_DATE">
-                  </bh-input-text>
 
-                  <bh-input-text
-                    key="info_delivery_location"
-                    text-value="PurchaseCtrl.order.details.info_delivery_location"
-                    label="PURCHASES.INFO.DELIVERY_LOCATION">
-                  </bh-input-text>
-  
-                  <div
-                    class="form-group">
-                    <label class="control-label" translate>PURCHASES.INFO.DELIVERY_CONDITION</label>
-                    <textarea
-                      ng-model="PurchaseCtrl.order.details.info_delivery_condition"
-                      name="info_delivery_condition"
-                      class="form-control"
-                      rows="2"
-                      ng-maxlength="PurchaseCtrl.maxLength">
-                    </textarea>
-                  </div>
-
-                  <div
-                    class="form-group">
-                    <label class="control-label" translate>PURCHASES.INFO.SPECIAL_INSTRUCTION</label>
-                    <textarea
-                      ng-model="PurchaseCtrl.order.details.info_special_instruction"
-                      name="info_special_instruction"
-                      class="form-control"
-                      rows="2"
-                      ng-maxlength="PurchaseCtrl.maxLength">
-                    </textarea>
-                  </div>
+                <div
+                  class="form-group">
+                  <label class="control-label" translate>PURCHASES.INFO.SPECIAL_INSTRUCTION</label>
+                  <textarea
+                    ng-model="PurchaseCtrl.order.details.info_special_instruction"
+                    name="info_special_instruction"
+                    class="form-control"
+                    rows="2"
+                    ng-maxlength="PurchaseCtrl.maxLength">
+                  </textarea>
+                </div>
 
-                  <div
-                    class="form-group">
-                    <label class="control-label" translate>PURCHASES.INFO.PAYMENT_CONDITION</label>
-                    <textarea
-                      ng-model="PurchaseCtrl.order.details.info_payment_condition"
-                      name="info_payment_condition"
-                      class="form-control"
-                      rows="2"
-                      ng-maxlength="PurchaseCtrl.maxLength">
-                    </textarea>
-                  </div>
+                <div
+                  class="form-group">
+                  <label class="control-label" translate>PURCHASES.INFO.PAYMENT_CONDITION</label>
+                  <textarea
+                    ng-model="PurchaseCtrl.order.details.info_payment_condition"
+                    name="info_payment_condition"
+                    class="form-control"
+                    rows="2"
+                    ng-maxlength="PurchaseCtrl.maxLength">
+                  </textarea>
                 </div>
               </div>
             </div>
diff --git a/server/controllers/finance/purchases.js b/server/controllers/finance/purchases.js
index 2cb3712ee7..d0b592ffd0 100644
--- a/server/controllers/finance/purchases.js
+++ b/server/controllers/finance/purchases.js
@@ -130,7 +130,8 @@ function lookupPurchaseOrder(uid) {
       p.info_delivery_condition,
       p.info_special_instruction,
       p.info_payment_condition,
-      s.address_1, s.email, s.phone
+      s.address_1, s.email, s.phone,
+      curr.format_key, curr.symbol
     FROM purchase AS p
       JOIN document_map dm ON p.uuid = dm.uuid
       JOIN project ON p.project_id = project.id
@@ -138,6 +139,7 @@ function lookupPurchaseOrder(uid) {
       JOIN project AS pr ON p.project_id = pr.id
       JOIN user AS u ON u.id = p.user_id
       JOIN purchase_status AS ps ON ps.id = p.status_id
+      JOIN currency curr ON curr.id = p.currency_id
     WHERE p.uuid = ?;
   `;
 
diff --git a/server/controllers/inventory/reports/purchases.receipt.handlebars b/server/controllers/inventory/reports/purchases.receipt.handlebars
index 3c4abde683..8018bad993 100644
--- a/server/controllers/inventory/reports/purchases.receipt.handlebars
+++ b/server/controllers/inventory/reports/purchases.receipt.handlebars
@@ -8,11 +8,11 @@
     white-space: -pre-wrap;
     white-space: -o-pre-wrap;
     word-wrap: break-word;
-    font-size: 0.7em;
+    font-size: 0.5em;
   }
 </style>
 
-<div class="container" style="font-size: 0.9em;">
+<div class="container" style="font-size: 0.8em;">
   {{#> header}}
     <h3 class="text-right"><strong>{{purchase.reference}}</strong></h3>
     {{#if metadata.enterprise.settings.enable_barcodes}}
@@ -34,7 +34,7 @@
     </div>
   </div>
   
-  {{#if metadata.enterprise.settings.purchase_general_condition}}
+  {{#if metadata.enterprise.settings.enable_prf_details}}
     <div style="border: 1px solid #ccc; padding: 5px; margin-bottom: 15px;">
       <div class="row">
         <div class="col-xs-3"><span class="text-capitalize">{{translate 'PURCHASES.INFO.PURCHASE_NUMBER'}}</span></div>
@@ -81,20 +81,25 @@
 
   <table class="table table-condensed table-report">
     <thead>
-      <th>{{translate "FORM.LABELS.CODE" }}</th>
-      <th>{{translate "FORM.LABELS.INVENTORY_ITEM" }}</th>
-      <th>{{translate "FORM.LABELS.TYPE" }}</th>
-      <th>{{translate "FORM.LABELS.QUANTITY" }}</th>
-      <th>{{translate "FORM.LABELS.UNIT_PRICE" }}</th>
-      <th>{{translate "FORM.LABELS.TOTAL" }}</th>
+      <th colspan="4" class="text-right">{{translate "FORM.LABELS.CURRENCY" }}</th>
+      <th class="text-center text-uppercase">{{ purchase.format_key }}</th>
+      <th class="text-center text-uppercase">{{ purchase.format_key }}</th>
+    </thead>
+    <thead>
+      <th class="text-center">{{translate "FORM.LABELS.NR" }}</th>
+      <th class="text-center">{{translate "FORM.LABELS.QUANTITY" }}</th>
+      <th class="text-center">{{translate "FORM.LABELS.UNITS" }}</th>
+      <th class="text-center">{{translate "FORM.LABELS.DESCRIPTION" }}</th>
+      <th class="text-center">{{translate "FORM.LABELS.UNIT_PRICE" }}</th>
+      <th class="text-center">{{translate "FORM.LABELS.TOTAL" }}</th>
     </thead>
     <tbody>
       {{#each purchase.items}}
         <tr>
-          <td>{{this.code}}</td>
-          <td>{{this.text}}</td>
-          <td translate>{{this.unit}}</td>
+          <td class="text-right">{{add @index 1}}</td>
           <td class="text-right">{{this.quantity}}</td>
+          <td>{{translate this.unit_type}}</td>
+          <td>{{this.text}}</td>
           <td class="text-right">{{currency this.unit_price ../purchase.currency_id}}</td>
           <td class="text-right">{{currency this.total ../purchase.currency_id}}</td>
         </tr>
@@ -187,8 +192,8 @@
 
   <footer></footer>
 
-  {{#if metadata.enterprise.settings.purchase_general_condition}}
-    <div class="text-justify" style="width: 700px;">
+  {{#if metadata.enterprise.settings.enable_prf_details}}
+    <div class="text-justify" style="width: 700px; padding-top:50px;">
       <pre>{{ metadata.enterprise.settings.purchase_general_condition }}</pre>
     </div>
   {{/if}}