Commit Graph

33090 Commits

Author SHA1 Message Date
Sagar Sharma
f19049e643
Merge branch 'develop' into fix/subcontracting-receipt/gl-entries 2022-09-07 14:55:56 +05:30
Sagar Sharma
01c2e4d2cf
Merge branch 'develop' into fix/v14/stock-entry/send-to-subcontractor 2022-09-07 14:52:16 +05:30
Rohit Waghchaure
ef7def8f1d fix: inventory dimension filter's label not showing in the reort 2022-09-07 14:43:12 +05:30
rohitwaghchaure
5b02adbd33
Merge pull request #32113 from rohitwaghchaure/fixed-internal-transfer-flow
fix: internal transfer flow
2022-09-07 14:26:14 +05:30
Rohit Waghchaure
9d1be48bd2 test: added test case for internal transfer 2022-09-07 13:51:52 +05:30
Devin Slauenwhite
aab2c9c682
fix: require barcode item barcode. (#31957)
* fix: require barcode item barcode.

* fix: make supplier mandatory in Item Supplier DocType

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
2022-09-07 12:59:46 +05:30
Rohit Waghchaure
b4a102d119 fix: internal transfer flow 2022-09-07 12:48:18 +05:30
ruthra kumar
a6fbb80b94 fix: import error on bank statement import
Name collision between frameworks file importer's internal log and
doctype fieldname - import_log.

Frameworks internal log overrode, doctypes field which caused failure
in basic fieldtype validation.
2022-09-07 11:19:54 +05:30
Sagar Sharma
008542b715
fix: AD not getting copied from SCO while creating a Material Transfer (#32106) 2022-09-07 10:15:43 +05:30
Deepesh Garg
8efd305afd
Merge pull request #32089 from frappe/mergify/bp/develop/pr-32086
fix: QR Code multi currency issue (backport #32086)
2022-09-07 07:46:55 +05:30
Sagar Sharma
2f00413864 fix: consider Stock Entry purpose while getting total supplied qty 2022-09-06 16:42:15 +05:30
rohitwaghchaure
c6380a25d6
Merge pull request #32063 from rohitwaghchaure/fixed-fetch-from-parent
fix: inventory dimension issues
2022-09-06 10:45:36 +05:30
Rucha Mahabal
5ab5811770
feat: tabbed view for Employee form (#31940) 2022-09-06 10:18:14 +05:30
Rohit Waghchaure
75fcab04b1 test: test cases for PI and DN 2022-09-06 01:42:57 +05:30
Nabin Hait
4b13452022 fix: drop old notes column from lead and prospect 2022-09-05 18:28:09 +05:30
Nabin Hait
2a100abef1
perf: lesser SQL queries and no validation
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2022-09-05 18:16:34 +05:30
Nabin Hait
3abd00f3bb fix: Migrate old lead notes as per the new format 2022-09-05 18:10:53 +05:30
Sagar Sharma
74c2458bdb
Merge branch 'develop' into t3 2022-09-05 13:56:21 +05:30
Sagar Sharma
a349b58306 refactor(test): test_update_reserved_qty_for_subcontracting 2022-09-05 13:55:55 +05:30
Sagar Sharma
4a7add2169 fix: validate available qty for consumption in SCR 2022-09-05 13:27:03 +05:30
hamzaali15
987ac513c8 fix: QR Code multi currency issue
When try to scan qr code on app it is showing correct values for multi currencies because it is not getting base amount

(cherry picked from commit b10a2b87b65f3c29ed0aae7f30099e9c8ad75377)
2022-09-05 07:13:32 +00:00
Nabin Hait
57257a1795
Merge pull request #32061 from resilient-tech/fix-appointment-creation
fix(Appointment): create lead notes as child table
2022-09-05 12:25:45 +05:30
Deepesh Garg
3c055f94e1
Merge pull request #31982 from FHenry/dev_enhance_upgrade_process
fix: upgrade process to version-14 when currency opportunity was not set
2022-09-04 19:03:43 +05:30
Deepesh Garg
118b0c0f86
chore: fix message 2022-09-04 19:03:16 +05:30
Deepesh Garg
10d94ed539
Merge pull request #32045 from SolufyPrivateLimited/Solufy-JET
fix: Naming series in Journal Entry Template
2022-09-04 16:34:05 +05:30
HENRY Florian
86395c6adb
feat: better Item Price list view (#31954)
* feat: better Item Price list view
2022-09-04 16:25:03 +05:30
Deepesh Garg
acb88e5c57
Merge pull request #31850 from HarryPaulo/add-two-new-filters-gross-profit
feat: two new filters for gross profit
2022-09-04 15:56:54 +05:30
Deepesh Garg
1a61d4e8a8
Merge branch 'develop' into fix-consolidation-precision-error 2022-09-04 13:18:10 +05:30
Deepesh Garg
ad8d0efa29
chore: Linting Issues 2022-09-04 13:15:59 +05:30
Rohit Waghchaure
237299948a fix: fetch from parent not working for custom field 2022-09-03 17:27:00 +05:30
rohitwaghchaure
0efc6a9abe
Merge pull request #32065 from rohitwaghchaure/not-able-to-make-variant-item
fix: not able to make variant item
2022-09-03 11:52:56 +05:30
Rohit Waghchaure
92b0f9cd7e fix: not able to make variant item 2022-09-03 11:42:04 +05:30
Sagar Vora
875ff15109 test: dont create lead manually, add coverage for notes 2022-09-02 18:30:39 +05:30
Sagar Vora
58e553151e fix(Appointment): create lead notes as child table 2022-09-02 12:42:37 +00:00
HENRY Florian
7919513c8a
Merge branch 'develop' into dev_enhance_upgrade_process 2022-09-02 13:01:06 +02:00
ruthra kumar
e424ad5ff2
Merge pull request #32054 from ruthra-kumar/bug_in_process_deferred_accounting
fix: type error on cancellation of Process Deferred Accounting
2022-09-02 16:20:31 +05:30
ruthra kumar
64f8010a25
Merge pull request #32052 from ruthra-kumar/key_error_on_consolidate_financial_report
fix: key error on consolidated financial report
2022-09-02 16:13:19 +05:30
ruthra kumar
1c385541fa test: pda document submission and cancellation 2022-09-02 12:34:02 +05:30
ruthra kumar
08f2e4edc3 fix: incorrect import parameter for cancel PDA 2022-09-02 10:51:51 +05:30
ruthra kumar
6e8395cccd fix: key error on consolidated financial report
accounts with same name but different account number will throw key
error on consolidated report
2022-09-02 09:55:24 +05:30
Sagar Sharma
68907ca783
chore: set BOM as default value for Backflush Raw Materials of Subcontract Based On (#32048)
chore: set BOM as default value for Backflush Raw Materials of Subcontract Based On in Buying Settings
2022-09-01 19:31:55 +05:30
Solufyin
2085626390
fix: Naming series in Journal Entry Template 2022-09-01 11:49:13 +05:30
HENRY Florian
b05fdb28ff
Merge branch 'develop' into dev_enhance_upgrade_process 2022-08-31 13:52:28 +02:00
Ankush Menat
30039e8e62 fix: encode thumbnail URL
If it contains space the URL won't load
2022-08-31 17:06:20 +05:30
Ankush Menat
4a38ce659d refactor!: drop redisearch
incr: replace text and tag fields

incr: use rediswrapper's make key

incr: indexDefinition from redis

incr: replace index creation

incr: replace AutoCompleter

incr: replace product search ac

incr: replace client querying

fix: broken redisearch load test

fix: pass actual query to get suggestion
2022-08-31 17:06:20 +05:30
Deepesh Garg
a76d3827ec chore: Add check for principal amount 2022-08-30 19:24:57 +05:30
Deepesh Garg
eefc9b7172 fix: Loan Interest accruals for 0 rated loans 2022-08-30 19:16:36 +05:30
Ankush Menat
ffa3071d36
fix: force delete old report docs (#32026) 2022-08-30 15:43:57 +05:30
Deepesh Garg
9e0e308a44
Merge pull request #32005 from niyazrazak/patch-4
fix: lost quotation not to expired
2022-08-30 10:33:01 +05:30
Raffael Meyer
73f4d5931d
fix: permissions for Task Type (#32016) 2022-08-29 21:56:07 +05:30
Ankush Menat
2d41704424
fix(patch): update sla doctype directly (#32014)
fix: update sla doctype directly
2022-08-29 20:50:27 +05:30
ruthra kumar
25072e5d32
Merge pull request #32009 from ruthra-kumar/add_remarks_to_payment_ledger
refactor: readd remarks field to payment ledger
2022-08-29 19:48:36 +05:30
ruthra kumar
d522f13d55 chore: add remarks migration to patches.txt 2022-08-29 15:59:56 +05:30
ruthra kumar
3a6b095ed4 chore: patch for migrating remarks to payment ledger 2022-08-29 15:59:56 +05:30
ruthra kumar
5782c4469a refactor: re-add remarks field to payment ledger and AR/AP report 2022-08-29 15:59:37 +05:30
Deepesh Garg
6881b68ed7
Merge pull request #32006 from deepeshgarg007/cash_and_non_trade_discount_rounded_total
fix: Rounded total for cash and non trade discount invoices
2022-08-29 15:35:23 +05:30
Sagar Sharma
9dbaaa33f5
fix: AD not getting copied from SCO while creating a SE (#32004) 2022-08-29 15:07:20 +05:30
MOHAMMED NIYAS
69ffef8c0e
fix: lost quotation not to expired 2022-08-29 14:47:43 +05:30
HENRY Florian
61c143cb82
Merge branch 'develop' into dev_enhance_upgrade_process 2022-08-29 10:49:11 +02:00
Deepesh Garg
318da16b99 fix: Rounded total for cash and non trade discount invoices 2022-08-29 14:18:39 +05:30
Sagar Sharma
af5cbc881f
chore: allow return of components in SCO (#31994)
chore: allow return of components in sco
2022-08-26 22:49:40 +05:30
Deepesh Garg
87ca23736d
Merge pull request #31988 from ruthra-kumar/remove_precision_discount_percentage
chore: remove precision on discount_percentage of Sales Invoice Item
2022-08-26 16:03:57 +05:30
HENRY Florian
6cd7ef9cc3
Merge branch 'develop' into dev_enhance_upgrade_process 2022-08-26 11:33:22 +02:00
ruthra kumar
c42fef541a chore: remove precision on discount_percentage of Sales Invoice Item 2022-08-26 13:15:55 +05:30
Solufyin
bd4b4ddd8b
fix: Purchase Order creation from Sales Order 2022-08-26 11:18:56 +05:30
Florian HENRY
d19b664ba9 chore: better text 2022-08-25 22:35:44 +02:00
Florian HENRY
ac66538651 chore: remove debug 2022-08-25 22:35:08 +02:00
Florian HENRY
9d02fbadb4 fix: upgrade process to version-14 when currency opportunity wass not set 2022-08-25 20:45:35 +02:00
ruthra kumar
6aa8fd0f7b fix: restrict party types to Supplier/Customer for AR/AP report 2022-08-25 15:50:06 +05:30
Sagar Sharma
8566832dd5
fix: add validation for PO in Stock Entry (#31974) 2022-08-25 15:05:13 +05:30
Deepesh Garg
9e43c9cff3
Merge pull request #31943 from nabinhait/asset-repair
fix: gl entries for asset repair
2022-08-25 13:24:26 +05:30
rohitwaghchaure
b27f3ab327
Merge pull request #31967 from rohitwaghchaure/connection-added-for-work-order
fix: material request connection on work order
2022-08-25 12:29:10 +05:30
rohitwaghchaure
dae112eed2
Merge pull request #31966 from rohitwaghchaure/set-default-supplier-from-item
fix: default supplier not set in the PP
2022-08-25 12:25:00 +05:30
Rohit Waghchaure
9ab10def49 fix: material request connection on work order 2022-08-25 12:13:17 +05:30
Deepesh Garg
c1f6dd46d1
chore: fix against account 2022-08-25 12:10:52 +05:30
Rohit Waghchaure
5fd468d9ec fix: default supplier not set in the PP 2022-08-25 11:44:12 +05:30
Deepesh Garg
e9b0c7177f
Merge branch 'develop' into fix-consolidation-precision-error 2022-08-25 11:41:20 +05:30
Samuel Danieli
915102a400
chore: german translations (#31463) 2022-08-25 11:23:38 +05:30
Deepesh Garg
5187a9a5ad
Merge pull request #31776 from HarryPaulo/fix-net-amout-sales-analytics
fix: for Tree Type item and item group show net amout
2022-08-25 11:05:18 +05:30
Deepesh Garg
9b626d06fc
Merge pull request #31909 from s-aga-r/filters/repost-item-valuation/voucher-no
fix: Add docstatus filter for voucher_no in Repost Item Valuation
2022-08-25 10:49:29 +05:30
rohitwaghchaure
1af22e5312
Merge pull request #31951 from rohitwaghchaure/maintenance-visit-issue
fix: Purposes not set in Maintenance Visit
2022-08-25 10:48:41 +05:30
Deepesh Garg
77906ea4ab
Merge pull request #31934 from ruthra-kumar/disable_discount_accounting_for_buying
refactor: disable discount accounting on Buying module(PI)
2022-08-25 10:34:30 +05:30
Deepesh Garg
40bf1a50fd
Merge pull request #31950 from ruthra-kumar/party_currency_or_multi_currency
fix: display amount in account currency if party is supplied
2022-08-25 10:33:49 +05:30
Deepesh Garg
91d6454f87
Merge pull request #31955 from FHenry/dev_fr_translation
chore: update french translation
2022-08-25 10:26:17 +05:30
ruthra kumar
e5b04d54ff fix: display amount in account currency if party is supplied 2022-08-25 10:05:25 +05:30
ruthra kumar
ee889afd4c
Merge pull request #31942 from ruthra-kumar/bug_ar_ap_report_include_payment_against_po
fix: include payment against PO in AR/AP report
2022-08-25 09:40:45 +05:30
Florian HENRY
299da5d596 chore: update fr translation 2022-08-24 21:29:22 +02:00
Florian HENRY
1f6f2747d4 chore: update fr translation 2022-08-24 21:20:23 +02:00
Florian HENRY
264f98af14 chore: update french translation 2022-08-24 15:52:00 +02:00
Suraj Shetty
122f1c0ced
fix: Explicitly commit "log_error" since its getting called during GET request (#31952) 2022-08-24 18:24:39 +05:30
Rohit Waghchaure
f9a7b31b5b fix: Purposes not set 2022-08-24 17:16:01 +05:30
ruthra kumar
36f5883dda test: payments against so/po will show up as outstanding amount
1. Class will use FrappeTestCase fixture
2. setup and teardown methods are introduced
3. test for payments against SO
2022-08-24 13:59:42 +05:30
Solufyin
0e26df331c
fix: Route condition set for stock ledger (#31935) 2022-08-24 13:28:55 +05:30
Nabin Hait
b4a2eb2e65 fix: gl entries for asset repair 2022-08-24 12:29:15 +05:30
ruthra kumar
fdd167cac1 fix: include payment against PO in AR/AP report 2022-08-24 12:24:55 +05:30
HENRY Florian
fe73d55f70
chore: add Work Order test dependencies (#31936) 2022-08-23 16:07:10 +05:30
ruthra kumar
277ef04b60 test: remove discount accounting tests 2022-08-23 15:17:27 +05:30
ruthra kumar
a956e20f29 refactor: disable discount accounting on Buying module(PI) 2022-08-23 11:36:00 +05:30
Deepesh Garg
9fd0c25c9f
Merge pull request #31910 from deepeshgarg007/cash_and_non_trade_discount_fix
fix: Cash and non trade discount calculation
2022-08-23 10:19:09 +05:30
Deepesh Garg
1cb7ae16ab chore: Linting issues 2022-08-23 09:12:20 +05:30