Deepesh Garg
be56efad26
fix: Itemised tax rate updation
2022-03-14 17:17:01 +05:30
Ankush Menat
02d64a32c2
fix(ux): negative stock warning
2022-03-14 17:16:39 +05:30
Sagar Sharma
884cd814bc
test: add test for planned_qty
...
(cherry picked from commit b22bdc5ff762d41242c742bb3f6fda64eb98fd2e)
2022-03-14 11:31:52 +00:00
Sagar Sharma
3b86d6c73c
fix: max_qty validation condition
...
(cherry picked from commit d198c488a4071d13d0891d87f790562febd44b3e)
2022-03-14 11:31:52 +00:00
Deepesh Garg
3cc2e53b08
fix: Linting Issue
2022-03-14 16:27:04 +05:30
marination
a579a211fd
chore: Re-arrange fields for consistency with base currency LHS
2022-03-14 16:15:12 +05:30
Deepesh Garg
b37559c535
fix: KSA E-Invoice QR Code showing wrong VAT amount
2022-03-14 16:13:35 +05:30
marination
dcd88ddc87
fix: Add missing currency option in Supplier Quotation's rounded_total field
2022-03-14 15:57:24 +05:30
Deepesh Garg
2b6e7963f6
Merge branch 'develop' into implicit_pricing_rule_enable
2022-03-14 15:49:21 +05:30
Noah Jacob
60c4593f7b
chore: removed unrequired batch_no parameter while fetching stock_balance
2022-03-14 15:36:56 +05:30
Noah Jacob
00797fa02d
test: checking balance serial nos in stock ledger report
2022-03-14 15:36:56 +05:30
Noah Jacob
e8ba1f4e74
fix: incorrect balance serial no in stock ledger report
2022-03-14 15:36:56 +05:30
Ankush Menat
6ee904d641
test: dont resubmit work order
2022-03-14 15:13:37 +05:30
mergify[bot]
12696ffeb4
fix: Search query of payroll entry reference in Journal Entry ( #30225 ) ( #30226 )
...
(cherry picked from commit 98a67967a38c4e5b7b1977c4257bd0b23c57eded)
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2022-03-14 14:44:02 +05:30
Ankush Menat
d3e90ed8c8
fix(patch): remove dead links to ProdPlan Item
2022-03-14 14:15:43 +05:30
Ankush Menat
1af13ca4bf
fix(ux): remove get item buttons from submitted production plan
2022-03-14 14:15:43 +05:30
Saqib Ansari
c1740ced97
fix: cannot create multicurrency sales order with product bundles ( #30166 )
2022-03-14 13:43:55 +05:30
Saqib Ansari
f5f6650779
Merge pull request #30217 from nextchamp-saqib/fix-so-to-po
...
fix: cannot create purchase order from sales order
2022-03-14 12:35:32 +05:30
Saqib Ansari
935218598a
Merge pull request #30198 from nextchamp-saqib/pos-fixes-#12
...
fix(pos): do not reset mode of payments in case of consolidation
2022-03-14 12:34:40 +05:30
Saqib Ansari
58804b8436
fix: cannot create purchase order from sales order
2022-03-14 12:31:13 +05:30
Saqib Ansari
2e265d9bf6
test: mode of payments in case of consolidation
2022-03-14 11:02:33 +05:30
Ankush Menat
941ea1ec74
fix(ux): skip items without batch series
2022-03-14 10:25:18 +05:30
Ankush Menat
91fd9d917a
test: negative fifo test
2022-03-14 10:25:18 +05:30
Rucha Mahabal
211916bfce
Merge branch 'develop' into leave-opening-balance
2022-03-13 20:30:36 +05:30
Rucha Mahabal
d61c437588
fix: flaky tests
2022-03-13 20:30:18 +05:30
Deepesh Garg
835c029e53
Merge pull request #29979 from deepeshgarg007/bank_reco_multicurrency_fix
...
fix: Multi-currency bank reconciliation fixes
2022-03-13 20:27:04 +05:30
Rucha Mahabal
558650bc3a
fix: add more type hints
2022-03-13 20:02:51 +05:30
Deepesh Garg
5ae610bd32
Merge pull request #30039 from deepeshgarg007/gstr_3b_nil_exempt_fixed
...
fix: Nil and Exempted values in GSTR-3B Report
2022-03-13 20:00:48 +05:30
Ankush Menat
1a256c62c4
fix: attach sr no si standalone credit note
2022-03-13 19:00:34 +05:30
Ankush Menat
1c37d2711a
test: standalone SI creates and attaches serial nos
2022-03-13 19:00:34 +05:30
Deepesh Garg
6308e1be91
fix: Do not consider cancelled entries
2022-03-13 18:13:12 +05:30
Deepesh Garg
96b5cedcf8
fix: Do not update ignore prcing rule check implicitly
2022-03-13 17:48:37 +05:30
Deepesh Garg
22dfd5a4b1
Merge pull request #30152 from deepeshgarg007/sales_purchase_retrun_optimization
...
fix: Sales and Purchase return optimization
2022-03-13 17:13:53 +05:30
Deepesh Garg
60ba0ba219
Merge branch 'develop' into loan_cost_center
2022-03-13 12:50:27 +05:30
Deepesh Garg
e4e38ad60b
Merge branch 'develop' into sales_purchase_retrun_optimization
2022-03-13 12:45:10 +05:30
Saqib Ansari
e8a7a54d5a
fix(pos): do not reset mode of payments in case of consolidation
2022-03-12 19:20:48 +05:30
mergify[bot]
b085e96a12
revert: "Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount" ( #29782 ) ( #29807 )
...
* Revert "Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount"
This reverts commit 038f94955006c88209f9df28e3a785c59a4ddb28, reversing
changes made to c7b491843476bca89be02851ccafb7e409876609.
* fix: linter
(cherry picked from commit 7fa46f77e0bdbc516b3c0cb0fb20594ee7fa398b)
# Conflicts:
# erpnext/patches.txt
Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
2022-03-11 18:28:50 +05:30
Ankush Menat
94d0f8d4e7
test: actual bom naming test
2022-03-11 17:11:22 +05:30
Rohan Bansal
67d8a7ba86
fix: cancelled document check
2022-03-11 17:11:22 +05:30
Ankush Menat
6b58d53403
refactor: split versioning code for testability
2022-03-11 17:11:22 +05:30
Rohan Bansal
7f2670941c
fix: improve bom autoname logic
2022-03-11 17:11:22 +05:30
Ankush Menat
e2c99e02a9
test: bom for item_code that is >VARCHAR_LEN
2022-03-11 17:11:22 +05:30
Rohan Bansal
d9c91748f4
fix: if an item code is too long, truncate before setting BOM name
2022-03-11 17:11:22 +05:30
Rucha Mahabal
8173e6a8ea
fix: simplify insufficient leave balance message
2022-03-11 15:30:01 +05:30
Deepesh Garg
13dce71c21
Merge pull request #30181 from deepeshgarg007/shipping_rule_application
...
fix: Shipping rule application fixes
2022-03-11 12:04:12 +05:30
Deepesh Garg
d596e0e4df
fix: Shipping rule application fixes
2022-03-10 20:56:36 +05:30
Ankush Menat
472fe8e319
test: submit PR directly
2022-03-10 18:08:29 +05:30
Ankush Menat
6c54be0dcd
test: flaky MR report test
...
all test records are on same day so sorting was random in report rows.
2022-03-10 18:08:29 +05:30
Ankush Menat
7dd10367f4
fix: only update valuation rate if not None
2022-03-10 18:08:29 +05:30
Ankush Menat
362102e802
fix: dont hardcode hour rate precision
2022-03-10 17:23:50 +05:30
Ankush Menat
18e2a33a9b
fix: fetch new fields in bom from routing
2022-03-10 17:23:50 +05:30
Ankush Menat
73901aad6f
fix: handle duplicate bins during item merge renames
2022-03-10 17:01:22 +05:30
Ankush Menat
b4d4ae6aa3
test: refactor item merge test and disable commits
2022-03-10 17:01:22 +05:30
Ankush Menat
4126455975
fix: dont reset UOM in MR on every get_item_detail call ( #30164 )
2022-03-10 15:43:09 +05:30
Rucha Mahabal
b2c549a464
fix: conflicts
2022-03-10 15:41:14 +05:30
Raffael Meyer
6794148c04
fix(lead): reload contact before updating links ( #29966 )
...
* fix(lead): reload contact before updading links
Contact might have changed since it was created.
* refactor: reload contact after insert
2022-03-10 14:47:29 +05:30
Rucha Mahabal
79b0354efc
Merge branch 'develop' into leave-opening-balance
2022-03-10 14:45:46 +05:30
Marica
93e9fe8327
Merge pull request #30160 from marination/cart-without-checkout
...
fix: 'save_quotations_as_draft' checkbox not honoured
2022-03-10 14:37:58 +05:30
Saqib Ansari
390feeaa73
Merge pull request #30103 from ChillarAnand/party
...
fix: Ignore missing customer group while fetching price list
2022-03-10 14:36:19 +05:30
Rucha Mahabal
9fae89ff61
fix: flaky tests ( #30154 )
2022-03-10 14:22:12 +05:30
Deepesh Garg
a5befb6bf8
fix: Update modified timestamp
2022-03-10 14:18:54 +05:30
Saqib Ansari
e5fb871ef4
fix: Ignore missing customer group while fetching price list
2022-03-10 13:54:43 +05:30
marination
a13e06156b
fix: 'save_quotations_as_draft' checkbox not honoured
...
- Make sure `request_for_quotation` considers `save_quotations_as_draft`
- Added test for checkout disabled quote
2022-03-10 13:54:00 +05:30
Saqib Ansari
9dc9758522
Merge branch 'develop' of https://github.com/frappe/erpnext into party
2022-03-10 13:51:36 +05:30
Himanshu
5193a63781
fix: do not reset asset_category ( #29696 )
2022-03-10 13:43:35 +05:30
Deepesh Garg
e9d458b822
fix: Update party type
2022-03-10 12:29:17 +05:30
Deepesh Garg
5d66cc4c4a
fix: Add cost center in loan document
2022-03-10 12:22:37 +05:30
Saqib Ansari
8021572432
Merge branch 'develop' into fix-psoa-template
2022-03-10 12:17:11 +05:30
Ankush Menat
84568ac341
chore: imports
2022-03-10 11:20:23 +05:30
Saqib Ansari
5d5ae16fe5
fix(psoa): no such element: dict object['account']
2022-03-10 11:12:33 +05:30
Saqib Ansari
45c1d83ea1
Merge pull request #30145 from nextchamp-saqib/add-filter-to-psoa
...
fix(psoa): add company filter to account
2022-03-10 10:53:52 +05:30
Deepesh Garg
395b15058c
fix: Sales and Purchase retrun optimization
2022-03-10 10:50:03 +05:30
Rucha Mahabal
f066427913
fix: program enrollment button labels ( #30148 )
2022-03-10 10:06:07 +05:30
Saqib Ansari
fc42041f8f
fix(psoa): add company filter to account
2022-03-09 18:04:35 +05:30
Chillar Anand
fe4b6771b5
refactor: Remove dead code ( #30140 )
2022-03-09 17:16:05 +05:30
Chillar Anand
b1c8a4543d
test: Added test for monthly attendance report ( #29989 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2022-03-09 17:05:00 +05:30
Rucha Mahabal
921d6b25d7
chore: linter issue
2022-03-09 16:58:15 +05:30
Deepesh Garg
45eed7167c
Merge pull request #29654 from alyf-de/revert-bu-schluessel
...
revert: BU Schlüssel (a21f76f)
2022-03-09 16:48:54 +05:30
Marica
2661cb2c14
Merge pull request #30091 from marination/item-group-filters-listing
...
feat: Include child item group products in Item Group Page & cleanup
2022-03-09 16:46:01 +05:30
Saqib Ansari
4d8798b0ea
fix: ignore non-unique swift numbers while migrating ( #30132 )
2022-03-09 16:41:54 +05:30
Saqib Ansari
17e16247b1
Merge pull request #30114 from nextchamp-saqib/fix-#23231
...
perf(asset): fetch only distinct depreciable assets
2022-03-09 16:41:08 +05:30
Rucha Mahabal
9b152e93cf
Merge branch 'develop' into leave-opening-balance
2022-03-09 16:40:26 +05:30
Rucha Mahabal
97b7b5012e
test: separate leave ledger entries for leave applications across allocations
2022-03-09 16:35:25 +05:30
Rucha Mahabal
70239158b9
fix: boundary determination for separate ledger entries
2022-03-09 16:18:23 +05:30
marination
7b37a74023
fix: Linter
2022-03-09 16:04:12 +05:30
Rucha Mahabal
6755d6e6f5
test: leave application validations
2022-03-09 15:48:57 +05:30
Deepesh Garg
9b8258479c
fix: Update timestamp
2022-03-09 15:43:26 +05:30
Deepesh Garg
8a2fe7a2e3
fix: Remove tax invoice no field
2022-03-09 15:42:06 +05:30
Ankush Menat
64905188c4
fix: dont fetch entire barcode table in get_item_details ( #30131 )
2022-03-09 15:37:14 +05:30
Deepesh Garg
e192956520
Merge pull request #30096 from deepeshgarg007/debit_note_ux
...
fix(ux): Improve label for better understanding
2022-03-09 15:34:11 +05:30
Marica
7555e1548b
Merge branch 'develop' into item-group-filters-listing
2022-03-09 15:33:04 +05:30
Deepesh Garg
5526f852e8
Merge branch 'develop' into asset-translates
2022-03-09 14:43:57 +05:30
marination
3507cf5985
test: Test include_descendants in Item Group Product Listing
...
- Also made include_descendants field's visibility dependant on show_in_website
2022-03-09 13:50:24 +05:30
Rucha Mahabal
a504ffcc4c
fix: clearer validation/warning messages for insufficient balance in leave application
2022-03-09 13:49:07 +05:30
Saqib Ansari
a02e39e986
Merge branch 'develop' into fix-#23231
2022-03-09 12:31:23 +05:30
Mohammed Yusuf Shaikh
700e65959a
fix: default log date needed to query records ( #29951 )
2022-03-09 11:42:50 +05:30
Saqib Ansari
8a52f59199
Merge branch 'develop' into fix-#23231
2022-03-09 11:42:46 +05:30
Saqib Ansari
baee5d109e
Merge pull request #30110 from nextchamp-saqib/fix-customer-credit-limit-update
...
fix: customer credit limit validation on update
2022-03-09 11:42:14 +05:30
mergify[bot]
aadca02018
fix: add filters in default_discount_account ( #30095 ) ( #30125 )
...
(cherry picked from commit 3d8eaa5392fcc420820ac86eb01a6cf67cec1cc7)
Co-authored-by: Mohamed-D-Ouf <65343412+Mohamed-D-Ouf@users.noreply.github.com>
2022-03-09 11:27:15 +05:30
Saqib Ansari
e6666609e3
Merge branch 'develop' into fix-#23231
2022-03-09 11:08:45 +05:30
Rucha Mahabal
c0f1e269e4
feat: split ledger entries for applications created across allocations
...
- fix: ledger entry for expiring cf leaves not considering holidays
2022-03-09 10:25:49 +05:30
Deepesh Garg
9be3bc1dbf
Merge pull request #30080 from deepeshgarg007/item_wise_sales_history
...
fix: Item-wise sales history report
2022-03-09 10:18:14 +05:30
Deepesh Garg
e829f65fde
Merge pull request #30102 from deepeshgarg007/pick_list_query
...
fix: Ambigous column in picklist query
2022-03-09 10:17:26 +05:30
Rucha Mahabal
096092f173
fix: leave allocation records query ( #30118 )
2022-03-08 23:16:40 +05:30
Chillar Anand
ce27cdb121
test: Fix flaky tests ( #30107 )
2022-03-08 23:07:23 +05:30
Deepesh Garg
816e12dafc
Merge branch 'develop' into mergify/bp/develop/pr-29714
2022-03-08 21:40:00 +05:30
Saqib Ansari
0840acc653
Merge branch 'develop' into fix-#23231
2022-03-08 17:29:26 +05:30
Saqib Ansari
1061256358
Merge branch 'develop' into fix-customer-credit-limit-update
2022-03-08 16:01:17 +05:30
Saqib Ansari
66f20209f6
perf(asset): fetch only distinct depreciable assets
2022-03-08 15:57:54 +05:30
Saqib Ansari
a0dc79332d
fix: customer credit limit validation on update
2022-03-08 15:21:27 +05:30
Rucha Mahabal
430bf00458
fix: add type hints for employee leave balance report
2022-03-08 13:36:08 +05:30
Saqib Ansari
56eb485eec
Merge pull request #30097 from nextchamp-saqib/fix-pos-round-off
...
fix(pos): multiple pos round off cases
2022-03-08 11:24:47 +05:30
mergify[bot]
7a3d30161f
fix: translate error message titles ( #30105 )
...
(cherry picked from commit 456ebc32f00be56cc9972cc76ac412776581060a)
Co-authored-by: Türker Tunalı <turker.tunali@gmail.com>
2022-03-08 10:42:30 +05:30
Chillar Anand
282e9f83b9
Merge branch 'develop' into party
2022-03-08 09:53:03 +05:30
Deepesh Garg
83dd3bd7fc
Merge pull request #29940 from deepeshgarg007/item_discounts_quotation
...
fix: Item discounts for quotation and other docs
2022-03-08 09:08:51 +05:30
ChillarAnand
9ace7d606c
fix: Ignore missing customer group while fetching price list
2022-03-08 08:44:48 +05:30
Deepesh Garg
d9d4c2ce79
fix: Remove unintentional changes
2022-03-08 07:56:44 +05:30
Deepesh Garg
517fbf1d1f
fix: Ambigous column in picklist query
2022-03-07 22:31:42 +05:30
Saqib Ansari
72fab9ba1e
Merge branch 'develop' into fix-pos-round-off
2022-03-07 20:22:20 +05:30
Dany Robert
748d5c4873
fix: wrong payment days in salary slip for employees joining/leaving during mid payroll dates ( #29082 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2022-03-07 19:57:57 +05:30
Saqib Ansari
a13624d78b
Merge branch 'develop' into fix-pos-round-off
2022-03-07 18:24:13 +05:30
Saqib Ansari
17445c7e04
fix(pos): multiple pos round off cases
2022-03-07 18:01:07 +05:30
Deepesh Garg
f3a95d3c27
fix(ux): Improve label for better understanding
2022-03-07 16:10:26 +05:30
Marica
ee43f83ff8
Merge branch 'develop' into item-group-filters-listing
2022-03-07 13:18:38 +05:30
marination
b2755f6fdd
feat: Include child item group products in Item Group Page & cleanup
...
- Added 'Include descendants' checkbox, which will pull child item group products too
- Build item group filters in query engine file
- Include logic in filter engine
- Clean up Website section of Item Group page (UX)
- Add util to fetch child item groups including self
2022-03-07 13:02:08 +05:30
Saqib Ansari
385830bb51
Merge pull request #30084 from nextchamp-saqib/remove-einv-batch
...
fix(e-invoicing): remove batch no from e-invoices
2022-03-07 11:53:09 +05:30
Saqib Ansari
031a0dd703
fix(e-invoicing): remove batch no from e-invoices
2022-03-07 11:40:01 +05:30
Marica
7579981fb5
Merge pull request #29987 from marination/mr-to-order-and-receive-report
...
fix: Get MRs that are yet to be received but fully ordered in Report `Requested Items to Order and Receive`
2022-03-07 10:18:28 +05:30
Deepesh Garg
e2c144e9e3
fix: Item-wise sales history report
2022-03-06 19:05:02 +05:30
Deepesh Garg
c6c51d7312
Merge branch 'develop' into gstr_3b_nil_exempt_fixed
2022-03-06 18:09:38 +05:30
Deepesh Garg
629a296fb6
Merge branch 'develop' into bank_reco_multicurrency_fix
2022-03-06 18:09:30 +05:30
Deepesh Garg
428415ed55
Merge pull request #30040 from frappe/mergify/bp/develop/pr-30025
...
fix: Exchange rate not getting set in payment entry (backport #30025 )
2022-03-06 18:07:35 +05:30
Ankush Menat
9ef35ef773
fix: dont hardcode precision in routing
...
Co-Authored-By: Suraj Shetty <surajshetty3416@gmail.com>
2022-03-02 18:27:22 +05:30
Ankush Menat
f8ac4c082a
fix: remove dead dashboard links
2022-03-02 18:27:22 +05:30
Saqib Ansari
cd2513ceec
Merge pull request #29939 from nextchamp-saqib/ordered-qty-for-packed-items
...
feat: update ordered qty for packed items
2022-03-02 17:10:20 +05:30
Ankush Menat
55a966ec41
chore: get stock reco qty from SR instead of SLE ( #30059 )
...
[skip ci]
2022-03-02 14:49:45 +05:30
Rucha Mahabal
b988046082
fix(Timesheet): fetch exchange rate only if currency is set ( #30057 )
2022-03-02 14:15:22 +05:30
Ankush Menat
90af40ac3c
Merge pull request #30055 from resilient-tech/fix-install-fixtures
...
fix: handle `ImportError` when installing country fixtures
2022-03-02 14:11:23 +05:30
Ankush Menat
3638fbf06b
fix: repost items with repeating item-warehouses
2022-03-02 13:11:04 +05:30
Ankush Menat
701878f60b
revert "fix: FIFO valuation in case of multi-item entries"
...
This reverts commit b8ee193d1a124668691b3d8181ce4e3bf612afe0.
This is huge performance regression for large docs.
2022-03-02 13:11:04 +05:30
Ankush Menat
2f71c5bcca
test: repack FIFO rates
2022-03-02 13:11:04 +05:30
Ankush Menat
ccd2ce56b1
fix: FIFO valuation in case of multi-item entries
2022-03-02 13:11:04 +05:30
Ankush Menat
b3b7cdfb49
test: FIFO transfer for multi-batch transaction
2022-03-02 13:11:04 +05:30
marination
54b3676f35
fix: linter (imports alphabetical)
2022-03-02 13:09:34 +05:30
Sagar Vora
89368ece41
style: use f-string
2022-03-02 12:40:25 +05:30
Sagar Vora
98f26e9cbb
fix: handle ImportError when installing country fixtures
2022-03-02 12:39:00 +05:30
Ankush Menat
5d85b35f41
test: fix flaky bin value test
2022-03-02 12:32:54 +05:30
Ankush Menat
eb8495a401
docs: explain make_sl_entries arguments
2022-03-02 12:27:18 +05:30
Ankush Menat
efc4b943f8
fix: ignore serial no during landed cost voucher
2022-03-02 12:27:18 +05:30
Marica
e0d5c6118f
Merge branch 'develop' into mr-to-order-and-receive-report
2022-03-02 12:14:50 +05:30
Saqib Ansari
89f87cee87
Merge branch 'develop' into ordered-qty-for-packed-items
2022-03-02 12:13:56 +05:30
Deepesh Garg
d95f8934aa
fix: Test cases with discount
2022-03-01 23:09:59 +05:30
Rucha Mahabal
9988ec697f
test: test advance filters in expense claim and cancelled status
2022-03-01 21:40:39 +05:30
Rucha Mahabal
57f92df108
fix: flake8 issues
2022-03-01 20:50:36 +05:30
Rucha Mahabal
650099ee65
Merge branch 'develop' into emp-adv-status
2022-03-01 20:30:58 +05:30
Deepesh Garg
2eb7921bff
fix: Exchange rate not getting set in payment entry
...
(cherry picked from commit 86e6bdf2c9ffc0a656c14663b6f790071a7f3afd)
2022-03-01 12:49:09 +00:00
Ankush Menat
65bb727030
fix: dont validate empty category
2022-03-01 17:47:47 +05:30
Deepesh Garg
abe580e8b0
fix: Nil and Exempted values in GSTR-3B Report
2022-03-01 17:37:38 +05:30
marination
ac425722e2
fix: Sider and Linter
2022-03-01 17:30:37 +05:30
marination
e6952cb7f9
refactor: Convert to QB, added test file, removed white space
...
- Converted mysql raw query to qb
- Test file for Report Requested Items to Order and Receive
- Removed white space and edited copyright year
2022-03-01 17:15:04 +05:30
marination
1d1d586d4d
test: Included sub assembly non-merging in test case
2022-03-01 15:42:34 +05:30
Marica
d2f1c4f307
Merge branch 'develop' into prod-plan-sub-items-aggregate
2022-03-01 15:33:02 +05:30
Saqib Ansari
056a0ec421
Merge pull request #30034 from nextchamp-saqib/fix-pos-flaky-test
...
fix(test): flaky test_point_of_sale
2022-03-01 15:32:33 +05:30
Saqib Ansari
47fe87a72f
fix(test): flaky test_point_of_sale
2022-03-01 14:56:24 +05:30
Saqib Ansari
6b494eed79
Merge pull request #30032 from nextchamp-saqib/fix-debit-credit-diff
...
fix: debit credit difference case with rounding adjustment
2022-03-01 14:12:31 +05:30
Saqib Ansari
ad2c64f3ff
fix: debit credit difference case with rounding adjustment
2022-03-01 13:32:34 +05:30
Ankush Menat
d22a1d440c
fix: track changes on warehouse
2022-03-01 13:08:25 +05:30
Marica
5a8c80b153
Merge branch 'develop' into mr-to-order-and-receive-report
2022-03-01 13:01:35 +05:30
marination
ffbb2c8311
fix: Assert False for test that is anticipating an empty table and remove second arg to assertTrue
2022-03-01 12:57:09 +05:30
Deepesh Garg
0542416c47
Merge pull request #30026 from deepeshgarg007/deferred_revenue_post_accounts_freeze
...
fix: Deferred revenue booking
2022-03-01 12:41:41 +05:30
marination
25fa6344a6
test: Adjust test as per teardown
...
- make tests use multi level bom in WO, as BOM at setup is used
- earlier, an intermediate BOM made in a test would override the BOM at setup
2022-03-01 12:24:45 +05:30
Deepesh Garg
366120ffee
fix: Deferred revenue booking
2022-03-01 11:57:34 +05:30
Ankush Menat
afb69b0b7f
Merge branch 'develop' into item_discounts_quotation
2022-03-01 11:49:25 +05:30
Ankush Menat
bbc4710fa3
fix: apply margin on duplicated doc too
2022-03-01 11:48:28 +05:30
Rushabh Mehta
4e2c284be7
fix(minor): nix the ugly banner
2022-03-01 08:52:42 +05:30
Deepesh Garg
785fcca957
Merge branch 'develop' of https://github.com/frappe/erpnext into payment_entry_total_taxes
2022-02-28 18:06:14 +05:30
Deepesh Garg
19fb7ead9f
test: Add test case for payment entry taxes
2022-02-28 18:05:58 +05:30
rohitwaghchaure
bbfff1b795
Merge pull request #30015 from rohitwaghchaure/removed-validation-for-zero-qty
...
refactor: removed validation to check zero qty
2022-02-28 17:54:26 +05:30
Marica
789e042f7d
Merge branch 'develop' into prod-plan-sub-items-aggregate
2022-02-28 17:38:29 +05:30
Marica
5fe8c48ba8
Merge branch 'develop' into prod-plan-sub-items-aggregate
2022-02-28 17:38:14 +05:30
Ankush Menat
829c453cb6
test: remove transaction commits from buying module
2022-02-28 17:36:58 +05:30
Rucha Mahabal
3f3b1766c2
test: get leave details for leave application dashboard
2022-02-28 17:30:09 +05:30
Ankush Menat
b0d1e6db54
test(refactor): use FrappeTestCase
2022-02-28 17:23:32 +05:30
marination
292fe370db
test: combine sub assembly items and make Production Plan tests atomic
2022-02-28 16:35:20 +05:30
Rucha Mahabal
a58dfecb23
test: fix test test_leave_balance_near_allocaton_expiry
2022-02-28 15:27:24 +05:30
Marica
b8593188f3
Merge branch 'develop' into prod-plan-sub-items-aggregate
2022-02-28 15:08:21 +05:30
Rohit Waghchaure
39d3f20d9b
fix: removed validation to check zero qty
2022-02-28 14:29:07 +05:30
Rucha Mahabal
aaa1ae94f2
fix: earned leave policy assignment test
2022-02-28 14:26:49 +05:30
Rucha Mahabal
942511cfff
fix: leave application dashboard
...
- total leaves allocated considering cancelled leaves
- optional plural for leave category labels
- show dashboard only once from date is set, else it fetches all allocations till date and generates incorrect balance
- change pending leaves to 'Leaves Pending Approval' for better context
- update labels in Salary Slip Leave Details table
2022-02-28 14:10:23 +05:30
Ankush Menat
1d1203d5ec
fix: dont fetch draft/cancelled BOMs
2022-02-28 13:14:16 +05:30
Ankush Menat
3cc47d5ba5
fix: correct fieldname for source warehouse
2022-02-28 13:06:56 +05:30
Ankush Menat
0bed592777
fix: open stock entry instead of submitting from item dashboard
2022-02-28 13:06:56 +05:30
Ankush Menat
88a21ca7d2
fix: only show child warehouses for transfer
2022-02-28 13:06:56 +05:30
Deepesh Garg
1b186682ea
Merge branch 'develop' of https://github.com/frappe/erpnext into grant_commission_check
2022-02-28 12:42:21 +05:30
Deepesh Garg
4e9a9f35a6
test: add correct test case
2022-02-28 12:41:59 +05:30
Rucha Mahabal
88141d6116
test: Employee Leave Balance Summary
2022-02-28 12:12:52 +05:30
Deepesh Garg
83ad8f9caa
Merge pull request #29928 from deepeshgarg007/psoa_account_filter
...
fix: Account filter in PSOA
2022-02-28 11:41:50 +05:30
Saqib Ansari
cde711151e
Merge branch 'develop' into ordered-qty-for-packed-items
2022-02-28 11:35:42 +05:30
Rucha Mahabal
c7d594984a
chore: remove unused imports, sort imports, fix sider
2022-02-28 10:19:16 +05:30
Rucha Mahabal
d14a5c0f64
Merge branch 'develop' into leave-opening-balance
2022-02-28 10:03:38 +05:30
