From 931541354a0be9da00b5a5948362269e87527abb Mon Sep 17 00:00:00 2001 From: mbayopanda Date: Thu, 29 Sep 2022 17:22:18 +0100 Subject: [PATCH] Add info to purchase order --- client/src/i18n/en/entity.json | 1 + client/src/i18n/fr/entity.json | 1 + client/src/i18n/fr/purchases.json | 19 ++ client/src/js/components/bhInputText.js | 1 + client/src/modules/entities/entities.js | 5 + .../src/modules/entities/entities.service.js | 2 +- .../modules/entities/modals/entity.modal.html | 6 + .../purchases/create/PurchaseOrderForm.js | 15 +- .../purchases/create/createUpdate.html | 202 ++++++++++++------ .../modules/suppliers/modal/createUpdate.html | 61 +++--- .../modules/suppliers/modal/createUpdate.js | 16 +- .../modules/templates/bhInputText.tmpl.html | 1 + server/controllers/admin/entities/index.js | 4 +- server/controllers/admin/suppliers.js | 30 ++- server/controllers/finance/purchases.js | 13 +- .../reports/purchases.receipt.handlebars | 132 +++++++++++- .../partials/enterpriseDetails.handlebars | 3 +- server/models/migrations/next/migrate.sql | 16 +- server/models/schema.sql | 16 +- 19 files changed, 429 insertions(+), 115 deletions(-) diff --git a/client/src/i18n/en/entity.json b/client/src/i18n/en/entity.json index ab13d777dd..f34158e81f 100644 --- a/client/src/i18n/en/entity.json +++ b/client/src/i18n/en/entity.json @@ -5,6 +5,7 @@ "ASSIGNED_TO": "Assigned to", "EDIT_ENTITY":"Edit Contact", "NAME":"Name", + "TITLE":"Title", "SEX":"Sex", "PHONE":"Phone", "EMAIL":"Email", diff --git a/client/src/i18n/fr/entity.json b/client/src/i18n/fr/entity.json index e132f397db..63901e169d 100644 --- a/client/src/i18n/fr/entity.json +++ b/client/src/i18n/fr/entity.json @@ -5,6 +5,7 @@ "ASSIGNED_TO": "Attribué à", "EDIT_ENTITY":"Modifier le contact", "NAME":"Nom", + "TITLE":"Titre", "SEX":"Sex", "PHONE":"Téléphone", "EMAIL":"Email", diff --git a/client/src/i18n/fr/purchases.json b/client/src/i18n/fr/purchases.json index af693da888..9e64caf4cc 100644 --- a/client/src/i18n/fr/purchases.json +++ b/client/src/i18n/fr/purchases.json @@ -25,6 +25,25 @@ "RECEIVED_DESC" : "La commande a été reçu et se trouve dans le stock", "WAITING_CONFIRMATION" : "En Attente de confirmation", "WAITING_CONFIRMATION_DESC" : "Le fournisseur n'a pas encore confirmé qu'il saura fournir la commande" + }, + "INFO" : { + "PURCHASE_NUMBER" : "Numero commande", + "PRF_NUMBER" : "Numero PRF", + "CONTACT_NAME" : "Personne de contact", + "CONTACT_PHONE" : "Téléphone du contact", + "CONTACT_TITLE" : "Titre du contact", + "DELIVERY_LOCATION" : "Lieu de livraison", + "DELIVERY_DATE" : "Date de livraison", + "DELIVERY_CONDITION" : "Condition de livraison", + "PAYMENT_CONDITION" : "Condition de paiement", + "SPECIAL_INSTRUCTION" : "Instruction speciale", + "REQUESTED_BY": "Demandé par (nom en caractères d'imprimerie)", + "APPROVED_BY": "Approuvé par (nom en caractères d'imprimerie)", + "APPROVED_TWO_BY": "Deuxième approbation (nom en caractères d'imprimerie)", + "SIGNATURE": "Signature", + "DATE": "Date", + "TITLE": "Titre", + "SUPPLIER_OBLIGATION": "Le fournisseur est tenu de signer et de renvoyer une copie de ce bon de commande :" } } } diff --git a/client/src/js/components/bhInputText.js b/client/src/js/components/bhInputText.js index 82878e1b4a..233e82dd8d 100644 --- a/client/src/js/components/bhInputText.js +++ b/client/src/js/components/bhInputText.js @@ -15,6 +15,7 @@ angular.module('bhima.components') key : '@?', description : '@?', isCurrency : ' util.maskObjectFromKeys(entity, entityKeys); return service; diff --git a/client/src/modules/entities/modals/entity.modal.html b/client/src/modules/entities/modals/entity.modal.html index f223f75c9d..f97088e81e 100644 --- a/client/src/modules/entities/modals/entity.modal.html +++ b/client/src/modules/entities/modals/entity.modal.html @@ -23,6 +23,12 @@ + +
+ + +
+
    -
  1. TREE.INVENTORY
    2. -
  2. PURCHASES.PAGE_TITLE
    3. +
  3. PURCHASES.PAGE_TITLE
    4. +
  4. TREE.PURCHASE
