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

6131 Commits

Author SHA1 Message Date
Rohan
99a8cb7143
fix: commit individual SLE rename for large datasets (#25084) 2021-03-31 15:22:00 +05:30
Saqib
0586b7db79
feat: discount configuration on early payments (#24586) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-03-31 15:03:53 +05:30
Walstan Baptista
d6360755b9
chore: frappe.whitelist for doc methods (#25068) 
* chore: frappe.whitelist for doc methods

* fix: incorrect spelling

* fix: sider issue

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-03-31 12:30:32 +05:30
Sagar Vora
5c907fa7f0
test: make Stock Entry to avoid NegativeStockError (#25044) 2021-03-27 20:30:26 +05:30
walstanb
ab673d9e4b fix: minor changes 2021-03-27 12:54:49 +05:30
walstanb
225c64a1ad test: sets is_purchase_item while item creation 2021-03-27 12:54:49 +05:30
walstanb
9826ac4602 test: reset session user if test errors 2021-03-27 12:54:49 +05:30
walstanb
98dcf8a1fd fix: type casting for None type value 2021-03-27 12:54:49 +05:30
rohitwaghchaure
d5759bab11
Merge pull request #24922 from rohitwaghchaure/feat-recursice-pricing-rule 
feat: recursive pricing rule
 2021-03-26 19:10:10 +05:30
Saqib
dd39a6b47c
fix(pos): mode of payments disappear on loading draft pos invoice (#24917) 2021-03-24 17:56:24 +05:30
Deepesh Garg
82983369fa
fix: Period list for exponential smoothing forecasting report (#24982) 2021-03-23 21:11:01 +05:30
Deepesh Garg
ad9b65fcf2
fix: TDS check getting checked after reload (#24972) 2021-03-23 10:45:20 +05:30
Sagar Vora
6ac11a04b0
test: added warehouse for TCS Item as it is a Stock Item (#24942) 2021-03-18 18:07:21 +05:30
Sagar Vora
8ee1146f72
test: add stock to avoid NegativeStockError (#24941) 2021-03-18 17:45:25 +05:30
Afshan
a04091aaf7
fix: exclude current doc while validation. (#24914) 2021-03-18 16:40:43 +05:30
Sagar Vora
b134b89fb0
test: fix NegativeStockError (#24936) 2021-03-18 16:36:40 +05:30
Anuja Pawar
9bf1083d9e
fix: payment references from disappearing on selecting cost center (#24831) 
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-03-18 11:22:24 +05:30
Sagar Vora
f4a6c7823a
test: create new item instead of using _Test Item to prevent error (#24915) 2021-03-17 19:57:53 +05:30
Rohit Waghchaure
77add49c6a fix: don't club same free item 2021-03-17 18:49:54 +05:30
Rohit Waghchaure
a9b1347600 fix: nonetype object has no attribute options 2021-03-17 14:30:34 +05:30
Rohit Waghchaure
ff70e61d7a feat: recursive product discount 2021-03-17 14:30:34 +05:30
Marica
4ceea333a7
fix: POS Opening Entry with empty balance detail rows (#24876) 2021-03-15 12:49:14 +05:30
Anupam Kumar
ed42afc5e8
feat: price margin in buying (#24685) 2021-03-15 11:11:28 +05:30
Ganga Manoj
ca03997ab5 fix(Bank Reconciliation): Filter Bank Account drop-down list 2021-03-13 22:21:07 +05:30
Nabin Hait
6e3668dc30 fix: merge conflict 2021-03-11 16:14:27 +05:30
Rucha Mahabal
be2c1fca7b
feat(Non Profit): 80G Certificates and Donations (#24657) 
* feat: 80G Certificates

* feat: add non-profit custom fields for India

* feat: 80G Certificate print format for memberships

* feat: Donation doctype and API endpoint to capture donations via razorpay

* chore: Rename Membership Settings to Non Profit Settings

* chore: clean up Non Profit Settings

- Rename fields, better labels

- patch for renaming

* feat: Webhook secret generation for Razorpay donations in Non-Profit Settings

* feat: Payment Entry for donations

- added Donor as Party Type

- setting for automating payment entries for donations created via web form

* fix: linter and sider issues

* fix: translation syntax

* feat: PAN Details custom field for Indian donors

* feat: 80G certificates for Donations with Print Format

* fix: sider

* feat: validations for donor and donation

- create donor for website user from donations

- validate donor email

* feat: extract member name from subscription notes

* test: Donation

* test: Tax Exemption 80G Certificate

* chore: styling fixes

* fix: tests

* fix: sider

* feat: extract PAN number from additional subscription notes

* feat: Add creation user field in Non Profit Settings

fix: Payment Entry not generating for memberships and donations

* feat: update desk page

* fix: tests
 2021-03-11 13:19:44 +05:30
Anupam Kumar
6f0fabc54e
fix: gle issue in internal transfer(Purchase) (#24830) 2021-03-10 18:36:46 +05:30
Ankush Menat
59fdee4dfa
Merge branch 'develop' into consolidated_report_acc_name_fix 2021-03-10 16:35:59 +05:30
Ankush Menat
000fa824d3
fix: use account_name only in consolidated report 
Don't use account_number and only rely on account_name for preparing
consolidated financial statement.

Related issue: ISS-20-21-10217
 2021-03-10 15:23:48 +05:30
Raffael Meyer
20cc2bb0d8
fix: autoname for Item Tax Template 
* fix: autoname for Item Tax Template

Use title + company abbreviation instead of just title.

* fix: test records of Item Tax Template

* fix: rename item tax templates in test records

* Revert "fix: test records of Item Tax Template"

This reverts commit 53875c54ffe059c32d52b9ee60795d56f95473b1.

* fix: rename hardcoded item tax templates in tests

* fix: rename hardcoded Item Tax Templates in tests

(2)

* fix: delete Item Tax Template with company
 2021-03-10 10:24:43 +05:30
Afshan
27bcb2a064
fix: renamed "supplier_warehouse" to "set_from_warehouse" (#24816) 
* fix: reverting and adding new field for supplier warehouse
 2021-03-09 22:25:48 +05:30
Afshan
e314b8b209
fix: general ledger report (#24770) 2021-03-09 20:31:57 +05:30
Raffael Meyer
79b5be1830
fix: Group German VAT Accounts (#24804) 
* fix: group account for tax assets and liabilities (germany)

* fix: spacing
 2021-03-09 20:26:43 +05:30
Deepesh Garg
06a6ee37cb
fix: Ignore mandatory fields in opening invoice via Opening Invoice Creation tool (#24821) 2021-03-09 20:23:26 +05:30
Deepesh Garg
47c6d2e00f
Merge pull request #24814 from AfshanKhan/fix-tds-computation-summary 
fix: sending proper arguments for TDS Computation Summary report
 2021-03-09 20:01:30 +05:30
Ankush Menat
afc766bbf1
Merge branch 'develop' into dont_update_pe_title 2021-03-08 15:44:15 +05:30
Ankush Menat
5571b988dd
fix: make title field read only 2021-03-08 15:43:03 +05:30
Ankush Menat
cc46866cd9
fix: do not update PE title during data import 
Related issue: ISS-20-21-10132
 2021-03-08 15:42:39 +05:30
Afshan
1002e36c53 fix: removed unused import 2021-03-08 14:39:19 +05:30
Afshan
fa932e2a3e fix: sending proper arguments for report 2021-03-08 14:36:40 +05:30
Deepesh Garg
45870317f2
Merge pull request #24797 from UrvashiKishnani/patch-1 
fix: total row in AR/AP summary report
 2021-03-06 21:28:04 +05:30
Saqib
92b0691c68
fix: einvoice button visiblity condition (#24800) 2021-03-06 19:00:08 +05:30
Deepesh Garg
36a0085905
Merge pull request #24799 from danielchalmers/patch-8 
fix: typo in Charts of Account doctype
 2021-03-06 13:11:26 +05:30
Daniel Chalmers
9b4a258c89
Chart Of Accounts -> Chart of Accounts 2021-03-04 00:15:46 -06:00
UrvashiKishnani
27ea23223d
fix: total row in AR/AP summary report 2021-03-04 09:21:25 +04:00
barredterra
53d261702a fix: make quick entry for Tax Category work 2021-03-03 11:52:48 +01:00
Deepesh Garg
7a5b6021b9
Merge pull request #24772 from anupamvs/si-timesheet 
feat: provision to pull timesheet in sales invoice
 2021-03-02 18:05:42 +05:30
Anupam
47ce85484b feat: provistion to pull timesheet in sales invoice 2021-03-02 11:31:26 +05:30
UrvashiKishnani
810a36105c
fix: GL Entries for AP/AR Summary without SQL join 
SQL query modified to fetch only those GL Entries for Accounts Payable Summary and Accounts Receivable Summary reports where the corresponding payment entry is not in cancelled state.
 2021-03-02 08:20:03 +04:00
UrvashiKishnani
10e4b9d4e8
fix: GL Entries for AP/AR Summary 
SQL query modified to fetch only those GL Entries for Accounts Payable Summary and Accounts Receivable Summary reports where the corresponding payment entry is in submitted state.
 2021-03-01 12:50:07 +04:00