Skip to content

Commit

Permalink
Merge branch 'frappe:master' into dark-theme
Browse files Browse the repository at this point in the history
  • Loading branch information
pu-raihan authored Aug 20, 2024
2 parents 49b15d1 + 2119c30 commit 18ff407
Show file tree
Hide file tree
Showing 47 changed files with 2,173 additions and 77 deletions.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ We know documentation and tests are boring, but they're important and we need
you to add them for large changes.

- **Documentation**: If the feature being added requires an explanation then
[documentation](https://docs.frappebooks.com/) should be updated in the
[documentation](https://docs.frappe.io/books/) should be updated in the
[frappe/books_docs](https://github.com/frappe/books_docs) repository.
_Add a link to the documentation PR in your feature PR._
- **Tests**: If your features alters business logic then tests should be added.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
setup_and_build:
runs-on: macos-11
runs-on: macos-12
steps:
- name: Setup node
uses: actions/setup-node@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: workflow_dispatch

jobs:
build-macos:
runs-on: macos-11
runs-on: macos-latest
steps:
- name: Setup node
uses: actions/setup-node@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:

jobs:
setup_and_test:
runs-on: macos-11
runs-on: macos-latest
steps:
- name: Setup node
uses: actions/setup-node@v2
Expand All @@ -32,7 +32,7 @@ jobs:
run: yarn test

setup_and_uitest:
runs-on: macos-11
runs-on: macos-latest
steps:
- name: Setup node
uses: actions/setup-node@v2
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
> [!IMPORTANT]
>
> Frappe Books is looking for a maintainer, please view [#775](https://github.com/frappe/books/issues/775) for more info.
<div align="center" markdown="1">

<img src="https://user-images.githubusercontent.com/29507195/207267672-d422db6c-d89a-4bbe-9822-468a55c15053.png" alt="Frappe Books logo" width="384"/>
Expand All @@ -10,7 +14,7 @@

Free Desktop book-keeping software for small businesses and freelancers.

[frappebooks.com](https://frappebooks.com/)
[frappe.io/books](https://frappe.io/books/)

<img src="https://user-images.githubusercontent.com/29507195/207267857-4ae48890-3fb2-4046-80cf-3256b46c72a0.png" alt="Frappe Books Preview"/>

Expand All @@ -34,6 +38,7 @@ Free Desktop book-keeping software for small businesses and freelancers.
## Features

1. Double-entry accounting
1. Point of Sale
1. Invoicing
1. Billing
1. Payments
Expand All @@ -49,8 +54,7 @@ Free Desktop book-keeping software for small businesses and freelancers.
## Installation

Download and install the latest release for your platform from the [releases
page](https://github.com/frappe/books/releases) or the [download
page](https://frappebooks.com/download).
page](https://github.com/frappe/books/releases) .

## Development

Expand Down Expand Up @@ -140,10 +144,6 @@ If you want to contribute code then you can fork this repo, make changes and rai
- [GitHub Discussions](https://github.com/frappe/books/discussions): Used for discussions around a specific topic.
- [Frappe Books Blog](https://tech.frappebooks.com/): Sporadically updated dev blog regarding the development of this project.

## Maintainers

Frappe Books is currently being maintained by [Mildred Ki'Lya](https://github.com/mildred) and [Isaac-GC](https://github.com/Isaac-GC).

## Translation Contributors

| Language | Contributors |
Expand Down
10 changes: 10 additions & 0 deletions fyo/model/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,13 @@ export type DocStatus =
| 'NotSaved'
| 'Submitted'
| 'Cancelled';

export type LeadStatus =
| ''
| 'Open'
| 'Replied'
| 'Interested'
| 'Opportunity'
| 'Converted'
| 'Quotation'
| 'DonotContact'
7 changes: 7 additions & 0 deletions models/baseModels/AccountingSettings/AccountingSettings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ export class AccountingSettings extends Doc {
enableDiscounting?: boolean;
enableInventory?: boolean;
enablePriceList?: boolean;
enableLead?: boolean;
enableFormCustomization?: boolean;
enableInvoiceReturns?: boolean;
enablePricingRule?: boolean;

static filters: FiltersMap = {
writeOffAccount: () => ({
Expand Down Expand Up @@ -48,6 +50,9 @@ export class AccountingSettings extends Doc {
enableInventory: () => {
return !!this.enableInventory;
},
enableLead: () => {
return !!this.enableLead;
},
enableInvoiceReturns: () => {
return !!this.enableInvoiceReturns;
},
Expand All @@ -56,6 +61,8 @@ export class AccountingSettings extends Doc {
override hidden: HiddenMap = {
discountAccount: () => !this.enableDiscounting,
gstin: () => this.fyo.singles.SystemSettings?.countryCode !== 'in',
enablePricingRule: () =>
!this.fyo.singles.AccountingSettings?.enableDiscounting,
};

async change(ch: ChangeArg) {
Expand Down
Loading

0 comments on commit 18ff407

Please sign in to comment.