ruthra kumar
a26698b88e
Merge pull request #33410 from ruthra-kumar/typeerror_on_gp_due_to_incorrect_warehouse_on_bundle_item
...
fix: TypeError on GP Report due to multiple warehouse on bundled items
2022-12-21 18:26:40 +05:30
ruthra kumar
e684eb32d0
fix: typerror on multi warehouse in Packed Items
...
DN(with bundled item with varying warehouses)-> Sales Invoice.
2022-12-21 15:09:55 +05:30
Gokulnath17
41fc3be339
fixes in gross profit report
2022-12-14 10:46:11 +05:30
ruthra kumar
e4d16c31da
fix: GP incorrect buying amount if no upd on SI and Delivery Note
2022-11-11 08:33:48 +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
ruthra kumar
967dd398e7
fix: incorrect buying amount in Gross Profit rpt
2022-08-17 16:21:03 +05:30
hrzzz
3ef551872a
fix: remove spaces and order import
2022-08-15 09:23:56 -03:00
hrzzz
27891ecb77
feat: two new filters for gross profit
2022-08-15 09:14:23 -03:00
hrzzz
c4af63ad98
feat: two new groupby mode: Monthly, Payment Term
2022-05-31 10:46:56 -03:00
Ankush Menat
494bd9ef78
style: format code with black
2022-03-28 18:52:46 +05:30
Deepesh Garg
973f6b1bbd
fix: Gross profit for credit notes
2022-02-14 22:14:17 +05:30
Deepesh Garg
07bcbc6c7e
fix: Remove unused param
2022-02-12 19:05:03 +05:30
Deepesh Garg
2172ab2d37
fix: Update columns in new format
2022-02-11 14:48:39 +05:30
Deepesh Garg
da73685f71
fix: Multiple fixes in Gross Profit report
2022-02-10 13:07:51 +05:30
Ganga Manoj
5ef2330022
fix: Replace 'parent' with 'invoice_or_item' ( #28513 )
2021-11-23 12:28:41 +05:30
Ganga Manoj
7d0558e202
fix: Add extra column to display Invoice or Item when grouped by Invoice ( #28380 )
2021-11-22 12:34:46 +05:30
GangaManoj
1affa12b74
fix: Replace 'Totals' with 'Total'
2021-11-16 03:36:47 +05:30
GangaManoj
508a2301ee
fix: Display totals row in bold
2021-11-16 03:22:04 +05:30
GangaManoj
c7ffe3a7b4
fix: Remove unnecessary condition
2021-11-16 02:36:58 +05:30
GangaManoj
582a7ae964
fix: Add totals row when Grouped By Invoice
2021-11-16 02:33:51 +05:30
Ankush Menat
6098e92ba9
chore: remove utf-8 compat code
2021-11-05 11:16:29 +05:30
Chillar Anand
915b34391c
chore: Clean up imports ( #27302 )
...
* chore: Added isort to pre-commit config
* chore: Sort imports with isort
* chore: Clean up imports with pycln
* chore: Sort imports with isort
* chore: Fix import issues
* chore: Clean up sider issues
* chore: Remove import errors from flake8 ignore list
* chore: Clean up lint issues
2021-09-02 16:44:59 +05:30
GangaManoj
3135d6dc6a
fix: Get Bundle Items
2021-08-25 15:35:40 +05:30
GangaManoj
13ae10b3a2
fix: Remove comments
2021-08-25 15:20:27 +05:30
GangaManoj
bea0f7a202
fix: Get data when grouped by invoice and otherwise
2021-08-25 02:52:18 +05:30
GangaManoj
b02effbc47
fix: Indentation
2021-08-25 01:00:40 +05:30
Ganga Manoj
3e5bbc9aa6
Merge branch 'develop' into gross-profit-product-bundle
2021-08-25 00:55:47 +05:30
GangaManoj
5f8c2b0946
fix: Remove base_rate and buying_rate for Invoice rows
2021-08-25 00:33:55 +05:30
GangaManoj
2dbf8075eb
fix: Calculate total buying_amount for each invoice
2021-08-25 00:09:07 +05:30
GangaManoj
3edb1938a9
fix: Fetch bundle item details
2021-08-24 23:38:24 +05:30
GangaManoj
257215f479
fix: Fetch base_net_total for each Invoice
2021-08-24 23:32:19 +05:30
GangaManoj
1956f62ad8
fix: Remove qty from Sales Invoice rows
2021-08-24 23:30:50 +05:30
Afshan
ad06fb2179
fix: calculation of gross profit percentage in Gross Profit Report ( #27045 )
2021-08-24 17:35:01 +05:30
GangaManoj
46650cce0d
fix: Calculate total buying_amount and gross profit for each invoice
2021-08-23 21:17:32 +05:30
GangaManoj
d1453c0cd0
fix: Remove Item Code and Item Name columns
2021-08-20 18:26:17 +05:30
GangaManoj
75d4fc99fc
fix: Display Items in the format Item Code: Item Name
2021-08-20 18:25:36 +05:30
GangaManoj
b5fac83987
fix: Add items belonging to Product Bundles as children
2021-08-20 06:07:53 +05:30
GangaManoj
97a1d426a3
fix: Assign indent and parent_invoice
2021-08-20 03:54:19 +05:30
GangaManoj
5ffaff8e48
fix: Display items as descendants of invoices
2021-08-20 02:20:18 +05:30
GangaManoj
76921137ed
fix: Return data as dict if the report is grouped by Invoice
2021-08-20 02:16:49 +05:30
Rohit Waghchaure
c14aa45720
fix: incorrect valuation rate calculation in gross profit report
2021-07-20 18:19:15 +05:30
Afshan
8be51e22c4
fix: escape apostrophe in cost centre and project if exist
2020-09-23 14:52:36 +05:30
Afshan
91fe10666e
fix: buying price for non stock item in gross profit report ( #22616 )
...
* fix: buying price for non stock item in gross profit report
* fix: refactor query
2020-07-24 09:49:17 +05:30
Deepesh Garg
142af4b58a
fix: Default column width in Gross profit report
2020-04-28 11:17:45 +05:30
Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch ( #17997 )
...
* fix: merge conflict
* fix: restored missing set_gst_state_and_state_number function
* fix: style linting as per codacy
* fix: Fixes related to customer/lead merging
* fix: merge conflict
* fix: Fixes related to customer/lead merging
* fix: Assign isue/opportunity to user
* fix: Assign isue/opportunity to user
* fix: Replaced Invoice type by GST Category
* fix: merge conflict
* fix: merge conflict
* fix: test cases
* fix: test cases
2019-07-03 10:34:31 +05:30
Rohit Waghchaure
1d6f2c3b5d
feat: Get invoiced item's gross margin using API
2019-05-08 15:38:05 +05:30
Saurabh
3c95387926
Merge branch 'master' into develop
2019-03-20 14:39:49 +05:30
Deepesh Garg
2ae7ed4cf0
fix: Gross profit report fix ( #16935 )
2019-03-17 09:49:24 +05:30
Frappe Bot
7e67a400cd
Merge branch 'master' into develop
2019-03-08 09:39:33 +00:00
Deepesh Garg
44ff41188d
fix: Selling and buying amount precision fix ( #16764 )
2019-03-04 12:56:27 +05:30
