Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,391 Commits 3 Branches 0 Tags 1 GiB
881301ca9b
Commit Graph

268 Commits

Author SHA1 Message Date
Gavin D'souza
aedf25ba46 chore: Drop old patches 
v7 backup was restored and upgraded to latest v10.x.x branch. The
patches run uptil the upgrade are removed in this change. This means
only existing v10 sites are allowed direct upgrade to v13 and newer
 2021-06-10 15:07:39 +05:30
Gavin D'souza
102afe7de1 fix: Manually link_fields from flags before rename_doc 2021-06-04 20:11:34 +05:30
Gavin D'souza
ac99c719bc Revert "fix(patch): Reload linked doctypes before renaming dt" 
This reverts commit 4e2e8daca9
because although it fixed it locally, didn't seem to do anything for erpnext CI
 2021-06-04 20:10:26 +05:30
Gavin D'souza
4e2e8daca9 fix(patch): Reload linked doctypes before renaming dt 2021-06-04 17:56:28 +05:30
Gavin D'souza
5bf5775b43 chore: Drop old patches 
v7 backup was restored and upgraded to latest v10.x.x branch. The
patches run uptil the upgrade are removed in this change. This means
only existing v10 sites are allowed direct upgrade to v13 and newer
 2021-06-04 11:49:56 +05:30
