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

2106 Commits

Author SHA1 Message Date
Dany Robert
3f8ad54c5c
Merge branch 'develop' into currency-exchange-settings 2021-11-13 13:13:15 +05:30
Deepesh Garg
c81d4734c4 fix: KSA VAT setup issues 2021-11-08 17:14:03 +05:30
Dany Robert
01e7076b65
Merge branch 'develop' into currency-exchange-settings 2021-11-06 09:59:00 +05:30
Ankush Menat
8fe5feb6a4 chore: remove all six compat code 2021-11-05 11:16:29 +05:30
Ankush Menat
897e90ac55 chore: remove past module dependencies 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
Dany Robert
1f8be84985 fix : remove mutable data structures from argument defaults 2021-11-04 05:12:09 +00:00
Dany Robert
7291d9f236 feat: option for preconfigured selectable service providers 2021-11-03 14:13:22 +00:00
Dany Robert
d869b3933b
Merge branch 'frappe:develop' into currency-exchange-settings 2021-11-03 18:15:27 +05:30
Kenneth Sequeira
ad5cf467c0
fix: update tax template name for 18% GST 2021-10-30 13:07:36 +05:30
Ankush Menat
b01635e1da
refactor!: remove hub #28117 
refactor!: remove hub
 2021-10-28 14:07:15 +05:30
