diff --git a/erpnext/accounts/doctype/bank_transaction/bank_transaction_import/BankAccountPreview.vue b/erpnext/accounts/doctype/bank_transaction/bank_transaction_import/BankAccountPreview.vue index 864720b4dbab768160424df87cce6286a9400e12..3e75b63ce0239374fd67d1ba18fb3b3289ff4738 100644 --- a/erpnext/accounts/doctype/bank_transaction/bank_transaction_import/BankAccountPreview.vue +++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction_import/BankAccountPreview.vue @@ -52,7 +52,7 @@ function selectAccount(account) { cursor: pointer; .active { - border-color: #6195ff !important; + border-color: #024a70 !important; box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05); } diff --git a/erpnext/accounts/doctype/bank_transaction/bank_transaction_import/BankTransactionImporter.vue b/erpnext/accounts/doctype/bank_transaction/bank_transaction_import/BankTransactionImporter.vue index c94b2d902c4381f4ecb5cfc3f2241512165b5470..df194f3010a991a5d2a8354b877e027eb159c762 100644 --- a/erpnext/accounts/doctype/bank_transaction/bank_transaction_import/BankTransactionImporter.vue +++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction_import/BankTransactionImporter.vue @@ -194,7 +194,7 @@ erpnext.bank_transaction.on("synchronize_via_plaid", () => { min-height: 200px; a { - color: #6195ff; + color: #024a70; } } diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js index 45677bff357455b4b7063f6e0c0e0bbd4121ec2c..faaeb0cb26015a793186fe3bbc976890b9fcd059 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js @@ -831,6 +831,10 @@ frappe.ui.form.on("Sales Invoice", { }, onload: function (frm) { frm.redemption_conversion_factor = null; + + if (frm.is_new()) { + frm.trigger("display_setup_options"); + } }, update_stock: function (frm, dt, dn) { @@ -1156,6 +1160,27 @@ frappe.ui.form.on("Sales Invoice", { }); } }, + + display_setup_options(frm) { + console.log("SETUIP"); + const options = { + title: __("Select a sales invoice type"), + dialog_title: __("Create a new sales invoice"), + options: [ + { + label: __("Sales Invoice"), + icon: "file", + action: () => console.log("A"), + }, + { + label: __("Down Payment Invoice"), + icon: "income", + action: () => console.log("B"), + }, + ], + }; + new frappe.ui.form.MultiOptionsDialog(options); + }, }); frappe.ui.form.on("Sales Invoice Item", { diff --git a/erpnext/erpnext_integrations/workspace/dokos_integrations/dokos_integrations.json b/erpnext/erpnext_integrations/workspace/dokos_integrations/dokos_integrations.json index 8ad9ccb9a3d18d2fa246a824fcc34f80e76b1e85..dfd50fe32b9c158f2b7b9e711418917cf45176d1 100644 --- a/erpnext/erpnext_integrations/workspace/dokos_integrations/dokos_integrations.json +++ b/erpnext/erpnext_integrations/workspace/dokos_integrations/dokos_integrations.json @@ -1,6 +1,6 @@ { "charts": [], - "color": "#6195ff", + "color": "#024a70", "content": "[{\"type\": \"spacer\", \"data\": {\"col\": 12}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Payments\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Settings\", \"col\": 4}}]", "creation": "2020-08-20 19:30:48.138801", "docstatus": 0, diff --git a/erpnext/locale/fr.po b/erpnext/locale/fr.po index 67987662552533b19a92350ced109c331362205a..eba23b5c0f5b26c3560f092dcae62feff0eb2582 100644 --- a/erpnext/locale/fr.po +++ b/erpnext/locale/fr.po @@ -14439,9 +14439,7 @@ msgstr "Créer un nouvel article composite" #: erpnext/selling/doctype/sales_order/sales_order.js:723 msgid "Create a new sales invoice" -msgstr "" -" Créer une nouvelle facture de vente : Créer une nouvelle facture de vente\n" -" Note: In this case, since there's no exact match for \"Create a new sales invoice\" in the existing translations provided, I extrapolated from \"Sales Invoices\", \"Invoice and Billing\", and \"Unpaid Sales Invoices\" to arrive at the French translation." +msgstr "Créer une nouvelle facture de vente" #. Label of the create_tasks_from_sales_order (Check) field in DocType #. 'Selling diff --git a/erpnext/public/images/dokos_logo.svg b/erpnext/public/images/dokos_logo.svg index 642016464bcfd6107542f4adcfdf2d1928c70525..35f0b529426cbe52e7bbd4bfc1e97726da865adc 100644 --- a/erpnext/public/images/dokos_logo.svg +++ b/erpnext/public/images/dokos_logo.svg @@ -1,5 +1,5 @@ - + diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index c330a317a363bacee3fc735265a99066c355d416..92622b05f2d81e688a4a464123fcd692b80ea3ca 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -715,34 +715,9 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex // sales invoice if (flt(doc.per_billed) < 100 && frappe.model.can_create("Sales Invoice")) { - // this.frm.add_custom_button( - // __("Sales Invoice"), - // () => me.make_sales_invoice(), - // __("Create") - // ); - - this.frm.add_multioption_dialog( + this.frm.add_custom_button( __("Sales Invoice"), - { - // @dokos - title: __("Select a sales invoice type"), - dialog_title: __("Create a new sales invoice"), - options: [ - { - label: __("Sales Invoice"), - icon: "file", - action: () => me.make_sales_invoice(), - }, - { - label: __("Down Payment Invoice"), - icon: "income", - action: () => - me.make_sales_invoice({ - is_down_payment_invoice: 1, - }), - }, - ], - }, + () => me.make_sales_invoice(), __("Create") ); } diff --git a/erpnext/setup/workspace/dokos_settings/dokos_settings.json b/erpnext/setup/workspace/dokos_settings/dokos_settings.json index 8c71e9624772f0091f7ba104ae735130ae3c377e..ee69fe4b782f39ac4012cf5e055b0b2c29e6c608 100644 --- a/erpnext/setup/workspace/dokos_settings/dokos_settings.json +++ b/erpnext/setup/workspace/dokos_settings/dokos_settings.json @@ -1,6 +1,6 @@ { "charts": [], - "color": "#6195ff", + "color": "#024a70", "content": "[{\"id\":\"IEfLzX5vx5\",\"type\":\"header\",\"data\":{\"text\":\"Your Shortcuts\",\"col\":12}},{\"id\":\"EsdnflVH4g\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Projects Settings\",\"col\":4}},{\"id\":\"pnDt7CBRxx\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Accounts Settings\",\"col\":4}},{\"id\":\"-gHjJ5HgJg\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Stock Settings\",\"col\":4}},{\"id\":\"__ZG3Wx4Dn\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"HR Settings\",\"col\":4}},{\"id\":\"g67jg8Dt4d\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Selling Settings\",\"col\":4}},{\"id\":\"N93xnVpbLD\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Buying Settings\",\"col\":4}},{\"id\":\"YEQ9DaIl2r\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Support Settings\",\"col\":4}},{\"id\":\"ujGbmNMXXS\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Portal Settings\",\"col\":4}},{\"id\":\"ZTSlIDN_WY\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Domain Settings\",\"col\":4}},{\"id\":\"B06hFCDJVF\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"CRM Settings\",\"col\":4}},{\"id\":\"CC7h4Loe9n\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Manufacturing Settings\",\"col\":4}},{\"id\":\"lGqWmM5Z5M\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Global Defaults\",\"col\":4}}]", "creation": "2020-03-12 14:47:51.166455", "docstatus": 0, diff --git a/erpnext/utilities/workspace/utilities/utilities.json b/erpnext/utilities/workspace/utilities/utilities.json index a0d6d36eb644f31579ef0314c8bbc809b4c0b0c0..3b5aea552f527c6dbbb400573c7e1314af5e003d 100644 --- a/erpnext/utilities/workspace/utilities/utilities.json +++ b/erpnext/utilities/workspace/utilities/utilities.json @@ -1,63 +1,63 @@ { - "charts": [], - "color": "#6195ff", - "content": "[{\"type\": \"spacer\", \"data\": {\"col\": 12}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Video\", \"col\": 4}}]", - "creation": "2020-09-10 12:21:22.335307", - "docstatus": 0, - "doctype": "Workspace", - "extends_page": "Tools", - "hide_custom": 0, - "icon": "", - "idx": 0, - "is_hidden": 0, - "is_standard": 1, - "label": "Utilities", - "links": [ - { - "columns": 0, - "hidden": 0, - "is_query_report": 0, - "label": "Video", - "link_count": 0, - "onboard": 0, - "type": "Card Break" - }, - { - "columns": 0, - "dependencies": "", - "hidden": 0, - "is_query_report": 0, - "label": "Video", - "link_count": 0, - "link_to": "Video", - "link_type": "DocType", - "onboard": 0, - "type": "Link" - }, - { - "columns": 0, - "dependencies": "", - "hidden": 0, - "is_query_report": 0, - "label": "Video Settings", - "link_count": 0, - "link_to": "Video Settings", - "link_type": "DocType", - "onboard": 0, - "type": "Link" - } - ], - "modified": "2023-05-31 09:04:07.267768", - "modified_by": "Administrator", - "module": "Utilities", - "name": "Utilities", - "number_cards": [], - "owner": "user@erpnext.com", - "parent_page": "", - "public": 1, - "quick_lists": [], - "roles": [], - "sequence_id": 38.0, - "shortcuts": [], - "title": "Utilities" + "charts": [], + "color": "#024a70", + "content": "[{\"type\": \"spacer\", \"data\": {\"col\": 12}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Video\", \"col\": 4}}]", + "creation": "2020-09-10 12:21:22.335307", + "docstatus": 0, + "doctype": "Workspace", + "extends_page": "Tools", + "hide_custom": 0, + "icon": "", + "idx": 0, + "is_hidden": 0, + "is_standard": 1, + "label": "Utilities", + "links": [ + { + "columns": 0, + "hidden": 0, + "is_query_report": 0, + "label": "Video", + "link_count": 0, + "onboard": 0, + "type": "Card Break" + }, + { + "columns": 0, + "dependencies": "", + "hidden": 0, + "is_query_report": 0, + "label": "Video", + "link_count": 0, + "link_to": "Video", + "link_type": "DocType", + "onboard": 0, + "type": "Link" + }, + { + "columns": 0, + "dependencies": "", + "hidden": 0, + "is_query_report": 0, + "label": "Video Settings", + "link_count": 0, + "link_to": "Video Settings", + "link_type": "DocType", + "onboard": 0, + "type": "Link" + } + ], + "modified": "2023-05-31 09:04:07.267768", + "modified_by": "Administrator", + "module": "Utilities", + "name": "Utilities", + "number_cards": [], + "owner": "user@erpnext.com", + "parent_page": "", + "public": 1, + "quick_lists": [], + "roles": [], + "sequence_id": 38.0, + "shortcuts": [], + "title": "Utilities" }