s-aga-r
|
f6ef3068d7
|
Merge branch 'develop' into subcontracting
|
2022-06-20 23:10:31 +05:30 |
|
Sagar Vora
|
ec9861266e
|
Merge remote-tracking branch 'upstream/develop' into remove-india
|
2022-06-19 22:57:22 +05:30 |
|
s-aga-r
|
5002f1f1e5
|
feat: Add hidden field "is_old_subcontracting_flow" in PO, PR and PI
|
2022-06-17 16:47:41 +05:30 |
|
Ankush Menat
|
276267d5a6
|
fix: remove agriculture module from patch (#31369)
|
2022-06-15 15:26:05 +05:30 |
|
Deepesh Garg
|
3d76b1a093
|
Merge pull request #31182 from ruthra-kumar/migrate_gl_to_payment_ledger_using_sql
refactor: migrating data from GL to payment ledger using raw SQL
|
2022-06-10 17:15:58 +05:30 |
|
ruthra kumar
|
e2c52436da
|
refactor: migrate gl to payment ledger using sql
|
2022-06-10 13:17:43 +05:30 |
|
Rucha Mahabal
|
273b21c0cb
|
chore: move patch for updating Employee Advance status to v13 (#31118)
|
2022-05-25 11:34:25 +05:30 |
|
ruthra kumar
|
8e72f19bfb
|
feat: patch to migrate gl entries to payment ledger
|
2022-05-20 18:21:47 +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 |
|
Ankush Menat
|
f0049da284
|
chore: correct link
|
2022-05-02 11:52:46 +05:30 |
|
Ankush Menat
|
bae8ab2fa9
|
Merge branch 'develop' into education_sepration
|
2022-05-02 11:47:37 +05:30 |
|
Rushabh Mehta
|
be0f84a722
|
fix(minor): fix create_accounting_dimensions_in_orders.py
|
2022-05-02 09:41:12 +05:30 |
|
Rushabh Mehta
|
d746db5547
|
fix(minor): discount accounting patch
|
2022-05-01 12:25:21 +05:30 |
|
Deepesh Garg
|
3c578a3b0b
|
chore: Add patch to delete education doctypes
|
2022-04-28 19:54:28 +05:30 |
|
rahib-hassan
|
6c86067d90
|
Merge branch 'develop' into separate-discount-account
|
2022-04-25 12:17:50 +05:30 |
|
Rucha Mahabal
|
9d158088ee
|
chore: remove unused Employee Transfer Property doctype
|
2022-04-22 20:20:12 +05:30 |
|
Ankush Menat
|
0d64349142
|
Merge branch 'develop' into separate-discount-account
|
2022-04-14 17:29:28 +05:30 |
|
rahib-hassan
|
0eff74c650
|
fix: tabspacing
|
2022-04-14 15:42:16 +05:30 |
|
Raffael Meyer
|
6453fb4cea
|
refactor!: remove DATEV integration (#30584)
The DATEV integration follows the trend and moves into a separate app.
- the DATEV Integration will be maintained at https://github.com/alyf-de/erpnext_datev (version-14 branch)
- the German Compliance and Localization will be maintained at https://github.com/alyf-de/erpnext_germany
|
2022-04-13 09:24:19 +00:00 |
|
rahib-hassan
|
dc2944a041
|
fix[minor]: removed doc assignment
|
2022-04-09 03:55:25 +05:30 |
|
rahib-hassan
|
ac16f3b71f
|
fix: lock timeout exceeded
|
2022-04-08 18:20:41 +05:30 |
|
rahib-hassan
|
ac7f1cbd87
|
fix: minor fix
|
2022-04-08 17:46:49 +05:30 |
|
rahib-hassan
|
35e875c111
|
fix(patch): enable discount account in buying and selling if exist in accounts settings
|
2022-04-08 17:27:53 +05:30 |
|
Ankush Menat
|
bb875fe217
|
fix: check null values in is_cancelled patch (#30594)
|
2022-04-06 14:20:39 +05:30 |
|
Sagar Sharma
|
d074c93ac7
|
refactor!: change "is_subcontracted" field type from "Select" to "Check"
|
2022-04-01 13:22:44 +05:30 |
|
Ankush Menat
|
494bd9ef78
|
style: format code with black
|
2022-03-28 18:52:46 +05:30 |
|
Raffael Meyer
|
c01fe74cf0
|
fix(patch): fix failing patches (#30427)
* patch: reload Opportunity
* patch: reload child tables before doctype
|
2022-03-28 17:53:54 +05:30 |
|
Sagar Vora
|
3d45f3a6a8
|
Merge remote-tracking branch 'upstream/develop' into remove-india
|
2022-03-03 10:20:50 +05:30 |
|
Rucha Mahabal
|
650099ee65
|
Merge branch 'develop' into emp-adv-status
|
2022-03-01 20:30:58 +05:30 |
|
Sagar Vora
|
b90a134d91
|
fix: remove patches
|
2022-02-25 11:36:18 +05:30 |
|
Rucha Mahabal
|
04b9091821
|
fix: web form deletion
|
2022-02-24 18:10:29 +05:30 |
|
Rucha Mahabal
|
d647de3782
|
Merge branch 'develop' into remove-nonprofit
|
2022-02-24 17:03:52 +05:30 |
|
Ankush Menat
|
312db429e4
|
refactor: use qb for patching flag
|
2022-02-21 18:02:40 +05:30 |
|
18alantom
|
f4af75f60b
|
feat: batchwise valuation flag
This is required to avoid breaking behaviour in valuation
of old batches
|
2022-02-21 18:02:40 +05:30 |
|
Deepesh Garg
|
e1f8f034c2
|
Merge branch 'develop' of https://github.com/frappe/erpnext into patch_fixes
|
2022-02-17 23:20:29 +05:30 |
|
Deepesh Garg
|
1617e0d0e6
|
fix: Remove reload doc
|
2022-02-17 22:52:53 +05:30 |
|
ChillarAnand
|
358734dcea
|
fix: Skip deletion if linked docs exists
|
2022-02-17 16:31:27 +05:30 |
|
ChillarAnand
|
fb59247182
|
fix: Delete party type records in patch
|
2022-02-17 15:15:44 +05:30 |
|
ChillarAnand
|
db1957ffe6
|
Merge branch 'develop' into remove-nonprofit
|
2022-02-17 13:00:58 +05:30 |
|
ChillarAnand
|
b5ff9b27bd
|
refactor: Clean up non-profit setup
|
2022-02-17 12:37:25 +05:30 |
|
marination
|
06d36c6143
|
chore: Move patch that updates SO from WO to v13
|
2022-02-16 17:40:16 +05:30 |
|
marination
|
0ca58d7627
|
chore: Patch to update SO work_order_qty and Linter fix
|
2022-02-15 14:28:00 +05:30 |
|
Sagar Sharma
|
19a6c21eec
|
refactor!: amazon mws integration (#29438)
* remove: amazon mws integration
* add patch to remove doctype
* remove old patch
|
2022-02-14 19:43:26 +05:30 |
|
Deepesh Garg
|
615dd9decd
|
fix: Patch fixes
|
2022-02-13 19:24:10 +05:30 |
|
ChillarAnand
|
325dc92d37
|
Merge branch 'develop' into remove-nonprofit
|
2022-02-03 16:38:01 +05:30 |
|
ChillarAnand
|
899ca8b384
|
refactor: Code cleanup
|
2022-02-03 15:24:45 +05:30 |
|
Nabin Hait
|
364856b7c5
|
fix: patch for migrating cost center allocations
|
2022-02-01 22:26:03 +05:30 |
|
Nabin Hait
|
5b0ec6437b
|
fix: sider issues
|
2022-01-31 18:41:42 +05:30 |
|
Nabin Hait
|
6099af5d00
|
fix: Fixed test case and sider issues
|
2022-01-31 17:43:37 +05:30 |
|
Nabin Hait
|
3dadfc9048
|
patch: Removed files and code related to old distributed cost center feature
|
2022-01-31 15:58:40 +05:30 |
|
Nabin Hait
|
ce49e6ccf7
|
fix: Resolved conflicts in patches
|
2022-01-31 13:25:44 +05:30 |
|
Nabin Hait
|
d71d3e3b3e
|
fix: Minor issues in existing patches
|
2022-01-31 13:24:18 +05:30 |
|
Saqib Ansari
|
c5782b0e71
|
revert: "refactor!: drop e-invoicing integration from erpnext (#26940)"
This reverts commit c335962827.
|
2022-01-27 20:09:56 +05:30 |
|
Ankush Menat
|
7eab945d8c
|
refactor: move existing patches to post migration (#28940)
Also remove duplicates :')
|
2022-01-26 12:40:21 +05:30 |
|
ChillarAnand
|
7086d3f3d7
|
Merge branch 'develop' into remove-nonprofit
|
2022-01-24 11:35:47 +05:30 |
|
Ankush Menat
|
cce35c1536
|
fix(patch): delete hospitality custom fields (#29382)
|
2022-01-20 19:42:08 +05:30 |
|
Chillar Anand
|
2718ddd784
|
refactor: Removed hospitality domain from ERPNext (#29167)
|
2022-01-20 11:57:22 +05:30 |
|
Rucha Mahabal
|
bf30932de0
|
patch: Employee Advance return statuses
|
2022-01-18 14:36:38 +05:30 |
|
Rucha Mahabal
|
b07c1f3bf1
|
feat: add link to leave application in leave notification (#29316)
|
2022-01-17 14:37:25 +05:30 |
|
Saqib Ansari
|
203fca45bf
|
fix: order of company form fields (#29287)
|
2022-01-14 14:59:58 +05:30 |
|
Chillar Anand
|
39eb4e040c
|
fix(healthcare): Remove custom fields related to healthcare (#29129)
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
|
2022-01-14 12:37:32 +05:30 |
|
ChillarAnand
|
0c0a9ed96d
|
refactor: Remove non-profit domain from ERPNext
|
2022-01-06 09:53:49 +05:30 |
|
Chillar Anand
|
0900c3d655
|
refactor: Removed agriculture module from ERPNext (#29022)
|
2022-01-04 17:26:11 +05:30 |
|
Rucha Mahabal
|
8226ea65c8
|
fix: linter issues
|
2021-12-28 08:54:05 +05:30 |
|
Rucha Mahabal
|
3c8ed4f737
|
Merge branch 'develop' into multiple-cost-centers-against-employee
|
2021-12-28 08:40:48 +05:30 |
|
Rucha Mahabal
|
6eeea0a77a
|
fix: ignore links while setting default notification templates in Settings (#29019)
|
2021-12-24 17:20:23 +05:30 |
|
Nabin Hait
|
f152a40b28
|
feat: Provision to assign multiple payroll cost centers against a single employee
|
2021-12-24 16:23:33 +05:30 |
|
Saqib
|
7d0a3e4e8b
|
Merge pull request #28550 from nextchamp-saqib/fix-sla
refactor(SLA): Application of SLA and its fields
|
2021-12-13 10:29:56 +05:30 |
|
Rucha Mahabal
|
4686527928
|
Merge branch 'develop' into exit-interview
|
2021-12-07 16:23:31 +05:30 |
|
Saqib Ansari
|
476e81a631
|
fix: time to respond & resolve indicators
|
2021-12-06 18:55:30 +05:30 |
|
Saqib Ansari
|
10b87e081c
|
fix: sider issues
|
2021-12-06 15:38:19 +05:30 |
|
Saqib
|
8e5b793a0a
|
Merge branch 'develop' into fix-sla
|
2021-12-06 14:48:09 +05:30 |
|
Anupam Kumar
|
3928a402d4
|
feat: CRM Settings (#27788)
* feat: crm settings
* feat: CRM Settings
* feat: lead and opprtunity section
* feat: added CRM Settings in ERPNext Settings workspace
* fix: review chnages
* added patch
* fix: linter issues
* fix: linter issues
* fix: linter issues
* fix: removed crm settings from selling module
* fix: raw query to frappe.qb
* fix: removed hardcoded value
* fix: linter issue
* fix: simplify CRM Settings migration patch
Co-authored-by: Anupam Kumar <anupam@Anupams-MacBook-Air.local>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
|
2021-12-06 13:52:00 +05:30 |
|
Saqib Ansari
|
f9408d170a
|
patch: split 'ongoing' sla status
|
2021-12-06 12:38:25 +05:30 |
|
Rucha Mahabal
|
235b707417
|
feat: add default Exit Questionnaire email template
|
2021-12-05 17:06:29 +05:30 |
|
Ankush Menat
|
8fe5feb6a4
|
chore: remove all six compat code
|
2021-11-05 11:16:29 +05:30 |
|
Ankush Menat
|
6098e92ba9
|
chore: remove utf-8 compat code
|
2021-11-05 11:16:29 +05:30 |
|
Ankush Menat
|
b01635e1da
|
refactor!: remove hub #28117
refactor!: remove hub
|
2021-10-28 14:07:15 +05:30 |
|
Chillar Anand
|
73ae504721
|
fix(healthcare): Add patch for removing healthcare doctypes (#27995)
* fix(healthcare): Add patch for healthcare doctypes
* fix: Update healthcare patch
* fix: Reload stale doctypes
* fix: Reload doc fix
|
2021-10-19 18:59:23 +05:30 |
|
Anupam Kumar
|
b0d970001a
|
feat: multi-currency in Opportunity (#26590)
* feat: multi-currency
* refactor: lead form
* fix: test case for opportunity item
* fix: removing local changes
* fix: test cases
* fix: test cases
* fix: review changes
* fix: reverting lead.json chnages
* fix: toggle display for currency fields
* review changes
* fix: test case
* fix: linter issues
* fix: unused import
* feat: grand total in opportunity
* fix: patch
* fix: sort imports
* fix: reload opportunity item doctype
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
|
2021-09-06 16:54:28 +05:30 |
|
Ankush Menat
|
60185c8c71
|
chore: linting
[skip ci]
|
2021-09-02 17:36:05 +05:30 |
|
Chillar Anand
|
915b34391c
|
chore: Clean up imports (#27302)
* chore: Added isort to pre-commit config
* chore: Sort imports with isort
* chore: Clean up imports with pycln
* chore: Sort imports with isort
* chore: Fix import issues
* chore: Clean up sider issues
* chore: Remove import errors from flake8 ignore list
* chore: Clean up lint issues
|
2021-09-02 16:44:59 +05:30 |
|
Ankush Menat
|
b25d28e023
|
fix(patch): delete stale shopify doctypes (#27313)
|
2021-09-02 14:53:06 +05:30 |
|
Ankush Menat
|
b147b85e6a
|
chore: whitespace / eof fixes
|
2021-09-01 16:57:21 +05:30 |
|
Saqib
|
c335962827
|
refactor!: drop e-invoicing integration from erpnext (#26940)
|
2021-08-20 11:10:46 +05:30 |
|