Summayya Hashmani
0806e32049
fix(ux): add naming series to ERPNext setting workspace (#28090) 
* fix(ux): add naming series to setting workspace

* fix: doctype link to naming series

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>

Co-authored-by: Summayya <frappe@Summayyas-MacBook-Air.local>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2021-10-27 11:46:10 +05:30
Dany Robert
882da2f98b
Merge branch 'develop' into currency-exchange-settings 2021-10-27 10:48:04 +05:30
Himanshu
7717b99edb
feat: add enabled field in UOM (#27993) 2021-10-19 10:19:40 +05:30
Shariq Ansari
790c1cda6f
fix: Removing unused fields from workspace JSON files #27612 
fix: Removing unused fields from workspace JSON files
 2021-10-13 16:18:20 +05:30
marination
1d94914102 feat: Discount Filters 
- Discount filters in filters section
- Code cleanup
 2021-10-12 17:46:03 +05:30
marination
c842305be0 feat: Customer Ratings & Reviews Full Page 
- Created macros for repetitive snippets
- Created Customer Reviews full page
- View more button to reveal 10 more reviews at a time
- Common function to get reviews with start and end
 2021-10-12 17:30:03 +05:30
marination
b15ff57a66 feat: (wip) Ratings and Reviews 
- Added Ratings and Reviews section in Item full page view
- Added provision to write a review with popup
- Created Item Review Doctype to store User-Item unique reviews
- Added privision to enable/disable wishlist and reviews in e commerce settings
- Hide cart and wishlist actions everywhere (even navbar) depending on settings
- Moved some more inline css to scss
- Small logic fixes
TODO: Reviews full page view with paging
 2021-10-12 17:27:32 +05:30
marination
25ffafae81 feat: Product Details Tabbed Section and Add to Wishlist in Item Full Page 
- Add to Wishlist button next to add to cart
- Beautified Product Specifications table section
- Product Specifications can be optionally in a tabbed section with custom tabs added
- Removed hard coded gray bg to allow custom theme overwrites
- Fixed resizing issues in Item Full Page view
- Cleaned up inline styles and ported to scss
 2021-10-12 17:25:51 +05:30
marination
d7130e31fe feat: Shop by Category 
- Added Shop by Category Page
- Tabbed sections for item fields in Shop by Category Page
- Added Shop by Category Section in E commerce Settings
- Nested Navigation & Breadcrumbs in Item group pages
- Added scrollable & clickable Sub categories in Item Group page
- Made breadcrumbs slightly dynamic in Item Page
- Added image to Brand doctype
 2021-10-12 17:00:30 +05:30
marination
22f41a17b7 chore: Removed Shopping Cart Module 
- Moved all files and web templates from Shopping Cart to E-commerce module
- Made Shopping Cart module obsolete
- Moved select E-commerce related files from Portal to E-commerce module
- Minor cleanups
- Fixed Shopping Cart and Product Configurator tests
 2021-10-12 16:54:11 +05:30
marination
025574d9b5 chore: Removing Item's Website section & references 
- Removed old onboarding slide json and `create_onboarding_docs` methods
- Removed website sections from Item master
- Removed references to item website fields
- Shifted Item doctype website methods to Website Item
- Removed WebsiteGenerator from Item doctype
- Website Items in Homepage Products section
- Removed redundant code from item_group.py
- Fix: Item field filters won’t appear in website
 2021-10-12 16:03:19 +05:30
marination
eef9cf152f chore: Drive E-commerce via Website Item 
- Removed Shopping Cart Settings
- Portal fully driven via E Commerce Settings
- All Item listing querying will happen via ProductQuery engine only
- Product Listing via Website Items
- removed redundant code
- Moved all website logic from Item to Website Item
 2021-10-12 15:48:06 +05:30
marination
939b0dd67d feat: E-commerce Refactor 
- Created "Website Item" to handle website related information
- Publishing Item new flow
- Created "E Commerce Settings"
- Removed Products Settings
 2021-10-12 15:16:21 +05:30
Saqib
64c1347d1e
refactor!: remove abbreviation renaming (#27766) 
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-10-07 07:05:34 +00:00
Deepesh Garg
a2b5e678fe fix: Use get_list instead of get_all to avoid perm issues 
(cherry picked from commit 9507b2d752a40c0dd9e8b43ae3ef64435457c85e)
 2021-10-05 09:49:05 +00:00
GangaManoj
38c7e42f0c fix: Delete linked Transaction Deletion Record docs on deleting company 2021-10-05 10:14:01 +05:30
mergify[bot]
b9942ad639
feat: Tracking Multi-round interview (#25482) (#27724) 
* feat: Tracking Multi-round interview

* fix: releted to scheduler event and formating

* fix: job applicant UI/UX and conflicts

* test: Interview Round

* fix(test): Employee referral, Employee Onboarding, Job Offer

* fix: sider

* feat: set default value in Hr settings

* feat: added validation for designation

* test: Interview

* test: Added validatiolns for skill

* test: Interview feedback

* fix: sider

* fix: remove unnecessary validations and form label cleanups

* chore: clean-up Interview Round and Interview Type doctype

* fix: remove redundant Rating Value, only keep Rating

* fix: update interview details on feedback submission

- make interview feedback submission dialog minimizable

* fix: show submit feedback button only if feedback doesn't exist

* refactor: Interview and Feedback statuses and workflow

* fix(HR Settings): clean up interview settings

* refactor: Interview

* refactor: Interview Feedback, remove unnecessary validations

* chore: update notification messages

* chore: remove unnecessary formatting changes in attendance list and leave application

* refactor: Job Applicant to Interview mapping

* chore: sorted imports

* chore: sorted imports

* fix: sider issues

* fix: linter issues

* fix: sider issues

* fix: tests

* fix: sorted imports

* fix: tests, sider

* fix: therapy plan test

* fix: sider issues

* feat: Include From Time and To Time fields in Interview for cleaner data

* feat: Interview Calendar

* fix: allow renaming masters

* fix: add more fields to list view and standard filter

* fix: validate overlapping interviews

* fix: update tests

* fix: linter issues

* refactor: replace reminder messages with Email Templates

* fix: sider issues

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 57e66f958cd57d66a6fd3b19f6cd3593eab63666)

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2021-10-01 13:15:40 +05:30
Kenneth Sequeira
abded895f3
fix: update default KSA VAT rate for setup (#27614) 2021-09-21 10:58:18 +05:30
Saqib
5eba1ccd51
fix: no validation on item defaults (#27393) 
* fix: no validation on item defaults

* fix: cache value while validating

* test: item default company relation

* fix: reorder validations

* refactor: add guard conditions on update_defaults

* test: add default warehouse for item group

* fix: validate item defaults for item groups

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-16 17:31:37 +05:30
Faris Ansari
1c1b476d67
perf: Optimize get_attribute_filters (#26729) 
* perf: Optimize get_attribute_filters

* fix: handle when filter attributes are undefined

* chore: unused imports

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-14 11:41:19 +05:30
rtdany10
06340ad08a feat: button to restore default settings 2021-09-04 17:53:51 +05:30
rtdany10
227466c365 chore: clean up layout and code 2021-09-04 14:04:56 +05:30
rtdany10
a86d9c91d0 chore: code clean up 2021-09-03 19:21:06 +05:30
Dany Robert
d56c8d44a6
Merge branch 'develop' into currency-exchange-settings 2021-09-03 18:47:12 +05:30
rtdany10
d8b8032de1 feat: init CES default values 2021-09-03 15:50:05 +05:30
rtdany10
e093863c9e feat: fetch api details from settings 2021-09-03 15:03:47 +05:30
Shariq Ansari
e68c55ce83
fix: Removing first Spacer from home page (#27321) 2021-09-03 11:00:33 +05:30
rtdany10
ff19113677 feat: currency exchange settings 2021-09-02 19:52:12 +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
b147b85e6a
chore: whitespace / eof fixes 2021-09-01 16:57:21 +05:30
Ankush Menat
e46567192a
fix: invalid escape sequences in regex 2021-09-01 16:57:17 +05:30
Ankush Menat
694ae81618
fix: remove bare excepts 2021-09-01 15:02:28 +05:30
Jannat Patel
48f2e5ac1d
fix: email digest original_user issue (#27191) 2021-08-31 17:43:30 +05:30
Dany Robert
94dcbf851a
fix: update get_exchange_rate for test mode (#26847) 
* fix: no api calls on test mode

* fix: make api call, but return 1.0 incase of invalid currency

* feat: patch request.get

* fix: clear cache after test

* fix: add missing test_exchange_value

* fix: avoid api call in implicit function call during test

* fix: returning 1 while in test causes failure

Returning 1.00 causes failure of exchange rate tests.

* chore: retab

* chore: style
 2021-08-31 17:19:12 +05:30
Kamal Johnson
a285b5b78b
feat: Accounts, Selling & Assets Onboarding cleanup (#27112) 
* refactor: company form fields arrangement

* refactor: accounts onboarding steps

* refactor: re-arrange fields & modify labels in company form

* feat: onbording steps for accounts module

* fix: updated onboarding steps for selling module

* fix: remove unwanted steps from accounts

* feat: add more onboarding steps

* feat: Refactor onboarding-module for accounting workspace

* feat: Add basic asset onboarding steps

* feat: Add basic asset item form tour

* feat: Add basic selling onboarding-steps

* feat: Add basic form tour for purchase recipt

* feat: Add basic form tour for existing asset

* feat: Adding asset category form tour

* feat: Add form tour for asset category

* feat: Refactor sales taxes and charges template form tour with new  method

* refactor: Remove old form tour for accounts settings

* refactor: Change asset category form tour with new tour method

* refactor: Change asset item form tour with new tour method

* refactor: Change purchase receipt form tour with new tour method

* refactor: Change asset form tour with new tour method

* refactor: Remove old form tour for selling settings

* refactor: general fix/typo in onboarding steps

* Apply suggestions from code review

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

* refactor: Remove old form tour method for sales order.

* fix: removed duplicate section break

* fix: Removed duplicate fields

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: Anuja <anuja.pawar20@gmail.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-08-27 15:47:11 +05:30
Ankush Menat
ae55eab599
chore: remove deprecated and empty QUnit tests (#27179) 
* chore: remove deprecated and empty QUnit tests

* ci: fix UI test config

Testing library was added on Frappe, in order to reuse command testing
library has to be installed during setup process.
 2021-08-26 20:43:06 +05:30
Saqib
60675379c2
fix: partial rename while replacing abbreviation (#27065) 2021-08-25 18:26:00 +05:30
Saqib
ce129a1414
feat: re-arrange company doctype fields (#27091) 2021-08-24 17:23:14 +05:30
Deepesh Garg
2b2572b9b9
fix: Cascade deletion for Company (#26923) 
* fix: Cascade deletion for Company
 2021-08-20 14:40:12 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes 2021-08-19 13:43:28 +05:30
Rohit Waghchaure
eb1e3181a4 fix: conflicts while merging brnach version-13 to develop 2021-08-17 10:53:19 +05:30
Shariq Ansari
b32c2fa561
fix: updated erpnext wspace json files (#26380) 
* fix: updated erpnext wspace json files

* fix: updated wspace json files

* fix: updated wspace json files

* fix: removed padding code from  wspace json files

* fix: Updated restrict_to_domain in wspace json

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2021-08-13 12:19:16 +05:30
Rohit Waghchaure
7167fd00bc Merge branch 'version-13-hotfix' into merged-v13-hotfix-into-pre-release 2021-08-10 23:30:16 +05:30
Frappe PR Bot
1a39d1a311
fix: cost center & account validation in Sales/Purchase Taxes and Charges (#26881) 2021-08-10 19:38:39 +05:30
Anuja Pawar
0e337be065
fix: cost center & account validation in Sales/Purchase Taxes and Charges (#25929) 2021-08-10 17:26:35 +05:30
Rohit Waghchaure
f571e42aa4 Merge branch 'version-13-hotfix' into merge-version-13-hotfix-into-v13-pre-9 2021-08-10 01:06:23 +05:30
GangaManoj
fcbd79b7d3 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into backport-asset-repair-refactor 2021-08-06 18:12:24 +05:30
Frappe PR Bot
b13e46071a
fix: Let all System Managers be able to delete Company transactions (#26815) (#26819) 
(cherry picked from commit 884d8cf065)

Co-authored-by: Ganga Manoj <ganga.manoj98@gmail.com>
 2021-08-06 10:39:58 +05:30
Ganga Manoj
884d8cf065
fix: Let all System Managers be able to delete Company transactions (#26815) 2021-08-05 11:14:46 +05:30
Rohit Waghchaure
343143037c fix: conflicts 2021-08-01 14:45:24 +05:30
Dany Robert
2833a02e0e
Merge branch 'develop' into patch-5 2021-07-29 16:47:28 +05:30
Dany Robert
909995a441
fix: issue with cache.setex 2021-07-29 15:58:27 +05:30
Anupam
e5fea372af fix: frappe linter 2021-07-29 11:05:38 +05:30
Anupam
b1350af1f6 fix: setup wizard 2021-07-28 23:54:46 +05:30
Anupam Kumar
89f2138fbc
Merge branch 'version-13-hotfix' into email-digest 2021-07-28 18:24:29 +05:30
Rohit Waghchaure
60a0b7fe77 Merge branch 'version-13-hotfix' into 'version-13-pre-release-13-8' 2021-07-26 11:34:57 +05:30
Ganga Manoj
41705acbd9
fix: delete child docs when parent doc is deleted (#26518) 
* fix: Make code more readable

* fix: Delete child table info when parent doc is deleted

* fix: Sider issues

* fix: Remove trailing whitespace
 2021-07-20 20:48:57 +05:30
Deepesh Garg
2686d04800 fix: Typo and remove duplicate function 2021-07-18 17:54:35 +05:30
Nabin Hait
11475487fb fix: merge conflict 2021-07-16 15:58:50 +05:30
18alantom
b24c0bfbf9 fix: show child item group items on portal 2021-07-14 17:41:32 +05:30
18alantom
7558e7f115 fix: show child item group items on portal 2021-07-14 17:40:04 +05:30
Marica
3f599b049c
Merge branch 'develop' into fix-item-group-portal-issues 2021-07-14 17:15:18 +05:30
Saqib
be773f4052
Merge branch 'develop' into bootstrapped_gst_setup_develop 2021-07-14 13:55:00 +05:30
Ganga Manoj
05d7c69aa2
fix: delete child docs when parent doc is deleted (#26239) 2021-07-14 11:54:27 +05:30
Deepesh Garg
75f66f78d7
Merge pull request #26420 from deepeshgarg007/new_company_error 
fix: Errors on parallel requests creation of company for India
 2021-07-13 20:29:56 +05:30
Deepesh Garg
2de11fbbc4 fix: Test Cases 2021-07-13 16:50:35 +05:30
Deepesh Garg
779d2afa60 fix: Update account heads in GST test cases 2021-07-13 16:50:04 +05:30
Deepesh Garg
2908f2ee20 fix: Revert Changes 2021-07-13 16:49:21 +05:30
Deepesh Garg
0dfea4d134 fix: Test Cases 2021-07-13 16:49:21 +05:30
Deepesh Garg
22683cf19b fix: Tests 2021-07-13 16:49:21 +05:30
Deepesh Garg
b71497067d chore: Add comments 2021-07-13 16:49:21 +05:30
Deepesh Garg
87f4df80ea fix: Move tax categories up in country wise json 2021-07-13 16:49:21 +05:30
Deepesh Garg
ed54e4e276 fix: Check for tax category 2021-07-13 16:48:44 +05:30
Deepesh Garg
269510b98f fix: Regional settings setup 2021-07-13 16:48:22 +05:30
Deepesh Garg
a72589cb7e fix: Add accounts and templates for reverse charge 2021-07-13 16:48:06 +05:30
Deepesh Garg
0380cca3b7 fix: Add GST accounts to GST Settings 2021-07-13 16:47:38 +05:30
Deepesh Garg
8ed1afd93d fix: Remove redundant get_doc 2021-07-13 16:47:38 +05:30
Deepesh Garg
8fd2d8b5d0 fix: Ignore validations for Tax Setup 2021-07-13 16:47:38 +05:30
Deepesh Garg
e166c264b4 fix: Update country-wise-tax JSON and tax setup 2021-07-13 16:47:38 +05:30
Deepesh Garg
3031535a24 fix: Add tax categories on company setup 2021-07-13 16:47:36 +05:30
Deepesh Garg
de8c6eb0da fix: Item Tax templates for GST 2021-07-13 16:46:30 +05:30
Deepesh Garg
2a9726b09f feat(India): Separate Input and Output GST tax accounts 2021-07-13 16:46:30 +05:30
Deepesh Garg
fea29ae8cb fix: Use update flag for company dependant fixtures 2021-07-13 16:05:05 +05:30
18alantom
a4eba7a409 fix: show child item group items on portal 2021-07-13 15:34:25 +05:30
Saqib
621927d9f9
fix: move the rename abbreviation job to long queue (#26462) 2021-07-13 14:13:39 +05:30
Deepesh Garg
1298956482 fix: Use update flag for company dependant fixtures 2021-07-12 18:29:52 +05:30
Saqib
b75b556bbb
fix: move the rename abbreviation job to long queue (#26435) 2021-07-12 14:32:37 +05:30
Saqib
9e1819d366
fix: move the rename abbreviation job to long queue (#26434) 2021-07-12 14:31:57 +05:30
Nabin Hait
470c7e773f fix: merge conflict 2021-07-12 12:45:49 +05:30
Ankush Menat
22cb642831 chore: update test company FY 2021-07-12 10:09:50 +05:30
GangaManoj
42c70fba3c fix: Modify depreciation schedule when increase_in_asset_life is not a multiple of frequency_of_depreciation) 2021-07-09 22:11:50 +05:30
GangaManoj
58bc967073 fix: Rename 'Fixed Asset Depreciation Settings' to 'Fixed Asset Deafults' 2021-07-09 22:10:35 +05:30
Mohammad Hasnain Mohsin Rajan
00f90c50c0 chore: add product listing link in settings (#26026) 
* chore: add product listing link in settings

* chore: add icon in workspace card

Co-authored-by: Ankush <ankush@iwebnotes.com>
 2021-07-07 18:21:12 +05:30
Saqib
0b320b5909
Merge pull request #25798 from GangaManoj/asset-repair-refactor 
refactor: Asset Repair
 2021-07-07 12:44:50 +05:30
Mohammad Hasnain Mohsin Rajan
290350c86f
chore: add product listing link in settings (#26026) 
* chore: add product listing link in settings

* chore: add icon in workspace card

Co-authored-by: Ankush <ankush@iwebnotes.com>
 2021-07-07 12:10:02 +05:30
Deepesh Garg
9b6d9a41f4 fix: Test Cases 2021-07-05 17:08:27 +05:30
Deepesh Garg
63096014a7 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup 2021-07-02 20:30:18 +05:30
Dany Robert
31afc61190
fix: Update test cases to suit values from exchangerate.host 2021-06-28 19:05:51 +05:30
Dany Robert
e9bc2f354b
feat: Increase number of supported currency exchanges 
Switch from frankfurter.app to exchange rate.host to accommodate more currency usage.
 2021-06-28 19:01:52 +05:30
Saqib
4b69563a56
Merge branch 'develop' into asset-repair-refactor 2021-06-28 11:07:58 +05:30
Deepesh Garg
ebc46c1e09 fix: Update account heads in GST test cases 2021-06-28 10:52:38 +05:30
Deepesh Garg
1e5482cedd fix: Revert Changes 2021-06-26 23:49:32 +05:30
Nabin Hait
67768faaef Merge branch 'version-13-hotfix' into version-13-pre-release 2021-06-24 20:16:04 +05:30
Saqib
b3a0a7b432
fix: too many writes while renaming company abbreviation (#26203) 2021-06-24 19:30:10 +05:30
Saqib
64c6b34b94
fix: too many writes while renaming company abbreviation (#26142) 2021-06-24 19:29:56 +05:30
Nabin Hait
a57976660a fix: merge conflict 2021-06-24 19:14:33 +05:30
Nabin Hait
5b462ad11a fix: merge conflict 2021-06-24 15:36:51 +05:30
marination
ea2408744a fix: Consider Website Item Groups in Item group page product listing 
- Passed an argument to query engine to know when query is for item group page
- If for item group page, get data with regards to website item group table
- This query should be fast since there's one filter and that shortens the table beforehand
- This data is merged with the results from the Item master (results only considering item attributes and field filters)
- The combined data is then sorted as per weightage

Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
 2021-06-24 13:56:15 +05:30
Deepesh Garg
0bfffddac4 fix: Test Cases 2021-06-23 15:37:17 +05:30
marination
d802d73973 fix: Consider Website Item Groups in Item group page product listing 
- Passed an argument to query engine to know when query is for item group page
- If for item group page, get data with regards to website item group table
- This query should be fast since there's one filter and that shortens the table beforehand
- This data is merged with the results from the Item master (results only considering item attributes and field filters)
- The combined data is then sorted as per weightage

Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
 2021-06-23 14:24:13 +05:30
Deepesh Garg
35e11fbea6 fix: Tests 2021-06-23 13:17:01 +05:30
Deepesh Garg
208b5f9e73 chore: Add comments 2021-06-23 12:44:56 +05:30
Deepesh Garg
40a4330ec1 fix: Move tax categories up in country wise json 2021-06-23 12:38:37 +05:30
Deepesh Garg
673470705b Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup 2021-06-23 11:33:15 +05:30
Saqib
4b4eb990a9
Merge branch 'develop' into asset-repair-refactor 2021-06-22 16:21:13 +05:30
Suraj Shetty
6894cc2832
Merge pull request #26088 from surajshetty3416/refactor-website-routing 2021-06-17 20:43:23 +05:30
Eben van Deventer
ddef85ae97
fix: Correct South Africa VAT Rate (#25894) 
On 1 April 2018 South Africa increased the VAT rate from 14% to 15%, this proposed change seeks to update the default parameters for a fresh ERPNext installation.
 2021-06-17 18:43:30 +05:30
Deepesh Garg
ceb9d9e870
Merge branch 'develop' into patch-3 2021-06-17 18:26:42 +05:30
Suraj Shetty
00332d1834 Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing 2021-06-17 09:47:16 +05:30
Nabin Hait
0950481253 fix: merge conflict 2021-06-15 20:18:06 +05:30
Suraj Shetty
d1902dfadb Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing 2021-06-14 12:25:49 +05:30
Ankush Menat
9891780f5a
perf(minor): remove unnecessary comprehensions (port #25645) 2021-06-11 18:40:22 +05:30
Ankush Menat
a9c84f749a
perf(minor): remove unnecessary comprehensions (#25645) 2021-06-11 16:00:48 +05:30
Nabin Hait
42d72b55b8 Merge branch 'version-13-hotfix' into version-13-pre-release 2021-06-10 20:26:31 +05:30
Nabin Hait
27299cfcc5 Merge branch 'version-13-hotfix' into version-13-pre-release 2021-06-10 19:45:38 +05:30
Deepesh Garg
758db793be Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-09 13:39:07 +05:30
Deepesh Garg
9a282aa593
Merge pull request #25858 from alyf-de/item-tax-templates 
feat: Item Tax Templates for Germany
 2021-06-09 12:50:27 +05:30
Saqib
6eeaf9b933
Merge branch 'version-13-hotfix' into asset-repair-refactor 2021-06-08 17:26:50 +05:30
Ganga Manoj
0ea4d850e1
fix: Allow all System Managers to delete company transactions (#25834) 2021-06-08 17:23:44 +05:30
Deepesh Garg
6f2dacc60c Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-06 19:31:50 +05:30
Raffael Meyer
f6627550d1
fix: remove wrong tax_category 2021-06-02 15:17:00 +02:00
barredterra
3c748efae3 feat: add Item Tax Templates for german COAs "SKR03" and "SKR04" 2021-06-02 13:27:15 +02:00
barredterra
b6f27a4cae feat: set is_default for german tax templates 2021-06-02 13:20:33 +02:00
barredterra
f259bf48aa refactor: make tax category 2021-06-02 13:20:03 +02:00
barredterra
e3557ff131 Merge branch 'version-13-hotfix' into item-tax-templates 2021-06-02 12:17:27 +02:00
Deepesh Garg
7c7c084159 fix: Check for tax category 2021-06-02 14:12:28 +05:30
Deepesh Garg
ca34eec2d6 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup 2021-06-02 13:26:27 +05:30
Deepesh Garg
b3ed807b70 fix: Regional settings setup 2021-06-02 13:26:21 +05:30
Eben van Deventer
7f2ae23dbf
Correct South Africa VAT Rate 
On 1 April 2018 South Africa increased the VAT rate from 14% to 15%, this proposed change seeks to update the default parameters for a fresh ERPNext installation.
This was already done with a commit to version-13 branch under #25894, this proposed change is to ensure that the update is pulled through to future versions.
 2021-05-31 12:24:29 +02:00
Raffael Meyer
80540d38ba
fix: add_deduct_tax in Purchase Taxes setup (#25871) 2021-05-31 15:36:20 +05:30
Nabin Hait
a3d1b6973a fix: merge conflict 2021-05-31 11:21:33 +05:30
Deepesh Garg
48b1a82fa1 fix: Add accounts and templates for reverse charge 2021-05-29 23:54:51 +05:30
Raffael Meyer
6038663bf8
fix: add_deduct_tax in Purchase Taxes setup (#25757) 2021-05-28 16:29:28 +05:30
Suraj Shetty
113a6f3d80 fix: Use frappe.safe_eval instead of eval 2021-05-28 09:10:34 +05:30
Suraj Shetty
c26d41acf9 chore: Remove unnecessary print statements 2021-05-28 09:09:36 +05:30
Deepesh Garg
4311fdc3a1 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup 2021-05-27 17:49:23 +05:30
barredterra
50794407b4 feat: Item Tax Templates for Germany 2021-05-27 14:17:53 +02:00
barredterra
86ee3ebb09 feat: create tax category during taxes setup 2021-05-27 14:16:26 +02:00
barredterra
46d39d27aa fix: validate company in taxes setup 2021-05-27 14:16:01 +02:00
GangaManoj
e5ab5d8963 feat(Asset Repair): Create GL Entries 2021-05-25 21:26:40 +05:30
GangaManoj
11594f870e fix(Company): Add 'Repair and Maintenance Account' field 2021-05-25 21:26:38 +05:30
GangaManoj
88ac9b2ec9 fix(Company): Rename 'Fixed Asset Depreciation Settings' to 'Fixed Asset Deafults' 2021-05-25 21:26:38 +05:30
Ankush Menat
ff96bdf0c1
fix(ux): fix unstranslated text in msgprint/throw 2021-05-25 20:59:20 +05:30
Nabin Hait
db95db892c fix: merge conflict 2021-05-25 19:33:23 +05:30
Ganga Manoj
99636c6aca
fix: rearrange buttons for company doctype (#25617) 2021-05-25 19:17:01 +05:30
Deepesh Garg
79b422c0a9 fix: Advance TDS in TDS payable monthly report 2021-05-25 17:33:59 +05:30
Suraj Shetty
b14a935c5d Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing 2021-05-25 11:02:03 +05:30
Suraj Shetty
2f8a742aa8 refactor: Replace render imports 2021-05-25 10:28:32 +05:30
Saqib
dd5b31f8c4
fix: set disable rounded total if it is globally enabled (#25789) 2021-05-24 18:23:03 +05:30
Suraj Shetty
81d49e9c71 fix: Use extend_cscript function to properly extend class methods to cscript 2021-05-21 17:03:09 +05:30
Nabin Hait
8b2fef11b1 fix: merge conflict 2021-05-17 11:37:14 +05:30
Nabin Hait
e38192cb6d fix: merge conflict 2021-05-11 11:15:09 +05:30
Suraj Shetty
b76ebb3f4b fix: Use frappe.safe_eval instead of eval 2021-05-11 10:59:16 +05:30
Ganga Manoj
f2eb8dd1d5
feat: Transaction Deletion Record (#25354) 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-05-10 14:02:58 +05:30
Suraj Shetty
80aa8a3149 Merge branch 'develop' of github.com:frappe/erpnext into parallel-distributed-testing 2021-05-08 11:28:27 +05:30
Nabin Hait
7481f54e0c Merge branch 'version-13' into develop 2021-05-06 19:18:18 +05:30
Nabin Hait
0e41295c0e
perf: Performance enhancement on setup wizard (#25606) 
* perf: Performance enhancement on setup wizard

* fix: create departments without updating nsm
 2021-05-06 19:14:06 +05:30
Nabin Hait
134eaa5786
perf: Performance enhancement on setup wizard (#25605) 
* perf: Performance enhancement on setup wizard

* fix: create departments without updating nsm
 2021-05-06 19:13:54 +05:30
Suraj Shetty
c702408f99 chore: Remove unnecessary print statements 2021-05-06 18:37:45 +05:30
Suraj Shetty
ca37380d2e Merge branch 'develop' of github.com:frappe/erpnext into develop 2021-05-03 19:44:22 +05:30
Deepesh Garg
0ae702aab9 Merge branch 'develop' of https://github.com/frappe/erpnext into bootstraped_gst_setup 2021-05-02 22:37:04 +05:30
Deepesh Garg
1bac72b74d fix: Add GST accounts to GST Settings 2021-05-02 22:29:48 +05:30
Deepesh Garg
a66184fe3c fix: Remove redundant get_doc 2021-05-02 12:22:16 +05:30
Deepesh Garg
204ea1027f fix: Ignore validations for Tax Setup 2021-04-30 16:35:52 +05:30
Walstan Baptista
4a805b5622
chore: frappe.whitelist for doc methods (#25465) 2021-04-24 14:23:08 +05:30
Suraj Shetty
52ea6b126b Revert "fix: email digest user not found" 
This reverts commit 188657d05a.
 2021-04-23 14:14:47 +05:30
Deepesh Garg
50997709d5 fix: Update country-wise-tax JSON and tax setup 2021-04-21 20:41:57 +05:30
Deepesh Garg
2acc66db2c fix: Add tax categories on company setup 2021-04-21 11:49:02 +05:30
Deepesh Garg
3130ed52ff fix: Item Tax templates for GST 2021-04-20 23:23:07 +05:30
Deepesh Garg
e379f083bb feat(India): Separate Input and Output GST tax accounts 2021-04-20 23:04:39 +05:30
Rucha Mahabal
923fb008c7
fix: remove non-standard module cards from Home Workspace (#25391) 2021-04-19 21:09:47 +05:30
barredterra
80d44cada4 fix: remove is_default from country wise tax 2021-04-18 18:33:34 +02:00
barredterra
476fff149b Merge branch 'develop' into improve_taxes_setup 2021-04-17 18:41:31 +02:00
Ganga Manoj
c4565651ff
fix: Let Administrator delete company transactions (#25300) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-04-14 17:11:36 +05:30
Rohit Waghchaure
a8f78fabfd fix: patch failing while migrating from v7 to v13 2021-04-13 18:51:21 +05:30
Rohit Waghchaure
610ccd4c03 fix: modified permission 2021-04-13 18:51:21 +05:30
Rohit Waghchaure
03635fb0c4 feat: ESS User 2021-04-13 18:51:21 +05:30
Rushabh Mehta
65f25c27b3 fix(minor): fix dynamically changing grid properties 2021-04-13 11:58:16 +05:30
Anupam Kumar
9f73bd8040
fix: don't delete mode of payment account details while deleting company transactions (#25217) 2021-04-12 10:31:36 +05:30