Frappe PR Bot
a52d4c25ff
fix: fail migration due to None type during v13_0.update_returned_qty_in_pr_dn ( #27430 ) ( #27436 )
...
* fix: fail migration due to None type
* fix: incorrect key: value pair in filter.
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
(cherry picked from commit becf471a3a238cfaa20a8940e0106c7e0e0386c2)
Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
2021-09-11 17:54:55 +05:30
Deepesh Garg
e7e2ce1271
fix: Linting Issues
2021-09-09 11:36:57 +05:30
Deepesh Garg
ee1486209d
Merge branch 'develop' of https://github.com/frappe/erpnext into tds_validity
2021-09-08 11:33:42 +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
14b01619de
fix: patch failure for vat audit report ( #27355 )
2021-09-06 13:47:56 +05:30
Ankush Menat
73b3a2f685
chore: whitespace
2021-09-03 21:57:38 +05:30
Deepesh Garg
41392acd18
Merge branch 'develop' of https://github.com/frappe/erpnext into tds_validity
2021-09-03 19:19:35 +05:30
Deepesh Garg
8f5a77446e
Merge pull request #27279 from deepeshgarg007/gstr_1_cdnr_unregistered_json_develop
...
feat: CDNR Unreg json generation
2021-09-03 13:55:00 +05:30
Deepesh Garg
a06a70d1a4
fix: Patch error and tests
2021-09-03 13:13:37 +05:30
Deepesh Garg
79d250845e
fix: Patch
2021-09-03 13:13:37 +05:30
Deepesh Garg
2b34028acd
fix: Patch and linting errors
2021-09-03 13:13:37 +05:30
Ankush Menat
d1fe060e4a
fix: south africa vat patch failure ( #27323 )
...
reload doc is necessary on new doctypes
2021-09-03 12:02:32 +05:30
Deepesh Garg
e1fffdb262
fix: Linting issues
2021-09-02 19:10:49 +05:30
Deepesh Garg
c85242e03d
Merge branch 'develop' of https://github.com/frappe/erpnext into gstr_1_cdnr_unregistered_json_develop
2021-09-02 18:59:59 +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
Ankush Menat
694ae81618
fix: remove bare excepts
2021-09-01 15:02:28 +05:30
Deepesh Garg
8b644d8889
fix: Report and JSON generation for Advances received
2021-09-01 10:28:15 +05:30
Deepesh Garg
b6d0b17ed6
fix: Linting and patch fixes
2021-09-01 10:11:18 +05:30
Subin Tom
7004944cc0
feat: Taxjar Integration update ( #27143 )
...
* feat: Taxjar Integration update
* added taxable_amount,taxable_amount fields in setup.py
* Update taxjar_integration.py
Sider issues fix
* Sider issues fix
* Sider issues fix
* sider issue fix: unused import
* sider issue fix
* Update erpnext/erpnext_integrations/taxjar_integration.py
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
* Removed permission for 'All'
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-08-31 18:33:16 +05:30
Deepesh Garg
5e10e10329
feat: Validity dates in Tax Withholding Rates
2021-08-31 18:23:28 +05:30
Shadrak Gurupnor
7433757489
fix: patches were breaking during migration ( #27200 )
...
* fix: patches were breaking during migrating
* fix: patches were breaking during migration
2021-08-27 18:00:16 +05:30
Shadrak Gurupnor
17e0fa7a8b
fix: patches were breaking while migrating ( #27195 )
...
* fix: patches were breaking while migrating
* fix: Removed duplicate function
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-27 16:42:25 +05:30
rohitwaghchaure
e6799d78ef
fix: operation time auto set to zero ( #27188 )
2021-08-27 10:46:45 +05:30
Rohan
16eed07a0f
fix: use Stripe's Price API for plan-price information ( #26107 )
...
* fix: use Stripe's new Plan API for price information
* patch: use inbuilt function to rename field
* fix: patch call
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-26 21:47:00 +05:30
Ganga Manoj
842ceb1301
fix: cannot reconcile bank transactions against internal transfer payment entries ( #26932 )
...
* fix: Only set Clearance Date for Payment Entries of type Internal Transfer if both Transactions have been reconciled
* fix: Reset clearance_date for intra-company Payment Entries that have only been reconciled with one Bank Transaction
* fix: indentation and args
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-25 20:32:26 +05:30
Frappe PR Bot
255b99ebdc
feat: Employee reminders ( #25735 ) ( #27115 )
...
* feat: Add reminders section to HR Settings
* refactor: Extract generic function for getting Employees
* feat: Employee Work Anniversary Reminder
* feat: Daily Holiday Reminder
* fix: Unnecessary params and replace [] with .get()
* test: Daily Holiday Reminders
* test: is_holiday basic tests
* refactor: Move employee reminders code to separate module
* feat: Add advance reminder to HR settings
* feat: Advance Holiday Reminders
* refactor: get_holidays_for_employee
* feat: Email holiday reminders in advance + tests
* fix: Remove unused import
* refactor: HR Setting Reminder Section
* refactor: Remove Daily Holiday Reminders feat
* feat: Reminder miss warning
* fix: Failing test and function name change
* chore: Add patch for field rename
* chore: Rename frequency label
* fix: Failing patch test
* fix: sider and removed description of fields
* fix: email alignment
Co-authored-by: pateljannat <pateljannat2308@gmail.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
(cherry picked from commit 24b2a315818d08ad4cb03347ccf5297df916a5ac)
Co-authored-by: Mohammad Hussain Nagaria <34810212+NagariaHussain@users.noreply.github.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
2021-08-24 20:19:22 +05:30
Saqib
c335962827
refactor!: drop e-invoicing integration from erpnext ( #26940 )
2021-08-20 11:10:46 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
Marica
112fc888f1
fix: Return Qty in PR/DN for legacy data ( #27001 )
2021-08-18 15:29:48 +05:30
Ankush Menat
8bbec42fa0
fix: undo changes to patch ( #26983 )
...
* fix: undo changes to patch
* ci: ignore empty body / head
2021-08-17 15:14:13 +05:30
Rohit Waghchaure
eb1e3181a4
fix: conflicts while merging brnach version-13 to develop
2021-08-17 10:53:19 +05:30
Deepesh Garg
4b9c127494
Merge branch 'version-13-pre-release' of https://github.com/frappe/erpnext into export_type_mandatory_v13_pre
2021-08-16 14:38:54 +05:30
Deepesh Garg
b58b1127f3
fix: Add mandatory depends on condition for export type field
2021-08-16 14:36:50 +05:30
Deepesh Garg
3f07bb7021
fix: Add mandatory depends on condition for export type field
2021-08-16 13:18:39 +05:30
Frappe PR Bot
a7e0805039
fix(e-invoicing): cannot cancel invoice if IRN cancelled on portal ( #26879 )
2021-08-10 17:16:15 +05:30
Saqib
84c4161c00
fix(e-invoicing): cannot cancel invoice if IRN cancelled on portal ( #26638 )
2021-08-10 16:46:44 +05:30
Frappe PR Bot
18bd182f61
patch: delete all orphaned tables docs ( #26863 )
2021-08-09 18:34:51 +05:30
Anuja Pawar
08ae49cd11
fix(regional): add permissions for VAT Audit report ( #26851 )
...
fix(regional): add permissions for VAT Audit report
2021-08-09 17:58:52 +05:30
Ganga Manoj
458f7f1194
patch: delete all orphaned tables docs ( #26743 )
2021-08-09 17:16:48 +05:30
Frappe PR Bot
1b9a5c851d
fix: incorrect amount in work order required items table. ( #26585 ) ( #26623 )
...
* fix: amount in work order not equal to rate * qty
* fix: patch for amount in work order required items
(cherry picked from commit cd12d95a24
)
Co-authored-by: Ankush <ankush@iwebnotes.com>
2021-08-03 20:06:36 +05:30
Deepesh Garg
346bde875c
Merge branch 'develop' of https://github.com/frappe/erpnext into sa-vat-report
2021-08-03 14:44:20 +05:30
Frappe PR Bot
5a442f1bce
fix: change format string to percent string interpolation ( #26774 ) ( #26778 )
...
(cherry picked from commit 7fe588e236
)
Co-authored-by: Alan <2.alan.tom@gmail.com>
2021-08-03 13:29:10 +05:30
Anuja
f2ee1155c0
fix: sider fixes
2021-08-02 23:13:21 +05:30
Ankush
efb037b566
refactor!: drop shopify integration from ERPNext ( #26700 )
...
BREAKING CHANGE: remove Shopify integration.
The integration is moved to a separate app with additional enhancements.
The app is still FOSS and licensed under the same license as ERPNext. Any
data migration required is taken care of after installing the app and
enabling it.
New app: https://github.com/frappe/ecommerce_integrations
2021-08-02 21:57:52 +05:30
Alan
7fe588e236
fix: change format string to percent string interpolation ( #26774 )
2021-08-02 20:07:55 +05:30
Ankush
e43bdf76a5
chore: warning for shopify integration deprecation ( #26701 )
...
* chore: warning for shopify integration deprecation
* fix: warn deprecation during patch for sysadmins
2021-08-02 18:57:48 +05:30
Anuja
3bcbc86291
fix: resolved conflicts in patches.txt
2021-08-02 12:58:46 +05:30