Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,345 Commits 3 Branches 0 Tags 1 GiB
d5da8c7403
Commit Graph

2052 Commits

Author SHA1 Message Date
Devin Slauenwhite
8a13ddc2f2
fix: gain/loss can be income or expense 2022-06-29 12:28:24 -04:00
Conor
74a782d81d
refactor: DB independent quoting and truthy/falsy values (#31358) 
* refactor: DB independent quoting and truthy/falsy values

* style: reformat to black spec

* fix: ifnull -> coalesce

* fix: coalesce -> Coalesce

* fix: revert pypika comparison

* refactor: convert queries to QB

* fix: incorrect value types for query

`=` query makes no sense with list of values

* fix: remove warehouse docstatus condition

* fix: keep using base rate as rate

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-17 17:01:27 +05:30
Conor
b8f728a40a
refactor: use CURRENT_DATE instead of CURDATE() (#31356) 
* refactor: use CURRENT_DATE instead of CURDATE()

* style: reformat to black spec

* refactor: use QB for auto_close queries

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-15 12:07:33 +05:30
Conor
00ef499739
refactor: use db independent offset syntax (#31345) 
* chore: use db independent offset syntax

* fix: typo

* style: reformat code to black spec

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-14 10:49:07 +05:30
Deepesh Garg
7c8bceca34
Merge pull request #31016 from HarryPaulo/fix-average-discount-auth 
fix: correction of the calculation to the average value when there is…
 2022-06-09 18:33:42 +05:30
Rushabh Mehta
5c6937865c fix(ux): Add tabs in Item 2022-06-08 16:30:44 +05:30
Ankush Menat
a1b7a7983a
refactor!: drop naming series tool (#31183) 2022-05-31 15:35:40 +05:30
Deepesh Garg
d0a9eb4fd0
Merge branch 'develop' into fix-average-discount-auth 2022-05-26 18:22:34 +05:30
Ankush Menat
964b4184a6 test: add basic tests for naming series tool 2022-05-26 16:17:56 +05:30
Ankush Menat
4d0e2aa33a docs: update help information on naming series 2022-05-26 15:36:48 +05:30
Ankush Menat
24d1bf5328 feat: preview next numbers on naming series tool 2022-05-26 15:15:59 +05:30
Ankush Menat
82cd54b40b chore: resave naming series doctype schema 
separate commit to avoid mixing actual changes
 2022-05-26 15:15:59 +05:30
hrzzz
3c35c9b6ae fix: correction of the calculation to the average value when there is a discount on the document and not on the items 2022-05-14 10:45:26 -03:00
Ankush Menat
f31122cbc3
fix: disable form save on naming series tool (#30909) 2022-05-05 17:35:58 +05:30
Deepesh Garg
2e3e666784 Merge branch 'develop' of https://github.com/frappe/erpnext into erpnext_setup_cleanup 2022-05-03 18:17:36 +05:30
Rushabh Mehta
548afba8bb
fix(minor): update frappe.error_log to new API (#30864) 
* fix(minor): update frappe.error_log to new API

* refactor: changes for updated log_error api

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-05-02 15:04:26 +05:30
Deepesh Garg
44c54f69f8 chore: Remove references for Student doctype 2022-04-28 16:16:47 +05:30
Deepesh Garg
848827cf5c chore: Remove references for Assessment Group 2022-04-28 15:11:22 +05:30
Deepesh Garg
60b693f84f chore: clean up hooks 2022-04-28 12:02:54 +05:30
Deepesh Garg
429361ce87 chore: Remove domains from Setup 2022-04-27 13:32:51 +05:30
marination
1e80b97915 refactor: Change Filter Fields table fieldtype to Autocomplete 
- Remove dynamic js fieldtype change to `Select`
 2022-04-18 19:01:43 +05:30
marination
d35b37881b fix: Validate field filter wrt to Website Item & re-use validation in Item Group 2022-04-18 18:51:48 +05:30
marination
c993ac09df fix: Query filter fields from Website Item instead of Item master 
- tweak `filters.py` to correctly query filter field values from Website Item
- Use Website Item for filter field options in Settings and Item Group Field Filter table
 2022-04-18 18:01:48 +05:30
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