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

2815 Commits

Author SHA1 Message Date
Rohit Waghchaure
2fb573781d fix: rename field has not updated value of deposit and withdrawal fields 2021-05-01 17:56:40 +05:30
Ankush Menat
9178d95cca
fix: can not create item variants (#25433) 
* fix: item_code assigned to function returning None

* fix: ignore has_variants and attributes in variant

* fix: patch to remove has_variants and attributes

* chore: fix whitespace in translation
 2021-04-26 15:37:17 +05:30
Anoop
c21ce42559
fix(patch): lab module patch fix (#25447) 
* fix(patch): lab module patch fix

* fix: param

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-04-22 22:44:44 +05:30
Rucha Mahabal
e3b8057eb4
fix: Laboratory Module patch (#25431) 2021-04-22 16:11:17 +05:30
Ankush Menat
e972ceb798
fix: patch for updating shipment status 2021-04-18 13:22:19 +05:30
Ankush Menat
d6be154ac2
fix: implicit string concatenation (#25371) 
* fix: implicit string concatenations

* chore: rerun healthcare patch for company fields
 2021-04-16 22:08:44 +05:30
Nabin Hait
2535fe9b1e fix: Resolved merge conflict 2021-04-14 13:09:50 +05:30
Rohit Waghchaure
a8f78fabfd fix: patch failing while migrating from v7 to v13 2021-04-13 18:51:21 +05:30
Rohit Waghchaure
03635fb0c4 feat: ESS User 2021-04-13 18:51:21 +05:30
Saqib
dbb76a7d00
fix(e-invoicing): validations & tax calculation fixes (#25314) 
* fix: GST on freight charge in e-invoicing

* feat(india): bulk e-invoice generation (#24969)

* fix: cannot fetch e invoice settings

* fix: patch condition (#25301)

* fix: patch condition

* fix: except einvoice loading error seperately

* fix: json.loads error

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-04-13 18:49:03 +05:30
Nabin Hait
10c61376e3
fix: Backport missing commits to develop branch (#25305) 2021-04-13 15:46:01 +05:30
Deepesh Garg
bb92929048
Merge pull request #25256 from nextchamp-saqib/italy-e-invoicing 
feat(italy): add document type field for e-invoicing
 2021-04-13 13:48:21 +05:30
Saqib
a19c98255f
fix: patch condition (#25301) 2021-04-12 19:02:28 +05:30
Saqib
9320316462
feat(india): bulk e-invoice generation (#24969) 2021-04-12 17:55:46 +05:30
Deepesh Garg
c36e48a869
fix: GST on freight charge in e-invoicing (#25000) 
* fix: GST on freight charge in e-invocing

* fix: Add patch for taxable value field

* fix: Handle discounts on net total

* fix: Handle all types of discounts for e-invoicing

* fix: Absolute taxable values

* fix: Use correct tax amount
 2021-04-12 10:55:43 +05:30
Anoop
207166fe8b
fix(patch): copy Lab Test / Template renamed field values (#25276) 
reload_doc doctypes introduced since v11
 2021-04-12 10:25:34 +05:30
Deepesh Garg
81ecd0b8b6 Merge branch 'develop' of https://github.com/frappe/erpnext into delivery_note_gst_category 2021-04-10 20:54:38 +05:30
Rohit Waghchaure
1db8c51749 fix: changed logic 2021-04-10 10:45:29 +05:30
Rohit Waghchaure
1358443cdb fix: patch 2021-04-10 10:42:08 +05:30
Anupam Kumar
986452107b
fix: Lead Source's module (#24583) 
* fix: Lead Source's module

* fix: patch fix
 2021-04-09 18:15:51 +05:30
Saqib Ansari
032246dc2b feat(italy): add document type field for e-invoicing 2021-04-09 12:08:24 +05:30
Nabin Hait
aa809ceffe
fix: Patch fixes for v13 upgrade (#25220) 2021-04-07 10:57:46 +05:30
Anoop
b27441b40c
fix: failing patch - reload_doc new doctypes added in v13 (#25194) 2021-04-05 10:41:28 +05:30
Saurabh
f9b9298a6d
fix: reload doc in patch (#25144) 2021-04-01 21:59:35 +05:30
Nabin Hait
11eb30d082 fix: merge conflict 2021-04-01 15:03:11 +05:30
Ankush Menat
1bdf9c4161
fix: patch for purchase receipt status 2021-04-01 11:58:34 +05:30
Saqib
fb4051bddd
feat: discount configuration on early payments (#25089) 
* feat: discount configuration on early payments

Co-authored-by: Nabin Hait <nabinhait@gmail.com>

* fix: remove duplicate patch call

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-03-31 15:52:51 +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
Deepesh Garg
f954ec7c78 fix: Add patch for GST category field in Delivery Note 2021-03-29 20:31:11 +05:30
rohitwaghchaure
b38ea0cc8b
fix: patch (#25014) 
* fix: patch

* fix: pricing_rule test cases
 2021-03-28 15:51:32 +05:30
Mohammad Hasnain Mohsin Rajan
52701dcbbc
fix: patch regional fields for old companies (#24988) 2021-03-25 12:56:33 +05:30
Mohammad Hasnain Mohsin Rajan
f29c075bc3
fix: patch regional fields for old companies (#24999) 
* fix: patch regional fields for old companies

* chore: fix sider
 2021-03-25 12:56:13 +05:30
Syed Mujeer Hashmi
f114da2f67
refactor: Make Discharge Schedule Date as Datetime (#24940) 
* refactor: Make Discharge Schedule Date as Datetime

Like Admitted Datetime make discharge date as discharge datetime.

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>

* fix: Add patch for renaming discharge_date to discharge_datetime

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>

* fix: quote style

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-03-23 17:48:25 +05:30
Rushabh Mehta
6ef213e5c6 fix(minor): patch add_state_code_for_ladakh 2021-03-16 11:59:54 +05:30
Nabin Hait
6e3668dc30 fix: merge conflict 2021-03-11 16:14:27 +05:30
Rucha Mahabal
0b29f87fa2
feat(Non Profit): 80G Certificates and Donations (#24848) 
* feat(Non Profit): 80G Certificates and Donations

* fix(Membership): Generate Invoice for membership webhook only if automation is enabled (#24849)
 2021-03-11 16:02:23 +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
Saurabh
202ef92fa1 Merge branch 'version-13-beta-pre-release' into version-13-beta 2021-03-05 09:34:01 +05:30
Saqib Ansari
49e4693abf fix(patch): updating pos closing reference in merge log 2021-03-04 11:58:45 +05:30
Nabin Hait
d96be3f9f1
Reposting patch and earned leave rounding (#24783) 
* fix: rounding of earned leave is optional (#24782)

* fix: reposting patch fixes (#24775)
 2021-03-02 17:02:47 +05:30
Nabin Hait
bd10d7c028
fix: reposting patch fixes (#24775) 2021-03-02 13:37:45 +05:30
Rohit Waghchaure
9f13a060f0 fix: reposting patch 2021-02-26 17:44:54 +05:30
Rohit Waghchaure
c603fd638b fix: reposting patch 2021-02-26 17:42:52 +05:30
Rohit Waghchaure
39b5ad8e69 fix: patch failing because of incorrect gl entries 2021-02-23 18:35:36 +05:30
Rohit Waghchaure
bc8c9de26d fix: patch failing because of incorrect gl entries 2021-02-23 18:26:48 +05:30
Nabin Hait
d46b23699c
fix: optimize reposting of gle and sle (#24702) 
* fix(india): escape for special characters in JSON (#24695)

JSON does not accept special whitespace characters like tab, carriage
return, line feed

Ref: https://www.ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf

Related issue: ISS-20-21-09811

* fix: Accounting Dimension creation background job timeout

* fix(regional): vehicle no is mandatory for ewaybill generation (#24679)

* fix: vehicle no required for e-invoice

* fix: ewaybill generation dialog condition

* fix: excluding unidentified accounts from gstr-1

* fix: optimize reposting of sle and gle (#24694)

* fix: optimize update_gl_entries_after method

* fix: Optimized reposting patch

* fix: accounting dimensions

* added reload_doc in patch

* Update item_reposting_for_incorrect_sl_and_gl.py

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>

* fix: Replaced spaces with tabs

* fix: merge conflict

* fix: test cases

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: pateljannat <pateljannat2308@gmail.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2021-02-23 16:38:52 +05:30
Nabin Hait
19f8fa59d3
fix: optimize reposting of sle and gle (#24694) 
* fix: optimize update_gl_entries_after method

* fix: Optimized reposting patch

* fix: accounting dimensions

* added reload_doc in patch

* Update item_reposting_for_incorrect_sl_and_gl.py

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2021-02-22 22:27:22 +05:30
Mohammad Hasnain Mohsin Rajan
07f40596bc
feat(Bank Reconciliation): Redesign (#24273) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-02-22 22:19:47 +05:30
Nabin Hait
69a6bed106
fix: Replaced spaces with tabs 2021-02-22 20:03:23 +05:30
Nabin Hait
0ca74ce04b
fix: Fixes related to client script renaming (#24698) 2021-02-22 19:32:51 +05:30