@@ -22,59 +22,52 @@
-
+
- - + + -
- + + -
- -
-
- -
-
- -
+ + -
-
-
-
+
+ + + + +
+
+ + -
@@ -107,24 +100,6 @@ {{ PurchaseCtrl.currentExchangeRate | currency:PurchaseCtrl.rate.currency.id }} FORM.INFO.PER {{PurchaseCtrl.enterprise.currencySymbol}}
- -
- - -
-
-
-
-
@@ -142,12 +117,119 @@
+
+ + +
+ +
+
+ +
+
+ +
+ +
+
+
+
+ +
+ + +
+
+
+ + + + + + + +
+ + +
+
+
+
+ + +
+
+
+
+
+
+
+ + +
+
+
+
diff --git a/client/src/modules/suppliers/modal/createUpdate.html b/client/src/modules/suppliers/modal/createUpdate.html index 284f3e9347..40776deead 100644 --- a/client/src/modules/suppliers/modal/createUpdate.html +++ b/client/src/modules/suppliers/modal/createUpdate.html @@ -13,9 +13,8 @@
-
-
- +
+
+ + + + +
-
-
-
- FORM.LABELS.OPTIONAL_INFO - - - +
+ + - - + + -
- - -
-
-
+
+ + +
+
-
+
diff --git a/client/src/modules/suppliers/modal/createUpdate.js b/client/src/modules/suppliers/modal/createUpdate.js index f89fa58340..0ae3f42cb2 100644 --- a/client/src/modules/suppliers/modal/createUpdate.js +++ b/client/src/modules/suppliers/modal/createUpdate.js @@ -2,12 +2,12 @@ angular.module('bhima.controllers') .controller('SupplierCreateUpdateController', SupplierCreateUpdateController); SupplierCreateUpdateController.$inject = [ - 'data', '$state', 'SupplierService', + 'data', 'SupplierService', 'NotifyService', '$uibModalInstance', 'CreditorGroupService', ]; -function SupplierCreateUpdateController(data, $state, SupplierService, Notify, +function SupplierCreateUpdateController(data, SupplierService, Notify, Instance, CreditorGroups) { const vm = this; vm.close = Instance.close; @@ -17,6 +17,10 @@ function SupplierCreateUpdateController(data, $state, SupplierService, Notify, vm.isCreate = !vm.supplier.uuid; vm.action = vm.isCreate ? 'FORM.LABELS.CREATE' : 'FORM.LABELS.UPDATE'; + vm.onSelectContact = entity => { + vm.supplier.contact_uuid = entity.uuid; + }; + init(); function submit(form) { @@ -43,7 +47,15 @@ function SupplierCreateUpdateController(data, $state, SupplierService, Notify, // load Creditors CreditorGroups.read().then(groups => { vm.groups = groups; + return data.uuid ? SupplierService.read(data.uuid) : null; }) + .then(supplier => { + delete supplier.contact_name; + delete supplier.contact_phone; + delete supplier.contact_email; + delete supplier.contact_title; + vm.supplier = supplier || data; + }) .catch(Notify.handleError); } diff --git a/client/src/modules/templates/bhInputText.tmpl.html b/client/src/modules/templates/bhInputText.tmpl.html index 76548824f8..35e482fc7b 100644 --- a/client/src/modules/templates/bhInputText.tmpl.html +++ b/client/src/modules/templates/bhInputText.tmpl.html @@ -27,6 +27,7 @@ ng-change="$ctrl.valueChange()" input-text-field class="form-control" + ng-disabled="$ctrl.disabled" ng-required="$ctrl.required"/>
head }}
- {{#> header }} + {{#> header}}

{{purchase.reference}}

{{#if metadata.enterprise.settings.enable_barcodes}}
@@ -11,13 +11,57 @@ {{/header}} -
-
- {{translate "FORM.LABELS.SUPPLIER"}}: {{purchase.supplier}}
- {{translate "FORM.LABELS.DATE"}}: {{date purchase.date}}
- {{translate "FORM.LABELS.REFERENCE"}}: {{purchase.reference}}
- {{translate "FORM.LABELS.NOTES"}}: {{purchase.note}}
- {{translate 'TABLE.COLUMNS.RESPONSIBLE'}}: {{purchase.author}} +
+
+
+ {{translate "FORM.LABELS.DATE"}}: {{date purchase.date}}
+ {{translate "FORM.LABELS.REFERENCE"}}: {{purchase.reference}}
+ {{translate "FORM.LABELS.NOTES"}}: {{purchase.note}}
+ {{translate 'TABLE.COLUMNS.RESPONSIBLE'}}: {{purchase.author}} +
+
+
+ +
+
+
{{translate 'PURCHASES.INFO.PURCHASE_NUMBER'}}
+
  {{purchase.info_purchase_number}}
+
{{translate 'PURCHASES.INFO.PRF_NUMBER'}}
+
  {{purchase.info_prf_number}}
+ +
{{translate 'FORM.LABELS.SUPPLIER'}}:
+
  {{purchase.supplier}}
+ +
{{translate 'FORM.LABELS.ADDRESS'}}:
+
  {{purchase.address_1}}
+ +
{{translate 'FORM.LABELS.PHONE'}}:
+
  {{purchase.phone}}
+
{{translate 'FORM.LABELS.EMAIL'}}:
+
  {{purchase.email}}
+ +
{{translate 'PURCHASES.INFO.CONTACT_NAME'}}:
+
  {{purchase.info_contact_name}}
+
{{translate 'PURCHASES.INFO.CONTACT_TITLE'}}:
+
  {{purchase.info_contact_title}}
+ +
{{translate 'PURCHASES.INFO.CONTACT_PHONE'}}:
+
  {{purchase.info_contact_phone}}
+ +
{{translate 'PURCHASES.INFO.DELIVERY_LOCATION'}}:
+
  {{purchase.info_delivery_location}}
+
{{translate 'PURCHASES.INFO.DELIVERY_DATE'}}:
+
  {{purchase.info_delivery_date}}
+
+ +
+
{{translate 'PURCHASES.INFO.DELIVERY_CONDITION'}}:
+
{{purchase.info_delivery_condition}}
+
+ +
+
{{translate 'PURCHASES.INFO.SPECIAL_INSTRUCTION'}}:
+
{{purchase.info_special_instruction}}
@@ -55,5 +99,77 @@ + +
+ +
+
{{translate 'PURCHASES.INFO.PAYMENT_CONDITION'}}:
+
  {{purchase.info_payment_condition}}
+
+ +
+ +
+
+
{{translate 'PURCHASES.INFO.REQUESTED_BY'}}
+
+
+
{{translate 'PURCHASES.INFO.TITLE'}}
+
+
+
{{translate 'PURCHASES.INFO.SIGNATURE'}}
+
+
+
{{translate 'PURCHASES.INFO.DATE'}}
+
+
+ +
+
+
{{translate 'PURCHASES.INFO.APPROVED_BY'}}
+
+
+
{{translate 'PURCHASES.INFO.TITLE'}}
+
+
+
{{translate 'PURCHASES.INFO.SIGNATURE'}}
+
+
+
{{translate 'PURCHASES.INFO.DATE'}}
+
+
+ +
+
+
{{translate 'PURCHASES.INFO.APPROVED_TWO_BY'}}
+
+
+
{{translate 'PURCHASES.INFO.TITLE'}}
+
+
+
{{translate 'PURCHASES.INFO.SIGNATURE'}}
+
+
+
{{translate 'PURCHASES.INFO.DATE'}}
+
+
+ +

{{translate 'PURCHASES.INFO.SUPPLIER_OBLIGATION'}}

+ +
+
+
{{translate 'PURCHASES.INFO.SIGNATURE'}}
+
+
+
{{translate 'FORM.LABELS.NAME'}}
+
+
+
{{translate 'PURCHASES.INFO.TITLE'}}
+
+
+
{{translate 'PURCHASES.INFO.DATE'}}
+
+
+
diff --git a/server/lib/template/partials/enterpriseDetails.handlebars b/server/lib/template/partials/enterpriseDetails.handlebars index c5f9424aef..8b8dee7a3d 100644 --- a/server/lib/template/partials/enterpriseDetails.handlebars +++ b/server/lib/template/partials/enterpriseDetails.handlebars @@ -27,7 +27,8 @@ {{#if @partial-block}} - {{> @partial-block}} + + {{!-- {{> @partial-block}} --}} {{/if}}
diff --git a/server/models/migrations/next/migrate.sql b/server/models/migrations/next/migrate.sql index 5ed57dca81..1f3b5218a9 100644 --- a/server/models/migrations/next/migrate.sql +++ b/server/models/migrations/next/migrate.sql @@ -1,3 +1,17 @@ /* * next version - */ \ No newline at end of file + */ +CALL add_column_if_missing('purchase', 'info_purchase_number', 'VARCHAR(50) NULL'); +CALL add_column_if_missing('purchase', 'info_prf_number', 'VARCHAR(50) NULL'); +CALL add_column_if_missing('purchase', 'info_contact_name', 'VARCHAR(50) NULL'); +CALL add_column_if_missing('purchase', 'info_contact_phone', 'VARCHAR(20) NULL'); +CALL add_column_if_missing('purchase', 'info_contact_title', 'VARCHAR(50) NULL'); +CALL add_column_if_missing('purchase', 'info_delivery_location', 'VARCHAR(100) NULL'); +CALL add_column_if_missing('purchase', 'info_delivery_date', 'VARCHAR(50) NULL'); +CALL add_column_if_missing('purchase', 'info_delivery_condition', 'TEXT NULL'); +CALL add_column_if_missing('purchase', 'info_special_instruction', 'TEXT NULL'); +CALL add_column_if_missing('purchase', 'info_payment_condition', 'TEXT NULL'); + +CALL add_column_if_missing('entity', 'title', 'VARCHAR(150) NULL'); + +CALL add_column_if_missing('supplier', 'contact_uuid', 'BINARY(16) NULL'); \ No newline at end of file diff --git a/server/models/schema.sql b/server/models/schema.sql index 4baa0799e2..545bec510d 100644 --- a/server/models/schema.sql +++ b/server/models/schema.sql @@ -1259,6 +1259,7 @@ DROP TABLE IF EXISTS `entity`; CREATE TABLE `entity` ( `uuid` BINARY(16) NOT NULL, `display_name` VARCHAR(190) NOT NULL, + `title` VARCHAR(150) NULL, `gender` CHAR(1) NOT NULL, `email` VARCHAR(150) NULL, `phone` VARCHAR(50) NULL, @@ -1407,6 +1408,16 @@ CREATE TABLE `purchase` ( `note` TEXT, `edited` BOOLEAN NOT NULL DEFAULT FALSE, `status_id` TINYINT(3) UNSIGNED NOT NULL DEFAULT 1, + `info_purchase_number` VARCHAR(50), + `info_prf_number` VARCHAR(50), + `info_contact_name` VARCHAR(50), + `info_contact_phone` VARCHAR(20), + `info_contact_title` VARCHAR(50), + `info_delivery_location` VARCHAR(100), + `info_delivery_date` VARCHAR(50), + `info_delivery_condition` TEXT, + `info_special_instruction` TEXT, + `info_payment_condition` TEXT, PRIMARY KEY (`uuid`), UNIQUE KEY `purchase_1` (`project_id`, `reference`), KEY `project_id` (`project_id`), @@ -1694,10 +1705,13 @@ CREATE TABLE `supplier` ( `phone` VARCHAR(15) DEFAULT NULL, `international` TINYINT(1) NOT NULL DEFAULT 0, `locked` TINYINT(1) NOT NULL DEFAULT 0, + `contact_uuid` BINARY(16) NULL, PRIMARY KEY (`uuid`), UNIQUE KEY `supplier_1` (`display_name`), KEY `creditor_uuid` (`creditor_uuid`), - CONSTRAINT `supplier__creditor` FOREIGN KEY (`creditor_uuid`) REFERENCES `creditor` (`uuid`) ON DELETE CASCADE ON UPDATE CASCADE + KEY `contact_uuid` (`contact_uuid`), + CONSTRAINT `supplier__creditor` FOREIGN KEY (`creditor_uuid`) REFERENCES `creditor` (`uuid`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `supplier__contact` FOREIGN KEY (`contact_uuid`) REFERENCES `entity` (`uuid`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; DROP TABLE IF EXISTS `taxe_ipr`;