Maharshi Patel
935f31eff9
fix: test cases added for item group
2022-11-01 12:55:46 +05:30
Maharshi Patel
d100e68fd0
Merge branch 'frappe:develop' into fix-pricing-rule-item-group-uom
2022-10-19 11:08:05 +05:30
ruthra kumar
f844097f8e
Merge pull request #32635 from ruthra-kumar/fix_tax_or_charges_acc_updating_voucher_outstanding
...
fix: Integrity Error on PLE while submitting sales invoice
2022-10-19 09:43:24 +05:30
Maharshi Patel
96b4211ea1
fix: pricing rule for non stock UOM and conversions
...
* fix: pricing rule for non stock UOM and conversions
2022-10-18 22:26:11 +05:30
ruthra kumar
8f42e7f703
test: use payable account in tax and to trigger party validation
2022-10-18 17:27:46 +05:30
rohitwaghchaure
f08c42e920
Merge pull request #32520 from s-aga-r/refactor/stock/reports
...
refactor: rewrite stock reports queries in qb
2022-10-18 13:48:15 +05:30
Sagar Sharma
ae8a63827d
Merge branch 'develop' into refactor/stock/reports
2022-10-18 10:48:52 +05:30
Deepesh Garg
7184330acd
Merge pull request #32527 from s-aga-r/refactor/buying/reports
...
refactor: rewrite buying reports queries in qb
2022-10-18 10:06:10 +05:30
ruthra kumar
43b80683eb
fix: party type and party mandatory on updating outstanding
2022-10-18 09:33:37 +05:30
Deepesh Garg
32117c030a
Merge pull request #32622 from deepeshgarg007/ignore_pi_reference
...
fix: Ignore linked purchase invoice on cancel
2022-10-17 19:38:26 +05:30
Deepesh Garg
faadf78332
fix: Ignore linked purchase invoice on cancel
2022-10-17 18:50:54 +05:30
ruthra kumar
aab325eca5
Merge pull request #32598 from ruthra-kumar/refactor_create_payment_ledger_function
...
refactor: split ple creation function into two
2022-10-17 18:44:36 +05:30
ruthra kumar
9b50221bf0
refactor: split ple creation function into two
...
refactor create_payment_ledger_entry function into 2.
one for generating ple map and one for DB entry creation
2022-10-17 18:02:52 +05:30
Deepesh Garg
98b695984b
Merge branch 'develop' into refactor/buying/reports
2022-10-17 17:15:27 +05:30
Deepesh Garg
8b16ba7f3a
Merge branch 'develop' into refactor/stock/reports
2022-10-17 17:15:18 +05:30
Deepesh Garg
d794b834fd
Merge pull request #32618 from ruthra-kumar/fix_failing_github_unit_test_workflow
...
test: lead creation and deletion restricted to dummy company
2022-10-17 17:11:51 +05:30
Sagar Sharma
582e1bf10c
Merge branch 'develop' into refactor/stock/reports
2022-10-17 16:30:43 +05:30
ruthra kumar
ced8d2a537
test: lead creation and deletion restricted to dummy company
2022-10-17 16:26:07 +05:30
Sagar Sharma
cda0baa7fe
Merge branch 'develop' into refactor/buying/reports
2022-10-17 16:10:52 +05:30
rohitwaghchaure
0f358e3ca1
Merge pull request #32613 from rohitwaghchaure/group-warehouse-filter
...
fix: group warehouse filter not working for Batch-wise Balance history report
2022-10-17 15:12:42 +05:30
Rohit Waghchaure
2481574a28
chore: seperate function to apply filter for warehouse in case of QB
2022-10-17 14:25:23 +05:30
Rohit Waghchaure
6381e75fa5
fix: group warehouse filter not working for Batchwise Balance history report
2022-10-17 12:17:05 +05:30
Sagar Sharma
484b115b09
Merge branch 'develop' into refactor/stock/reports
2022-10-17 12:08:44 +05:30
Sagar Sharma
309fc6db43
Merge branch 'develop' into refactor/buying/reports
2022-10-17 12:08:37 +05:30
Deepesh Garg
dc3fe85921
chore: Remove HRMS related code ( #32607 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2022-10-17 11:37:50 +05:30
Sagar Sharma
682fb171cb
Merge branch 'develop' into refactor/buying/reports
2022-10-16 11:50:31 +05:30
Sagar Sharma
177c9c93e8
Merge branch 'develop' into refactor/stock/reports
2022-10-16 11:50:26 +05:30
Deepesh Garg
40b3d8ec1b
Merge pull request #32591 from nabinhait/crm-notes-to-comments
...
fix: Renamed Notes section to Comments
2022-10-15 17:42:45 +05:30
Deepesh Garg
fc795275f2
Merge pull request #32594 from deepeshgarg007/order_account
...
fix: Party account for multi-order invoices
2022-10-15 16:58:51 +05:30
Sagar Sharma
5f3796f6ea
Merge branch 'develop' into refactor/buying/reports
2022-10-14 11:57:11 +05:30
Sagar Sharma
3c1bd90d0d
Merge branch 'develop' into refactor/stock/reports
2022-10-14 11:57:04 +05:30
Anand Baburajan
9127b96033
fix: add project settings to projects workspace ( #32568 )
2022-10-13 18:27:11 +05:30
Ankush Menat
50e9698932
chore: drop dead code ( #32595 )
...
[skip ci]
2022-10-13 15:25:22 +05:30
Deepesh Garg
fd49503ba2
fix: Party account for multi-order invoices
2022-10-13 15:08:34 +05:30
ruthra kumar
2d0217abd5
Merge pull request #32567 from ruthra-kumar/remove_duplicate_ple_on_item_value_repost
...
fix: deduplicate Payment Ledger on Item value repost
2022-10-13 14:01:59 +05:30
Nabin Hait
f561d8f689
fix: Renamed Dashboard tab label to Connections
2022-10-13 12:43:08 +05:30
Nabin Hait
56a4a77398
fix: Renamed Notes section to Comments
2022-10-13 12:35:04 +05:30
Maharshi Patel
edc93ab6aa
fix: pricing rule item group uom
...
Handle use case where pricing rule is applied on item group and user have selected UOM. pricing rule was applied on all UOM's even after specifying UOM. i have added condition in sql to fix this.
2022-10-13 12:00:30 +05:30
Raffael Meyer
e543dca6a0
fix: don't try to update youtube data if disabled in settings ( #32588 )
...
fix: cast value from db
[skip ci]
2022-10-13 11:53:52 +05:30
Sagar Sharma
d6c28aa64d
Merge pull request #32576 from s-aga-r/fix/github-issue/32559
...
fix: `Brand Defaults` filters
2022-10-12 19:22:47 +05:30
Sagar Sharma
bb7897caab
Merge branch 'develop' into refactor/stock/reports
2022-10-12 19:21:15 +05:30
Sagar Sharma
610d18cc25
Merge branch 'develop' into refactor/buying/reports
2022-10-12 19:21:10 +05:30
Sagar Sharma
7dfd741ced
Merge branch 'develop' into fix/github-issue/32559
2022-10-12 19:20:39 +05:30
rohitwaghchaure
e583d17062
Merge pull request #32583 from rohitwaghchaure/removed-unnecessary-imports
...
fix: removed unnecessary imports
2022-10-12 17:09:08 +05:30
Rohit Waghchaure
692462d7c8
fix: removed unnecessary imports
2022-10-12 16:30:48 +05:30
Deepesh Garg
43c2bd1351
Merge pull request #32272 from deepeshgarg007/internal_transfer_precision_fixes
...
fix: Incoming rate precision fixes for intra company transfer
2022-10-12 16:23:16 +05:30
Deepesh Garg
ab137472b0
Merge pull request #32563 from rohitwaghchaure/fixed-source-stock-reposting-for-purchase-flow
...
fix: consider sales rate as incoming rate for transit warehouse in purchase flow
2022-10-12 16:20:12 +05:30
ruthra kumar
eb819368aa
test: dedeplication on payment ledger upon repost
2022-10-12 16:08:59 +05:30
Deepesh Garg
9aa5e20ef7
chore: check only for inter-company transfers
2022-10-12 15:53:28 +05:30
Rohit Waghchaure
98bf8e1304
fix: test case
2022-10-12 15:45:36 +05:30
