48209 Commits

Author SHA1 Message Date
Gursheen Kaur Anand
f6fdfd2c01
Merge pull request #40174 from GursheenK/common-free-item-promotional-scheme
fix: promotional scheme remove free item if pricing rule matches
2024-02-29 10:18:27 +05:30
Frappe PR Bot
9dcdd5b5ef
chore: New Crowdin updates (#40052)
* New translations main.pot (French)

* New translations main.pot (Spanish)

* New translations main.pot (Arabic)

* New translations main.pot (German)

* New translations main.pot (French)

* New translations main.pot (Spanish)

* New translations main.pot (Arabic)

* New translations main.pot (German)

* New translations main.pot (German)

* New translations main.pot (German)

* New translations main.pot (German)

* New translations main.pot (German)

* New translations main.pot (German)

* New translations main.pot (German)
2024-02-28 16:32:43 +05:30
Gursheen Anand
fea20db262 fix: remove free item row only if pricing rule matches 2024-02-28 12:47:41 +05:30
rohitwaghchaure
043d9e3986
fix: Email Template None not found (#40167) 2024-02-27 22:30:01 +05:30
Deepesh Garg
dde4d9e53c
Merge pull request #40162 from vorasmit/ic-deps
fix: add flags for repost to ensure correct accounting from India Compliance App
2024-02-27 22:08:09 +05:30
Deepesh Garg
36a0569df2
Merge pull request #40137 from ljain112/fix-tax-breakup
fix: default taxable value for item not found in item list
2024-02-27 22:07:39 +05:30
rohitwaghchaure
f8ba560394
fix: Supplier users not able to see RFQ on the Portal (#40161) 2024-02-27 21:05:19 +05:30
Smit Vora
93170a56a9 fix: add flags for repost to ensure correct accounting from India Compliance App 2024-02-27 20:28:18 +05:30
rohitwaghchaure
6f5815e44f
fix: parent warehouse checks in the production plan for sub-assemblies (#40150) 2024-02-27 16:46:47 +05:30
Nabin Hait
0c52eb913b
Merge pull request #40102 from GursheenK/update_billed_amount_for_purchases
feat: toggle updation of billed amount in previous purchase docs
2024-02-27 15:49:22 +05:30
Gursheen Kaur Anand
519682bb0e
Merge pull request #40095 from GursheenK/unique-gl-account-for-plaid-bank-accounts
fix: unique GL account for plaid bank accounts
2024-02-27 15:38:03 +05:30
Gursheen Kaur Anand
5b8b40c13b
Merge pull request #40143 from GursheenK/hide-company-typeerror
fix(minor): type error for missing form object in hide_company util
2024-02-27 13:14:02 +05:30
Gursheen Anand
ceeb8fc9e5 fix: use frm instead of cur_frm 2024-02-27 13:05:29 +05:30
Gursheen Kaur Anand
b193fafe49
Merge pull request #37477 from GursheenK/editable-journal-entries
feat: editable journal entries
2024-02-27 12:59:18 +05:30
Sajad Alimoradi
c310da7b29
fix: Translate 'mode of payments' in the 'point of sale'. (#39467)
- Due to a language change, the name of 'mode of payments' was not translated in the placeholder.
2024-02-27 07:15:20 +00:00
Rushabh Mehta
d6b29d1cd7
Merge pull request #39719 from niyazrazak/patch-18
feat: project field in installation note
2024-02-27 12:44:39 +05:30
Gursheen Kaur Anand
303433c0ae
Merge branch 'develop' into editable-journal-entries 2024-02-27 12:43:32 +05:30
Gursheen Anand
20fa3da950 fix: type error for missing frm obj 2024-02-27 11:18:58 +05:30
rohitwaghchaure
bc9c480246
fix: use serial batch fields for packed items (#40140) 2024-02-26 23:57:52 +05:30
rohitwaghchaure
8aa2b7c183
fix: currency symbol in landed cost voucher and material request (#40138) 2024-02-26 22:48:10 +05:30
rohitwaghchaure
08caa7cfa1
fix: Data too long for column 'serial_no' at row 1 (#40098) 2024-02-26 18:49:56 +05:30
ljain112
5885978fc2 fix: default taxable value for item not found in item list 2024-02-26 18:41:33 +05:30
ruthra kumar
122373fcd3
Merge pull request #40133 from ruthra-kumar/reset_advance_amount_on_unreconciliation
fix: reset advance amount on unreconciliation of Sales/Purchase Orders
2024-02-26 17:51:36 +05:30
ruthra kumar
1f01ff3487 test: advance paid update on sales/purchase order unreconciliation 2024-02-26 17:32:25 +05:30
ruthra kumar
c9e2f03a3a fix: on unreconciliation, update advance paid 2024-02-26 17:08:56 +05:30
ruthra kumar
924b08e395
Merge pull request #40113 from ruthra-kumar/patch_for_dimension_creation_in_reconciliation_tool
refactor: patch to setup dimensions in Reconciliation tool
2024-02-26 11:58:51 +05:30
ruthra kumar
461fb183fc refactor: patch to setup dimensions in Reconciliation tool 2024-02-26 11:34:37 +05:30
Gursheen Kaur Anand
c9ff769d28
Merge pull request #40062 from GursheenK/sales-person-target-contributions
fix: sales person / partner achieved targets in report
2024-02-26 10:37:14 +05:30
Gursheen Kaur Anand
3658c4754f
Merge pull request #40105 from GursheenK/tax-amount-label
fix(minor): tax amount label according to party type
2024-02-26 10:33:32 +05:30
Gursheen Anand
9c8d103d8a fix: amount label according to party type 2024-02-25 21:32:24 +05:30
Gursheen Anand
6d40844894 test: pr billed amount against debit note 2024-02-25 20:03:33 +05:30
Gursheen Anand
81dbfe189e test: po billed amount against debit note 2024-02-25 19:40:28 +05:30
rohitwaghchaure
75f8464724
fix: capacity planning issue in the job card (#40092)
* fix: capacity planning issue in the job card

* test: test case to test capacity planning for workstation
2024-02-25 19:06:52 +05:30
ruthra kumar
e240ccd305
Merge pull request #40096 from ruthra-kumar/fix_fiscal_year_exception_on_demo_data_setup
fix: Fiscal Year exception on demo data setup
2024-02-25 15:42:04 +05:30
ruthra kumar
3c3c57c674 fix: Fiscal Year exception on demo data setup 2024-02-25 15:26:16 +05:30
Gursheen Anand
c42444ab3b fix: remove config for default bank account in test 2024-02-25 13:18:30 +05:30
Gursheen Anand
bf6e32a960 fix: unique gl account for plaid bank accounts 2024-02-25 13:17:41 +05:30
Gursheen Anand
9f6535472d feat: update billed amount in PO and PR 2024-02-25 11:59:44 +05:30
ruthra kumar
7cb07425b1
Merge pull request #40073 from ruthra-kumar/update_payments_section_on_item_removal
refactor: update payments section on item removal
2024-02-25 09:26:52 +05:30
rohitwaghchaure
4c9048fb39
fix: do not make MR against raw materials of available sub assemblies (#40085) 2024-02-24 17:04:55 +05:30
rohitwaghchaure
f4222be027
Merge pull request #40081 from rohitwaghchaure/fixed-10401
fix: Cannot read properties of undefined
2024-02-24 15:57:21 +05:30
Rohit Waghchaure
44ed52c5cf fix: Cannot read properties of undefined 2024-02-24 15:33:59 +05:30
rohitwaghchaure
8aaddb0f9e
Merge pull request #40079 from rohitwaghchaure/fixed-linter-issue
chore: change label name
2024-02-24 13:09:57 +05:30
Rohit Waghchaure
635174f1ce fix: change label name 2024-02-24 12:51:52 +05:30
ruthra kumar
406793a6ff refactor: update payments section on item removal 2024-02-23 17:29:08 +05:30
Gursheen Anand
7566c1ee78 test: sales person target variance 2024-02-23 15:05:36 +05:30
ruthra kumar
97c3e27c60
Merge pull request #39830 from Nihantra-Patel/fix_check_credit_limit
fix: check_credit_limit on_update_after_submit of Sales Order
2024-02-23 14:20:36 +05:30
ruthra kumar
467c0898e9 test: credit limit on update after submit 2024-02-23 14:03:09 +05:30
Gursheen Kaur Anand
26ec697a0b
Merge pull request #40040 from GursheenK/skip-discount-validation-for-rate-adjustment-entries
fix: skip max discount validation for rate adjustment
2024-02-23 12:56:38 +05:30
Gursheen Kaur Anand
3294282880
Merge pull request #40035 from GursheenK/delete-ple-on-deletion-of-transactions
fix: delete PLE containing invoice in against
2024-02-23 12:36:14 +05:30