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
e874149b94
Merge pull request #29335 from ruchamahabal/emp-adv-status
2022-03-01 22:36:04 +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