Anuja P
e2059fb9f6 fix: spaces to tabs 2021-05-26 20:07:53 +05:30
Anuja P
5e4128e70c fix: patch for existing issues 2021-05-26 20:03:14 +05:30
Anurag Mishra
5670cf4386
feat: enhancements in Training Event (#25782) 
* feat: Some Minor fixes

* fix: patch file

* fix: patch

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-05-24 20:24:20 +05:30
Rucha Mahabal
0d8b9a9d0a fix(patch): billable field not renamed 2021-05-20 19:53:30 +05:30
Anupam
1270febfff fix: sider issues 2021-05-20 14:15:58 +05:30
Anupam
aeb88385bb patch: timesheet changes 2021-05-20 14:11:36 +05:30
Anupam
cab998c293 adding patch 2021-05-15 20:40:20 +05:30
Saqib
900a8fb21a
feat(pos): ability to retry on pos closing failure (#25595) 
* feat(pos): ability to retry on pos closing failure

* fix: sider issues

* fix: sider issues

* fix: mark all queued closing entry as failed

* feat: add headline message
 2021-05-06 17:02:47 +05:30
barredterra
24e2cc9107 Merge branch 'develop' into datev_fixes 2021-05-03 18:19:28 +02:00
Rohit Waghchaure
2fb573781d fix: rename field has not updated value of deposit and withdrawal fields 2021-05-01 17:56:40 +05:30
Raffael Meyer
b2be91e731
Merge branch 'develop' into datev_fixes 2021-04-27 12:21:14 +02:00
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
Raffael Meyer
6daae681bd
Merge branch 'develop' into datev_fixes 2021-04-16 12:37:14 +02:00
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
Nabin Hait
10c61376e3
fix: Backport missing commits to develop branch (#25305) 2021-04-13 15:46:01 +05:30
Saqib
9320316462
feat(india): bulk e-invoice generation (#24969) 2021-04-12 17:55:46 +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
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
barredterra
0a45fc8c58 fix: remove unused import 2021-04-08 18:25:17 +02:00
barredterra
c6e13ac218 fix: patch to fill Debtor/Creditor Number 2021-04-08 16:57:55 +02:00
barredterra
ed36fb2073 docs: doctring for patch 2021-04-08 16:57:20 +02:00
barredterra
03425071e7 fix: patch to add custom fields 2021-04-08 16:31:00 +02:00
Anupam
e711b30f66 fix: resolved conflicts 2021-04-05 17:06:59 +05:30
Anoop
b27441b40c
fix: failing patch - reload_doc new doctypes added in v13 (#25194) 2021-04-05 10:41:28 +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
Mohammad Hasnain Mohsin Rajan
52701dcbbc
fix: patch regional fields for old companies (#24988) 2021-03-25 12:56:33 +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
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
Nabin Hait
bd10d7c028
fix: reposting patch fixes (#24775) 2021-03-02 13:37:45 +05:30
Rohit Waghchaure
c603fd638b fix: reposting patch 2021-02-26 17:42:52 +05:30
Rohit Waghchaure
bc8c9de26d fix: patch failing because of incorrect gl entries 2021-02-23 18:26:48 +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
Saqib
14472f6bab
fix(regional): vehicle no is mandatory for ewaybill generation (#24679) 
* fix: vehicle no required for e-invoice

* fix: ewaybill generation dialog condition
 2021-02-22 19:27:23 +05:30
Marica
052a2767f0
Merge branch 'develop' into email-digest 2021-02-17 11:21:14 +05:30
Nabin Hait
9b178bcd10
fix: stock and account balance syncing (#24644) 
* fix: stock and account balance syncing

* fix: stock and account balance syncing

* fix: stock and account balance syncing

* fix: minor fix
 2021-02-16 14:57:00 +05:30
Rohit Waghchaure
9a40c1b2e1 fix: patch 2021-02-16 10:35:10 +05:30
rohitwaghchaure
d60ff83b6f
fix: added patch to fix incorrect stock qty and account value (#24628) 2021-02-16 09:12:27 +05:30
Suraj Shetty
54a253616a
Merge pull request #24508 from frappe/rebrand-ui 2021-02-02 09:07:35 +05:30
Suraj Shetty
852e67c5ee fix(patch): Use db_set to ignore validation 2021-02-01 22:40:40 +05:30
Marica
fb016edb7a
chore: Use sql to set naming series in older projects (#24512) 
* chore: Use sql to set naming series in older projects

* fix: Remove unncessary db.commit()
 2021-02-01 20:05:29 +05:30
Saqib Ansari
cee3670167 chore: clean up sales invoice form 2021-02-01 15:45:26 +05:30
Suraj Shetty
0a8939e1c1 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-29 08:56:22 +05:30
Saqib
675a8330a4
refactor: POS Invoice merging and cancellation (#24351) 
* feat: pos invoice merging with background jobs

* fix: invoice threshold for queueing job

* refactor: cancellation flow of point of sale

* feat: tests for cancellation of pos closing

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-01-28 18:42:43 +05:30
Saqib
ac9e6ff704
fix(pos): multiple pos fixes and additions (#24227) 
* fix: make custom fields in pos invoice similar to sales invoice

* feat: allow/disallow rate & discount change

* fix: any pos profile can be selected while creating pos opening

* fix: cannot add item to cart

* fix: validate phone payment only if payment request exists

* fix: replace pos payment method patch

* chore: rearrange item & customer group filter

* fix: allow/disallow invoice level discount

* fix: updating qty of item with uom having space char

* fix: move configuration checbox to config section

* fix: invalid item rate trigger

* fix: cannot remove item from draft invoices

* fix: customer currency not set in pos invoice

* fix: duplicate item error message

* fix: sales uom not fetched in pos invoice

* fix: cannot add taxes to pos invoice for uae region

* fix: cannot merge pos invoice into credit note

* fix: tax calculation while merging pos invoices

* feat: delete draft orders from order list

* fix: merging of pos invoice with pricing rules
 2021-01-28 17:58:55 +05:30
Marica
ec4f42d4a9
Merge branch 'develop' into project-naming-series-patch 2021-01-25 11:29:23 +05:30
Deepesh Garg
164079127f
Merge pull request #24446 from deepeshgarg007/patch-fix-1-new 
fix: Project Template patch
 2021-01-25 10:37:43 +05:30
Deepesh Garg
5b4ece5054 fix: Update patch 2021-01-22 17:12:35 +05:30
marination
7ba60570e7 fix: Spaces to Tabs 2021-01-22 16:55:06 +05:30
marination
c908deea61 fix: Patch to Add Naming Series to old projects 2021-01-22 16:10:01 +05:30
Deepesh Garg
cf7209f3d4 fix: Project Template patch 2021-01-22 11:47:13 +05:30
Rucha Mahabal
7201498801
Merge branch 'develop' into patient-history-enhancements 2021-01-22 09:04:37 +05:30
Rucha Mahabal
d98b506478 fix: patch 2021-01-21 13:23:59 +05:30
Rucha Mahabal
53d0eebbe8 fix: patch for renaming field in Membership Settings 2021-01-20 23:22:08 +05:30
Rucha Mahabal
bd02a42904
Merge branch 'develop' into membership-enhancements-2 2021-01-20 12:49:37 +05:30
Suraj Shetty
bbc6bfd3c3 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-19 09:34:06 +05:30
Rucha Mahabal
751719ea0d
Merge branch 'develop' into patient-history-enhancements 2021-01-14 14:08:50 +05:30
Anupam
5abb997a27 fix: resolved conflicts 2021-01-13 11:11:22 +05:30
Jannat Patel
8a07de9ee0
Merge branch 'develop' into project-template-and-tasks 2021-01-11 10:57:09 +05:30
pateljannat
2460e101a7 fix: indicator ofor template task 2021-01-11 10:05:54 +05:30
pateljannat
fd5ebe9d4a fix: patch and columns 2021-01-07 15:16:15 +05:30
Jannat Patel
a586b0ba17
Merge branch 'develop' into project-template-and-tasks 2021-01-07 13:01:02 +05:30
Marica
ba6e50b15e
Merge branch 'develop' into qi-ux 2021-01-05 15:15:10 +05:30
Anurag Mishra
b864b09d40
Merge branch 'develop' into gratuity 2021-01-05 14:47:38 +05:30
Marica
099162814c
Merge branch 'develop' into qi-ux 2021-01-05 09:27:40 +05:30
Afshan
0da201c6a5 fix: set company in leave allocation and leave ledger entry 2021-01-04 19:04:05 +05:30
Saqib Ansari
d5d571ab9d fix: update old loan patch 2020-12-31 12:55:35 +05:30
marination
a69e81a151 chore: Made 'Parameter' a link field in QI and QI Template 
- Added doctype Quality Inspection Parameter
- Made 'Parameter' a link field in QI and QI Template
- Added patch to create Quality Inspection Parameter records for every parameter in the system
 2020-12-28 18:07:22 +05:30
pateljannat
71f203dbc5 fix: template task status, subject in project template task 2020-12-28 12:35:19 +05:30
Nabin Hait
4da7a15ac0 fix: Fixed typo 2020-12-23 18:07:54 +05:30
Anurag Mishra
46e1c09b45 style: Broken into smaller function 2020-12-23 18:07:53 +05:30
Anurag Mishra
4d6c3c9449 Fix: Changes Requested, Sider, codacy, Transalation 2020-12-23 18:07:53 +05:30
Anurag Mishra
25c356894d test: gratuity 2020-12-23 18:07:53 +05:30
Anurag Mishra
f63df91186 patch: to create standard Gratuity Rule for india and UAE 2020-12-23 18:07:53 +05:30
pateljannat
9466e42e70 fix: change request modifications 2020-12-21 20:52:20 +05:30
pateljannat
79b71462cb fix: patch 2020-12-17 18:21:34 +05:30
pateljannat
09f0e9111d fix: patch 2020-12-17 17:20:21 +05:30
pateljannat
2dbb1d6bc7 fix: indentation 2020-12-17 15:49:52 +05:30
pateljannat
2f4c88b228 Merge branch 'project-template-and-tasks' of https://github.com/pateljannat/erpnext into project-template-and-tasks 2020-12-17 11:56:06 +05:30
pateljannat
f2bff8e220 fix: patch relaod doctype 2020-12-17 11:54:59 +05:30
Jannat Patel
28098d6f93
Merge branch 'develop' into project-template-and-tasks 2020-12-16 20:09:27 +05:30
pateljannat
87b477a311 feat: patch for project template tasks 2020-12-16 13:37:21 +05:30
Rucha Mahabal
02ebc9a11e
Merge branch 'develop' into patient-history-enhancements 2020-12-16 12:51:45 +05:30
Suraj Shetty
f2511c84b5 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-12-14 09:05:48 +05:30
Deepesh Garg
ced3b13492 fix: Check for paid field 2020-12-12 19:31:05 +05:30
Deepesh Garg
68fce6d029 Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_fix 2020-12-12 19:28:50 +05:30