Saqib
f1313302c9
fix: pos invoice test ( #27113 )
2021-08-24 19:45:21 +05:30
Marica
3167b58aee
Merge branch 'develop' into fix-scrap-items-updation
2021-08-24 19:33:09 +05:30
Anupam Kumar
164acc845a
refactor: social media post fixes ( #24664 )
...
* fix: social media post fixes
* feat: post metrics and some fixes
* fix: sider issues
* fix: sider issue
* fix: reverting optional chaning statements
* fix: sider issues
* fix: review chnages
* fix: text trigger check
* fix: sider issue
(cherry picked from commit f7e0edecc9ce45ba7baa4c17b2b35f487dffccf2)
2021-08-24 13:47:00 +00:00
18alantom
8f73d587f9
feat: process loss report, fix set pl query condition
2021-08-24 18:38:23 +05:30
GangaManoj
b4b6d10b5d
fix: Add editable Rate column
2021-08-24 17:59:11 +05:30
GangaManoj
8af5802e42
fix: Populate Bundle Items table
2021-08-24 17:58:23 +05:30
GangaManoj
91af0d6ffb
fix: Add Bundle Items table
2021-08-24 17:57:55 +05:30
Afshan
ad06fb2179
fix: calculation of gross profit percentage in Gross Profit Report ( #27045 )
2021-08-24 17:35:01 +05:30
Saqib
1db812ab9f
Merge branch 'develop' into common-party-acc
2021-08-24 17:27:43 +05:30
Saqib
f47cbae5e0
feat: allow draft pos invoices even if no stock available ( #27078 )
2021-08-24 17:27:27 +05:30
Saqib
9198caa5e7
fix: incorrect gl entry on period closing involving finance books ( #26921 )
2021-08-24 17:26:23 +05:30
Subin Tom
2e5525aba9
fix: Correct price list rate value in return si ( #27097 )
2021-08-24 17:24:41 +05:30
Saqib
ce129a1414
feat: re-arrange company doctype fields ( #27091 )
2021-08-24 17:23:14 +05:30
Anupam
0c6212189e
feat: link lead communication to prospect
2021-08-24 16:49:53 +05:30
Marica
774f305713
Merge branch 'develop' into update-stock-onboarding-fp
2021-08-24 16:23:42 +05:30
Subin Tom
d4d5a4221a
feat: coupon code discount in pos invoice ( #27004 )
2021-08-24 16:22:46 +05:30
18alantom
b58853e89d
feat: add procss_loss_qty field in work order
2021-08-24 16:11:29 +05:30
Marica
236f35d2fa
Merge pull request #27098 from surajshetty3416/fix-remove-all-import
...
fix: Use remove_all from file_manager
2021-08-24 15:56:31 +05:30
Anupam
3610882077
fix: reverting local chnages
2021-08-24 15:51:57 +05:30
Anupam
797b19a14a
feat: creation of prospect from lead
2021-08-24 15:50:15 +05:30
Saqib
9e82c24b27
fix: pos closing entry cancellation test ( #27099 )
...
* fix: pos closing entry cancellation test
* fix: invalid imports
* fix: sider issue
2021-08-24 15:37:00 +05:30
Saqib
6cf9254ee5
fix: invalid imports ( #27101 )
2021-08-24 15:26:44 +05:30
18alantom
7fb08173b5
fix: reword error messages, fix test values
2021-08-24 15:01:38 +05:30
18alantom
ad735522cb
fix: rename form tours to doctype names, remove tours from js controllers
2021-08-24 14:54:38 +05:30
Suraj Shetty
1e05c9467b
fix: Use remove_all from file_manager
2021-08-24 14:21:14 +05:30
Marica
b9130bf4db
Merge branch 'develop' into fix-scrap-items-updation
2021-08-24 12:54:38 +05:30
Ankush Menat
c09d8a2809
fix(ux): keep stock entry title & purpose in sync ( #27043 )
...
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2021-08-24 12:20:34 +05:30
Ankush Menat
6de7b8ea93
fix: discard empty rows from update items ( #27021 )
2021-08-24 12:18:40 +05:30
Ankush Menat
0dff0beaba
fix: stock analytics report date range issues and add company filter ( #27014 )
...
* test: tests for correct get_period_date_ranges
* fix: stock analytics report date range issues
- Upon selecting second half of month with Monthly filter, data from
that period was missing.
- Solution: "round down" the date as per expected frequency.
* chore: drop py2 and fix misleading docstring
* test: fix test to avoid FY clash
* feat: add company filter in stock analytics report
[skip ci]
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-08-24 12:16:46 +05:30
rohitwaghchaure
6106a635f8
Merge branch 'develop' into fix-scrap-items-updation
2021-08-24 12:10:04 +05:30
Pruthvi Patel
332ac105b5
refactor: use read_only_depends_on instead of code ( #27008 )
2021-08-24 12:07:38 +05:30
rohitwaghchaure
db385261f0
Merge pull request #27080 from rohitwaghchaure/fixed-stock-ledger-report-with-included-uom
...
fix: stock ledger report not working if include UOM selected in filter
2021-08-24 10:16:35 +05:30
rohitwaghchaure
95866b736e
Merge pull request #27081 from rohitwaghchaure/fixed-donot-overrride-batch-no
...
fix: batch no reset on changing of qty
2021-08-24 10:15:36 +05:30
Anupam
4a529f8039
feat: Prospect
2021-08-24 09:35:59 +05:30
rohitwaghchaure
da3220e38e
Merge branch 'develop' into fixed-stock-ledger-report-with-included-uom
2021-08-24 08:50:49 +05:30
Rushabh Mehta
dd3372a3a5
Merge pull request #27089 from frappe/revert-26604-salary-component-account-filter
...
Revert "fix: Salary component account filter"
2021-08-24 08:34:21 +05:30
Rushabh Mehta
49e0a4f287
Revert "fix: Salary component account filter ( #26604 )"
...
This reverts commit ae9d1d9617
2021-08-24 08:33:57 +05:30
GangaManoj
46650cce0d
fix: Calculate total buying_amount and gross profit for each invoice
2021-08-23 21:17:32 +05:30
Deepesh Garg
bd709f8ab0
fix: Ignore due date validations if payment terms are copied from orders/receipts
2021-08-23 19:05:52 +05:30
rohitwaghchaure
129a0fc8b2
Merge branch 'develop' into fixed-donot-overrride-batch-no
2021-08-23 18:07:22 +05:30
Deepesh Garg
69973a65aa
Merge pull request #26900 from deepeshgarg007/payment_entry_validations_and_trigger_develop
...
fix: Multiple fixes in payment entry
2021-08-23 18:03:01 +05:30
Subin Tom
47b63a627d
fix: Eway bill test update to check ver 1.0.0421 ( #27083 )
2021-08-23 15:38:26 +05:30
Rohit Waghchaure
e1f070437a
fix: selected batch no changed on updation of qty
2021-08-23 14:27:55 +05:30
Rohit Waghchaure
098d349bf4
fix: stock ledger report not working if include uom selected in filter
2021-08-23 13:36:13 +05:30
Subin Tom
8b2fe9e793
fix: eway bill version changed to 1.0.0421 ( #27044 )
2021-08-23 11:17:31 +05:30
Subin Tom
7d627df4db
fix: pos return payment mode issue ( #26872 )
2021-08-23 11:05:07 +05:30
Deepesh Garg
df185045a1
Merge branch 'develop' into payment_entry_validations_and_trigger_develop
2021-08-23 10:34:28 +05:30
Deepesh Garg
496bff5136
feat: Column for total amount due in Accounts Receivable/Payable Summary ( #27069 )
2021-08-22 18:10:51 +05:30
Deepesh Garg
57e326e7d0
fix: Consolidated balance sheet showing incorrect values ( #26975 )
2021-08-21 17:59:11 +05:30
Saqib
5395f56c88
Merge branch 'develop' into common-party-acc
2021-08-20 20:42:50 +05:30
