Deepesh Garg
065c38152a
Merge branch 'develop' of https://github.com/frappe/erpnext into item_wise_provisional_accounting
2022-04-14 12:04:21 +05:30
Deepesh Garg
3ce64170db
feat: Item-wise provisional accounting for service items
2022-04-11 14:35:22 +05:30
Ankush Menat
c3e1f0e369
refactor: ignore mandatory fields during setup
2022-04-11 13:19:17 +05:30
Deepesh Garg
dec0c1b5bb
test: Ignore parent company account creation
2022-04-06 10:21:27 +05:30
Gavin D'souza
f8c9fba52d
fix: Handle changes in frappe's get_monthly_goal_graph_data API
2022-04-01 17:18:47 +05:30
Ankush Menat
494bd9ef78
style: format code with black
2022-03-28 18:52:46 +05:30
Ankush Menat
e401ad3f90
refactor: replace dead duplicate code
2022-03-26 19:33:00 +05:30
Ankush Menat
9daea6fa6c
perf: slimmer and faster before_tests
2022-03-26 19:33:00 +05:30
Deepesh Garg
993cc287d5
Merge branch 'develop' into sales_person_dashboard
2022-03-23 16:11:22 +05:30
Ankush Menat
51873da4bc
test: dynamic current FY creation in before_tests
2022-03-22 14:23:56 +05:30
Ankush Menat
6b638a196b
chore: drop dead sample code
2022-03-22 14:23:56 +05:30
Ankush Menat
9a99f993bc
refactor: merge print settings custom fields
2022-03-22 14:23:56 +05:30
Ankush Menat
457d616966
refactor: remove dead duplicate code
2022-03-22 14:23:56 +05:30
Deepesh Garg
3a7776ea7f
fix: Contribution amount against invoices in Sales Person Dashboard
2022-03-21 12:04:18 +05:30
marination
8264d6b0bc
fix: Sub-Categpry Routing in Item Group Page Listing pills
...
- Use absolute route even 3-4 sub-category levels down
- Remove scroll from category pills due to accessibility issues
- Arrange sub-category pills alphabetically
2022-03-15 16:53:46 +05:30
Marica
7555e1548b
Merge branch 'develop' into item-group-filters-listing
2022-03-09 15:33:04 +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
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
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
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
Rucha Mahabal
d647de3782
Merge branch 'develop' into remove-nonprofit
2022-02-24 17:03:52 +05:30
Ankush Menat
9c7df2eec5
fix: ignore duplicates explicitly
2022-02-23 14:27:45 +05:30
ChillarAnand
325dc92d37
Merge branch 'develop' into remove-nonprofit
2022-02-03 16:38:01 +05:30
marination
4b62d2d7fe
fix: (Linter) Write queries using QB/ORM and other minor lines for semgrep to skip
2022-02-02 12:58:31 +05:30
Marica
780e29b42e
Merge branch 'develop' into e-commerce-refactor-develop
2022-02-02 10:45:14 +05:30
Deepesh Garg
528c71382f
feat: Provisional accounting for expenses ( #29451 )
...
* feat: Provisonal accounting for expenses
* fix: Method for provisional accounting entry
* chore: Add test case
* fix: Remove test case
* fix: Use company doctype
* fix: Add provisional expense account field in Purchase Receipt Item
* fix: Test case
* fix: Move provisional expense account to parent
* fix: Patch
2022-02-01 14:42:55 +05:30
Ankush Menat
bba31a37f4
fix: missing validate_item_group_defaults function
2022-01-31 17:15:17 +05:30
Ankush Menat
6cd7c47409
Merge branch 'develop' into e-commerce-refactor-develop
2022-01-31 17:14:36 +05:30
Ankush Menat
b05287dea0
fix: drop six code ( #29479 )
2022-01-27 20:08:05 +05:30
Rucha Mahabal
6c1c85be0c
feat: additional doctypes access for ESS user ( #29317 )
2022-01-27 00:51:29 +05:30
ChillarAnand
7086d3f3d7
Merge branch 'develop' into remove-nonprofit
2022-01-24 11:35:47 +05:30
ChillarAnand
f423de530a
refactor: Code cleanup
2022-01-20 11:14:33 +05:30
Ankush Menat
3db8d908dc
Merge pull request #29278 from shariquerik/update-workspace-json
...
fix: Updating public workspace json based on new design
2022-01-17 13:25:16 +05:30
rohitwaghchaure
388293dbea
Merge pull request #29280 from rohitwaghchaure/company-filter-issue-for-default-account
...
fix: accounts are coming from different company in the dropdown
2022-01-13 21:11:55 +05:30
Shariq Ansari
bc187c121a
fix: updated standard workspace json files
2022-01-13 19:24:11 +05:30
Rohit Waghchaure
dabe5981bb
fix: accounts are coming from different company in the dropdown
2022-01-13 12:51:34 +05:30
Marica
b5abf68b0d
Merge branch 'develop' into e-commerce-refactor-develop
2022-01-12 02:52:03 +05:30
Ankush Menat
33aad4b950
fix: UOM autocomplete broken
...
All new recent sites seem to have all UOMs as disabled by default. The
desired behaviour is exact opposite of this.
2022-01-11 17:49:30 +05:30
Deepesh Garg
ca5ea5f55f
fix: test cases
2022-01-10 21:28:29 +05:30
Deepesh Garg
3fdd47e71f
Merge branch 'develop' of https://github.com/frappe/erpnext into currency-exchange-settings
2022-01-10 17:32:15 +05:30
Deepesh Garg
e2dab6f421
fix: Cleanup and fixes
2022-01-10 17:31:38 +05:30
ChillarAnand
0c0a9ed96d
refactor: Remove non-profit domain from ERPNext
2022-01-06 09:53:49 +05:30
Anupam Kumar
08dcbd6fce
feat: allow user to change the parent company
2022-01-04 19:05:36 +05:30
Chillar Anand
0900c3d655
refactor: Removed agriculture module from ERPNext ( #29022 )
2022-01-04 17:26:11 +05:30
Deepesh Garg
98ac47caa4
fix: Add is reverse charge in country wise tax
...
(cherry picked from commit 7e912db4b13ee2b1b88a68fc6110eb527a0375d5)
2021-12-21 08:12:09 +00:00
Ankush Menat
d7148adee5
test: remove unnecessary creation of companies #28965
...
test: remove unnecessary creation of companies
2021-12-20 22:00:31 +05:30
Ankush Menat
f5d5281119
chore: drop deprecated qunit tests
2021-12-20 17:03:10 +05:30
Dany Robert
c68b2c3763
Merge branch 'develop' into currency-exchange-settings
2021-12-18 18:32:12 +05:30
Jannat Patel
aba36eb2be
Merge branch 'home-onboarding' of https://github.com/pateljannat/erpnext into home-onboarding
2021-12-15 14:26:47 +05:30
