Nabin Hait
ced6898fd7
fix: Ignored user permission for parent_company and existing_company field in Company
2020-03-26 12:30:29 +05:30
Deepesh Garg
fa6454b9c5
fix: Update is_tree field in Tree doctypes ( #20981 )
2020-03-19 11:01:23 +05:30
Nabin Hait
ddc3bb2251
fix: Multiple fixes for travis ( #20924 )
...
* fix: Multiple fixes for travis
* fix: Multiple fixes for travis
* fix: Run dashboard patch if table already exists
* fix: Multiple fixes for travis
* fix: deletion of auto-created batch
2020-03-17 17:04:18 +05:30
Deepesh Garg
d190cc0198
Merge pull request #20835 from Thunderbottom/welcome-email-fix
...
fix: use ERPNext in welcome email when default company is not set
2020-03-16 15:54:53 +05:30
Shivam Mishra
c06ba54f1e
refactor: remove website ( #20927 )
2020-03-12 18:04:42 +05:30
Shivam Mishra
f241054c6c
feat: extended settings page
2020-03-12 16:38:59 +05:30
Shivam Mishra
451382e08e
feat: update desk pages
2020-03-12 16:34:34 +05:30
Shivam Mishra
1fd1852c6a
Merge branch 'develop' into yet-another-desk
2020-03-10 18:20:27 +05:30
Marica
4528badfcf
fix: ModuleNotFoundError on Turkey Company setup ( #20853 )
2020-03-09 18:07:43 +05:30
Shivam Mishra
0310366d5a
fix (cleanup): remove incomplete dependencies data
2020-03-05 11:28:40 +05:30
Chinmay D. Pai
612e58dca8
fix: use ERPNext in welcome email when default company is not set
...
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-03-05 10:08:43 +05:30
Priyanka Gangar
ca05c83796
fix: fetch sales person name ( #20805 )
...
* fix: fetch sales person name
* Update sales_person.js
Co-authored-by: pinka0925 <44537026+pinka0925@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-03-02 19:06:06 +05:30
Shivam Mishra
8a8e8d6c5c
feat: added base pages for desk
2020-03-02 16:56:31 +05:30
Shivam Mishra
d20e36f3fd
feat: ignore permission when deleting linked emails ( #20751 )
...
* feat: ignore permission when deleting linked emails
* fix: uncommented important snippet
2020-02-27 19:07:58 +05:30
rohitwaghchaure
7d2c8cffb0
fix: pricing rule not working on item groups ( #20547 )
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2020-02-09 21:23:53 +05:30
Pranav Nachnekar
6c14a08631
fix: disallow quick entry for doctypes with tree view ( #20452 )
2020-02-03 17:05:26 +05:30
Suraj Shetty
2f67647f7b
Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations
2020-01-29 15:06:50 +05:30
Suraj Shetty
48e9bc3fc9
fix: Incorrect translation syntax
2020-01-29 15:06:18 +05:30
Deepesh Garg
cd8d667861
fix: Parent company defaulting on creation of new company ( #20422 )
...
* fix: Parent company defaulting on creation of new company
* fix: Test Cases
* fix: Test Cases
* fix: Test Cases for staffing plan
2020-01-28 12:54:45 +05:30
NahuelOperto
be1895fd08
Fix sql injection
2020-01-27 09:02:02 -03:00
Suraj Shetty
080d136fd7
fix: Improper escaping ( #20248 )
...
* fix: Improper escaping
issue was introduced in https://github.com/frappe/erpnext/pull/20202
* fix: missing closing parentheses
* style: trim unwanted spaces
Co-authored-by: Pranav Nachnekar <prnvnachnekar@gmail.com>
2020-01-14 12:55:03 +05:30
Pranav Nachnekar
229e5398b5
fix: escape % in customer name ( #20202 )
2020-01-09 12:21:26 +05:30
Saqib
c1b6b4ed35
fix: breadcrumb for company list ( #20051 )
2019-12-23 17:28:00 +05:30
Rucha Mahabal
0e83a5754b
fix: remove illustrations from onboarding slides ( #19872 )
...
* fix: remove illustrations from onboarding slides
* fix: change Welcome slide's description
* fix: justify text in slide
2019-12-23 08:24:46 +05:30
rohitwaghchaure
0dd7e77615
Merge pull request #19928 from 0Pranav/delete-company-txn-query
...
fix: replace sql with orm query for deleting company communications
2019-12-20 13:47:34 +05:30
0Pranav
e7aa20ebef
fix: replace sql query by orm in delete_communications and added tests
2019-12-18 11:16:54 +05:30
deepeshgarg007
94ff8058ac
fix: Add missing import
2019-12-14 21:25:30 +05:30
Deepesh Garg
6e2c13f4c8
feat(regional): Auto state wise taxation for GST India ( #19469 )
...
* feat(regional): Auto state wise taxation for GST India
* fix: Update gst category on addition of GSTIN
* fix: Codacy and travis fixes
* fix: Travis
* fix(test): Update GST category only if GSTIN field available
* fix: Test Cases
* fix: Do not skip accounts if place of supply is not present
* fix: Auto GST taxation for SEZ Party types
* fix: Automatic taxation for multi state
* fix: Codacy and travis fixes
* fix: Auto GST template selection in Sales Order
* fix: Move inter state check and source state to tax category
* fix: Remove unique check from tax template
* fix: Remove unique check from tax template
* fix: Address fetching logic in Sales
* fix: fecth tax template on company address change
* fix: fetch company gstin on address change
* fix: company_gstin set value fix
* fix: Mutiple fixes and code refactor
* fix: Add missing semicolon
* fix: Company address fetching in sales invoice
* fix: Remove print statement
* fix: Import functools
* fix: Naming fixes and code cleanup
* fix: Iteritems compatibility for python 3
2019-12-10 15:55:05 +05:30
Rucha Mahabal
690068142b
feat: Continue Slide and New Illustrations for Onboarding Wizard ( #19813 )
...
* feat: added illustrations for onboarding
* refactor: change help label for supplier
* refactor (breaking): rename Setup Wizard slide to Onboarding Slide
* chore: code cleanup for the old doctype Setup Wizard Slide
* fix: added a 'Continue' type slide
* fix: change text in continue slide
* fix: change text for continue slide
2019-12-06 20:58:26 +05:30
Rohit Waghchaure
d98ed8047a
fix: travis failing
2019-12-06 13:17:56 +05:30
Gavin D'souza
5e217c698f
Merge branch 'set-request-util' of github.com:gavindsouza/erpnext into set-request-util
2019-11-29 20:30:03 +05:30
Gavin D'souza
23b1dae6a7
chore: dropped dead setup_wizard test
...
fix: fixed imports for teste utils
2019-11-29 20:22:06 +05:30
Rucha Mahabal
58928e8eae
Merge branch 'develop' into setup_wizard
2019-11-27 11:55:53 +05:30
Rucha Mahabal
e2bb82872c
fix: moved slide json files to respective modules
2019-11-26 18:46:17 +05:30
Rucha Mahabal
00677f334e
fix: user progress code cleanup
2019-11-25 11:58:14 +05:30
Saqib
1919af2ff1
Fixed Asset Refactor Review fixes ( #19666 )
...
* fix: fixed asset item creation ux fixes
* fix: auto creation of asset ux fixes
* fix: [LCV] incorrect condition when checking assets linked with PR
* fix: bulk update assets
* refac: remove company level cwip enabling
* cwip can be enabled only on category level
* fix : #19649
2019-11-22 16:32:34 +05:30
Ben Knowles
49cd19d917
fix: update syntax error in company.js ( #19661 )
2019-11-22 11:36:02 +05:30
rohitwaghchaure
a85ddf2fb4
fix: performance issue of sales invoice while save/submit ( #19598 )
...
* fix: performace issue of sales invoice while save/submit
* Cached price list data, item group child data, added indexing for blanket order
2019-11-19 18:47:48 +05:30
Joseph Marie Alba
2578d49b84
Correct bug in abbr cause by missing " " separator ( #19605 )
...
Only 1 letter ABBR is generated after typing in a COMPANY NAME separated by spaces. This is due to missing " " value in split method.
For example:
Company Name: ABC Multiple Industries
Generates Abbr: A
Correct Abbr should be: AMI
This is caused by mission " " in split method.
2019-11-19 14:54:09 +05:30
Shivam Mishra
776ff2f75d
fix: query for item group listing ( #19604 )
2019-11-19 14:51:25 +05:30
rohitwaghchaure
94565d69d1
fix: travis failing ( #19568 )
2019-11-13 18:58:22 +05:30
rohitwaghchaure
ffbfaf7099
fix: email digest showing incorrect upcoming events ( #19552 )
2019-11-13 10:59:23 +05:30
Marica
d00c59830e
feat: Disable CWIP Accounting checkbox added in Company and Asset Category ( #19262 )
...
* feat: Disable CWIP Accounting checkbox added in Company and Asset Category
Asset Settings is removed completely
Disable CWIP Accounting checkbox will give priority to Asset Category
* fix: Changed checkbox name to 'Enable Capital Work in Progress Accounting'
- checkbox will be disabled by default
- Enabling it in Company will globally enable it
- When globally disabled , it's value on the asset category will be considered
* chore: Added patch to set pre-existing CWIP checkbox value into new checkbox
* fix(test): Asset
* fix: Asset Test and Patch
* fix(test): Opening Invoice Creation Tool
* Update asset.py
* fix: Patch and other fixes
2019-11-12 19:17:43 +05:30
Tufan Kaynak
06c6f7cfd3
fix: Currency Exchange for_selling and for_buying on the same day ( #19339 )
...
* fix: test data of Currency Exchange to incluse buying and selling
test data of Currency Exchange to incluse buying and selling
* fix: Currency Exchange Test corrected to include selling and buying exchange_rate
Currency Exchange Test corrected to include selling and buying exchange_rate
* fix: Currency Exchange for_selling and for_buying fields test and functionality restored
In this fix:
* You can now add a separate exchange_rate in date for_selling and for_buying. You could not before because the unique field name was only calculated to allow a single name for a date
* tests did not account for for_selling and for_buying fields and thier uniqueness
* Update test_currency_exchange.py
* Update test_records.json
* fix: update test_records.json
* Update test_records.json
* The basic package for turkey is defined. It is empty now but applications specific to Turkey will be created under that package.
* fix: update code with scapes vs.tabs
updated the code regarding spaces issue
* Update currency_exchange.py
2019-11-11 17:11:16 +05:30
Rohit Waghchaure
730c8a145d
minor: code cleanup
2019-11-05 12:46:52 +05:30
Anurag Mishra
a11e738801
feat: Stock value and account balance sync. ( #19233 )
...
* feat: Allow user to sync stock_value and account_balance jv if perpetual inventory is checked
* fix(test): Sales Invoice
* fix(test): Purchase Invoice
* fix(test): Delivery Note
* fix: more test_case
* fix(test): Stock Entry
* fix(test): Purchase Receipt
* fix(more-test): Stock Entries
* fix(more-test): Sales Invoice and Delivery Note
* fix: tests for delivery note
* fix: tests for stock reconciliation
* refactor: stock and account balance function
* fix(more-test): Warehouse
* fix(test): Landed Cost Voucher
* fix: changes requested
2019-10-31 15:55:03 +05:30
Rohit Waghchaure
88d2c97391
fix: default accounts are not added on creation of company
2019-10-28 17:50:31 +05:30
deepeshgarg007
799f8d4f93
Merge branch 'develop' of https://github.com/frappe/erpnext into demo-fixes
2019-10-23 08:47:11 +05:30
Abdulla P I
4f4e490d53
fix(HR):adding is_compensatory as default in setup ( #19307 )
2019-10-21 13:42:17 +05:30
deepeshgarg007
3db65ef7e8
fix: Demo Script
2019-10-15 19:16:45 +05:30
Rohit Waghchaure
66072fec5a
fixed conflicts
2019-10-15 14:18:59 +05:30
ashish-greycube
74dc3c99de
feat: coupon_code and referral_sales_partner functionality
2019-10-15 11:44:45 +05:30
Himanshu
2985cffc52
Merge branch 'develop' into global_search_modules
2019-10-02 16:36:19 +05:30
Himanshu
37f4316df0
Update setup_wizard.py
2019-09-30 16:02:24 +05:30
Himanshu
201bcaf2ca
fix(Company): Do not set default account if left blank ( #19131 )
...
* chore: use dict to set_default_account
* fix: dont override expense account if left empty
* fix: set accounts only if new company
* chore: fix alignment
* fix: test cases
2019-09-30 14:56:08 +05:30
Himanshu Warekar
21abc3aa50
fix: add doctypes for modules
2019-09-30 13:40:02 +05:30
Himanshu
83b0b2adec
feat(Global Search): Add fixtures for global search ( #19049 )
2019-09-27 00:59:48 +05:30
Suraj Shetty
627a3dcd6d
feat: Default energy point rules ( #19003 )
...
* feat: Add default energy point rules during install
* fix: Add completed_by field to task doctype
* fix: Rule data
* fix: Add default rules for opportunity
* fix: Add a patch to create default energy point rules
* fix: Default success action message
* fix: Use .items() instead of .iteritems()
* fix: Add "create_default_energy_points" patch entry
* fix: Reload Energy Point Rule to fix patch
* fix: Import frappe
2019-09-17 15:54:41 +05:30
Suraj Shetty
3b0ec48b0c
fix: Naming series check to avoid duplicate entry error ( #19015 )
...
* fix: Naming series check to avoid duplicate key error
* fix: Check for existence of naming series
2019-09-12 19:18:44 +05:30
Saurabh
e919388ee6
fix: do not cache value while creating item group, in setup wizard it will raise link validation error ( #18992 )
2019-09-11 10:07:50 +05:30
Shivam Mishra
e851346b4c
fix: dont make dashboards if company is not set ( #18975 )
...
* fix: dont make dashboardss if company is not set
* fix: function call
* Update dashboard_charts.py
2019-09-10 14:08:31 +05:30
Shivam Mishra
5f59c2ae75
fix: reload account timeline before creating dashboards ( #18934 )
...
* fix: sync account balance timeline.json before running patch
* fix: reload account timeline before creating dashboards
2019-09-09 13:20:53 +05:30
Saurabh
8e67a3a8a8
fix: check if 'All Item Group' exists before settings it as parent_item_group ( #18956 )
...
* fix: check if 'All Item Group' exists before settings it as parent_item_group
* feat: get cached value to avoid db call on each insert
2019-09-07 12:29:29 +05:30
Nabin Hait
4ce38059ac
feat: Company wise credit limit
2019-09-06 14:33:10 +05:30
Mangesh-Khairnar
cb44f3a7c3
fix(purchase-invoice): add rounded total property setter for purchase invoice ( #18841 )
2019-09-03 14:18:15 +05:30
Suraj Shetty
063144c514
fix: Check in_patch before adding 'All Item Group'
2019-09-02 15:53:28 +05:30
Deepesh Garg
e26b55265f
Merge pull request #18840 from netchampfaris/missing-parent-item-group
...
fix: Set default Parent Item Group
2019-09-02 12:22:49 +05:30
Shivam Mishra
0aeccbf4b2
feat: added dashboard fixtures ( #18812 )
...
* feat: add dashboard charts fixture
* fix: remove return statement
* feat: added patch for creating default dashboards
* chore: renamed dashboard charts
* feat: add add_dashboard function to install fixtures
* fix: reload doctype issue in patches
* fix (travis): reloaded dashboard chart source
* fix (travis): reloaded dashboard chart source
* fix (travis): reloaded dashboard doctype
* fix (travis): reloaded dashboard chart link doctype
2019-08-28 11:39:45 +05:30
Faris Ansari
8ac2a2f0c4
fix: Set default Parent Item Group
2019-08-26 13:00:17 +05:30
Deepesh Garg
5a7f26f4d2
Merge pull request #18717 from Anurag810/company_fix
...
fix: removed hard coded string form company
2019-08-14 12:11:33 +05:30
Anurag Mishra
81d5265385
fix: removed hard coded string
2019-08-13 19:40:36 +05:30
Andrew McLeod
677c522f01
fix: Python3 urllib use in item_group.py (now uses six.moves) ( #18642 )
2019-08-12 12:06:23 +05:30
Rucha Mahabal
4865eabee5
fix: add Company by default in session defaults ( #18460 )
2019-07-24 13:37:54 +05:30
Faris Ansari
06c7a7e660
fix(website): Remove references to Product Settings.products_a… ( #18451 )
...
This was accidentally added back in 34c551d9a5 (diff-f0a387cdb305471e74e523ecc4e646ac)
2019-07-23 13:40:40 +05:30
karthikeyan5
7fc6021ca5
feat(setup): adding selling buying filter in terms and conditions
2019-07-04 22:46:16 +05:30
Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch ( #17997 )
...
* fix: merge conflict
* fix: restored missing set_gst_state_and_state_number function
* fix: style linting as per codacy
* fix: Fixes related to customer/lead merging
* fix: merge conflict
* fix: Fixes related to customer/lead merging
* fix: Assign isue/opportunity to user
* fix: Assign isue/opportunity to user
* fix: Replaced Invoice type by GST Category
* fix: merge conflict
* fix: merge conflict
* fix: test cases
* fix: test cases
2019-07-03 10:34:31 +05:30
Himanshu Warekar
7c18f69727
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
2019-06-17 23:53:01 +05:30
Himanshu Warekar
b9ddcc4bfa
Merge develop into sla_fix
2019-06-15 13:09:57 +05:30
Anurag Mishra
a5527225b6
fix: requested changes
2019-06-14 15:26:19 +05:30
Anurag Mishra
88cd502841
fix: company form ( #17939 )
2019-06-14 11:26:29 +05:30
Himanshu Warekar
0674d16fee
feat: sla based on customer/group/territory
2019-06-07 15:28:42 +05:30
Himanshu Warekar
db1d1197ea
feat: add fixtures
2019-06-06 14:17:07 +05:30
Nabin Hait
f1cde0ccf6
fix: Allowed '{' and '}' in naming series
2019-05-29 13:44:03 +05:30
Nabin Hait
6211e7343c
Merge branch 'develop' into po-status-updater-dev-1
2019-05-27 11:50:29 +05:30
Rushabh Mehta
2d7993592f
Merge pull request #17703 from rmehta/yeah-form-js
...
refactor: deprecate old API as per https://github.com/frappe/frappe/pull/7537
2019-05-24 11:36:16 +05:30
Rushabh Mehta
04e89ce808
refactor: deprecate old API
2019-05-22 16:52:36 +05:30
Nabin Hait
5ee08620cb
Merge branch 'develop' into po-status-updater-dev-1
2019-05-22 15:05:08 +05:30
Nabin Hait
d752051b8d
fix: update received qty in PO from PR
2019-05-22 11:59:19 +05:30
Rohit Waghchaure
6358370735
fix: item group not disaplying in the website if shopping cart is disabled
2019-05-21 10:53:39 +05:30
Nabin Hait
6b9d64ce1d
refator: Payroll processing and tax calculation ( #17617 )
...
* refactor: Payroll processing and tax calculation
* fix: payroll test cases
* fix: Codacy fixes
* fix: payroll test cases
* fix: removed unwanted code
2019-05-16 11:23:04 +05:30
Faris Ansari
ec7b064528
fix: Clear messages during setup fixtures
2019-05-14 16:21:09 +05:30
Nabin Hait
00e9659e3f
Merge pull request #17195 from asbasawaraj/fixed_account_ranme_when_company_abbr_is_updated
...
Fixed Company Abbr Update Was Not Able To Update Account
2019-04-16 12:51:13 +05:30
Nabin Hait
89206e74d0
fixed merge conflict
2019-04-11 12:31:14 +05:30
Basawaraj Savalagi
05458b7fc6
Fixed Company Abbr Update Was Not Able To Update Account
2019-04-10 13:33:43 +05:30
Nabin Hait
b305f38869
fix: Made employee optional in sales person
2019-04-09 20:06:11 +05:30
Faris Ansari
7a0a05d8f1
fix(Item Group): Don't clean description html
2019-04-04 15:53:16 +05:30
asbasawaraj
d2b69445b1
Removed Location from Abbreviation Update DocTypes
2019-04-03 17:05:53 +05:30
Rushabh Mehta
c4599c21c3
fix(test): item variant
2019-03-29 18:30:00 +05:30
Rushabh Mehta
048e5f44b5
fix(test): item variant
2019-03-29 14:34:14 +05:30
Saurabh
84a18f5b18
Merge branch 'master' into develop
2019-03-28 13:54:34 +05:30
deepeshgarg007
3eeb1cacb0
fix: Change name to Allow Account Creation against Child Company in company master
2019-03-26 17:18:06 +05:30
Rohit Waghchaure
5816fc2801
Renamed subcontract to Send to Subcontractor
2019-03-26 12:52:49 +05:30
Rohit Waghchaure
ffbeb02428
renamed purpose in stock entry
2019-03-26 12:52:32 +05:30
Rohit Waghchaure
c7b916ac46
fix: test cases
2019-03-26 12:52:32 +05:30
Rohit Waghchaure
4389cf0c48
feat: provision to make Maintenance Schedule from sales invoice
2019-03-26 12:52:32 +05:30
Rohit Waghchaure
1f2f9cf360
feat: added stock entry type master to select purpose in the stock entry
2019-03-26 12:52:31 +05:30
Rohit Waghchaure
4ae221946b
renamed report
2019-03-26 11:14:06 +05:30
deepeshgarg007
1c785a99b1
fix: Added setting in company to ignore root company validation
2019-03-25 22:32:29 +05:30
Rohit Waghchaure
1c1d0bb1c7
feat: commonified item group wise target variance report
2019-03-25 17:56:43 +05:30
Zarrar
963d62b701
feat: Chart of Accounts Importer ( #16623 )
...
* bare doctype created for COA utility
* improvise doctype's design
* validation to check no transaction exist for the company
* download file and import coa - client side logic added
* download csv template to create custom chart
* read the custom csv uploaded and parse it to appropriate format
* convert list of list to nested tree structure
* preview the uploaded chart before actual import
* toggle field based on necessity
* tweak create_charts and build_json logic to incorporate COA Import utility
* code cleanify and validation call added
* code enhancement for flexibility and validation added
* show import button only if data is validated
* unset existing data and load new accounts
* disable coa fields if parent_company set, minor improv
* file api fix
* added progress bar
* codacy fixes
* fix: Add account number in template
* fix: TDS account exception handling fix
2019-03-23 10:30:12 +05:30
Rushabh Mehta
9c43c8f00b
Merge pull request #16554 from SaiFi0102/Brand-Item-Defaults-V12
...
feat: Brand Item Defaults (v12)
2019-03-22 12:46:04 +05:30
Saurabh
3c95387926
Merge branch 'master' into develop
2019-03-20 14:39:49 +05:30
Faris Ansari
5f8b358fd4
Website: Product Configurator and Bootstrap 4 ( #15965 )
...
- Refactored Homepage with customisable Hero Section
- New Homepage Section to add content on Homepage as cards or using Custom HTML
- Products page at "/all-products" with customisable filters
- Item Configure dialog to find an Item Variant filtered by attribute values
- Contact Us dialog on Item page
- Customisable Item page content using the Website Content field
2019-03-19 11:48:32 +05:30
Rohit Waghchaure
d4e4316d0b
fix: test cases and codacy
2019-03-18 14:18:49 +05:30
Zlash65
11bba571af
test case added to check account syncing
2019-03-18 12:50:29 +05:30
Zlash65
cc65447e62
fix: chart of accounts field toggling improv
2019-03-18 12:50:29 +05:30
Zlash65
73acb8c837
fix: set chart of accounts based on parent company on server side
2019-03-18 12:50:28 +05:30
Zlash65
88c990901d
fix: added validation to if account is being added to child company
2019-03-18 12:50:28 +05:30
Zlash65
a57d58f756
feat: once company is saved, parent_company cannot be selected
2019-03-18 12:50:27 +05:30
Zlash65
1a4bfdd090
feat: selecting parent_company should disable chart_of_accounts based fields
2019-03-18 12:50:27 +05:30
Saif Ur Rehman
e62bd893c5
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12
...
# Conflicts:
# erpnext/stock/doctype/item/test_item.py
2019-03-08 01:29:39 +05:00
bcornwellmott
b263876918
Add date to currency exchange caching
...
The current currency exchange caching does not keep track of the transaction date, so if you are backdating transactions, the system probably isn't pulling the correct exchange rate (if it's looking up the currency exchange rate on the fly)
2019-03-05 16:44:02 -08:00
Saurabh
3dd7ddd838
Merge branch 'master' into develop
2019-02-21 18:25:29 +05:30
Rohit Waghchaure
f4049f9dfd
fix: user progress issue
2019-02-19 19:46:14 +05:30
Sagar Vora
cc6e51c62d
Merge branch 'master' into develop
2019-02-19 18:09:49 +05:30
Gaurav
f1e28e0e8d
mod(regional,italy): Updates to Italian Localization
...
fixes:
removed cleanup_files from italy/utils
removed extract_doc_number from italy/utils
added country filter to italian localization patch
replaced dict assignment with dot operator in prepare_invoice
correcions in e-invoice xml following changes in prepare_invoice
added setup_report in patch
added section for e-invoicing custom fields in company
added Italy in test_company
2019-02-19 10:39:22 +05:30
Rushabh Mehta
20db65ef77
Merge pull request #16694 from rmehta/refactor-comments
...
fix: refactored comments API. Depends on https://github.com/frappe/frappe/pull/6891
2019-02-18 12:05:35 +05:30
Prateeksha Singh
08a6de6b41
fix(modules): shorten descriptions
2019-02-12 07:41:52 +05:30
Rushabh Mehta
c8018bdeb1
fix: refactored comments API. Depends on https://github.com/frappe/frappe/pull/6891
2019-02-09 21:10:29 +05:30
Saif Ur Rehman
590491779a
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12
...
# Conflicts:
# erpnext/stock/doctype/item/item.py
2019-02-02 02:49:04 +05:00
Saif Ur Rehman
00aaa48779
test(Item): test_item_defaults
2019-02-02 02:43:44 +05:00
Saif Ur Rehman
1a441b267d
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/patches.txt
2019-02-01 19:17:04 +05:00
Saif Ur Rehman
c8b61007b0
Merge branch 'master' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults
...
# Conflicts:
# erpnext/setup/doctype/brand/brand.json
# erpnext/stock/get_item_details.py
2019-02-01 17:05:46 +05:00
Sagar Vora
56cbfe4bb0
Merge branch 'master' into develop
2019-01-31 13:34:32 +05:30
Sagar Vora
76728b87ab
fix: value missing for selling settings - sales_update_frequency ( #16530 )
2019-01-31 08:19:38 +05:30
Saurabh
a342138625
Merge branch 'master' into develop
2019-01-30 12:38:58 +05:30
rohitwaghchaure
25e63e806c
fix: modified date ( #16520 )
2019-01-30 11:46:34 +05:30
Sagar Vora
f97c5dad82
Merge branch 'staging' into develop
2019-01-29 18:39:14 +05:30
Nabin Hait
1467962f8a
Merge pull request #16490 from nabinhait/gst_settings_perm
...
GST Settings permission and regional taxes creation
2019-01-29 11:27:18 +05:30
Nabin Hait
3ccc16e4e0
Merge pull request #16449 from scmmishra/remove-foundation
...
feat: Deprecated In App Help
2019-01-29 11:20:23 +05:30
Nabin Hait
e8190473f5
Merge branch 'staging-fixes' into unicode
2019-01-29 11:13:04 +05:30
scmmishra
3f9b231f31
[fix] Links now redirect to erpnext.com
2019-01-25 12:56:27 +05:30
Nabin Hait
f05d91d317
Merge branch 'develop' into Item-Tax-Template-V12
2019-01-25 11:26:47 +05:30
Nabin Hait
596c1b3489
Merge pull request #16220 from SaiFi0102/Party-Ledger-Summary
...
feat: Party Ledger Summary Report
2019-01-25 11:22:55 +05:30
Nabin Hait
ddc65dfb87
fix: delete taxes and charges template while deleting company
2019-01-25 11:04:14 +05:30
Nabin Hait
2a1aedfff1
fix(setup): Create regional taxes on creation on company
2019-01-24 17:56:19 +05:30
Faris Ansari
badf1c42e0
chore: Add error logging for failed get_exchange_rate call
2019-01-24 16:28:53 +05:30
deepeshgarg007
0c38cf06a5
fix: Wrong argument fix in email digest filters
2019-01-23 19:11:24 +05:30
Aditya Hase
f3c22f342c
fix(unicode): Import unicode_literals in every file
2019-01-22 18:36:10 +05:30
Saif Ur Rehman
74a3370095
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/buying/doctype/purchase_order/purchase_order.json
# erpnext/patches.txt
# erpnext/selling/doctype/quotation/quotation.json
# erpnext/selling/doctype/sales_order/sales_order.json
2019-01-22 16:20:40 +05:00
Sagar Vora
4d1a9b10ed
Merge branch 'staging' into develop
2019-01-22 15:56:39 +05:30
Nabin Hait
f0ea152022
Merge pull request #16289 from Anurag810/Quality-inspection-fix
...
fix: validated quality inspection for delivery note(DN) and purchase receipt(PR)
2019-01-22 10:49:55 +05:30
Nabin Hait
a39f324682
fix: Disable rounded total field's value honours docfield's default value
2019-01-21 18:50:50 +05:30
deepeshgarg007
3565395e7a
Merge branch 'email_digest' of https://github.com/deepeshgarg007/erpnext into email_digest
2019-01-21 15:03:51 +05:30
deepeshgarg007
aab6d0e028
fix(email_digest): Linkes annual income and annual expense to profit and loss statement
2019-01-21 15:01:40 +05:30
Deepesh Garg
f7fe08c487
Merge branch 'develop' into email_digest
2019-01-20 16:53:41 +05:30
Saif Ur Rehman
fcaed12a53
Merge branch 'Party-Ledger-Summary' of https://saifi0102@github.com/SaiFi0102/erpnext.git into Party-Ledger-Summary
2019-01-19 13:18:23 +05:00
Saif Ur Rehman
398f593e5f
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/patches.txt
2019-01-18 17:33:19 +05:00
deepeshgarg007
3c9dd73f91
Added company filters for reports
2019-01-18 11:29:37 +05:30
Nabin Hait
bef2c22d23
Fix: merge conflict
2019-01-18 10:15:47 +05:30
deepeshgarg007
00f989a916
fix(email_digest): fix in account heads
2019-01-17 17:59:52 +05:30
deepeshgarg007
753c5d7514
fix(Codacy): Possible Sql injections
2019-01-17 12:28:56 +05:30
deepeshgarg007
f8bbcc56b7
refactor(email_digest): Fixes in email digest links and reports
2019-01-16 22:22:48 +05:30
Nabin Hait
983d102a19
Merge branch 'staging-fixes' into Quality-inspection-fix
2019-01-16 17:52:30 +05:30
Nabin Hait
29552c1ec4
Merge pull request #16304 from netchampfaris/fix-item-group-pagination
...
fix(website): Pagination in child item groups
2019-01-16 10:31:48 +05:30
Saif Ur Rehman
f86123ad5a
feat(Party Ledger Summary): Include columns for discount and other adjustments
2019-01-15 15:18:43 +05:00
Saurabh
68ea608ca8
fix: import unicode_literals
2019-01-15 14:47:32 +05:30
Nabin Hait
187bdf08a6
Merge pull request #16319 from SaiFi0102/Gross-Profit-Exclude-Opening-Invoice
...
fix: Exclude Opening Invoice from Gross Profit Report and Company Dashboard Chart
2019-01-10 10:55:41 +05:30
Saif Ur Rehman
8d61794540
Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/patches.txt
# erpnext/stock/doctype/item/item.json
2019-01-10 04:23:40 +05:00
deepeshgarg007
8621869d24
Created multiple reports and linked them to email digest
2019-01-09 21:56:45 +05:30
deepeshgarg007
2b47d39274
feat: Links for reports in email digest
2019-01-09 21:54:40 +05:30
Saif Ur Rehman
091cfba5fc
test: Added test for get_item_tax_template and get_item_tax_map
2019-01-09 11:24:30 +05:00
Saurabh
afec3ca89a
Merge branch 'staging' into develop
2019-01-08 17:09:36 +05:30
Saif Ur Rehman
380b4b0926
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template
...
# Conflicts:
# erpnext/accounts/doctype/accounts_settings/accounts_settings.json
# erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
# erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
# erpnext/accounts/doctype/sales_invoice/sales_invoice.json
# erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
# erpnext/buying/doctype/purchase_order/purchase_order.json
# erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
# erpnext/buying/doctype/supplier/supplier.json
# erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
# erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
# erpnext/selling/doctype/quotation/quotation.json
# erpnext/selling/doctype/quotation_item/quotation_item.json
# erpnext/selling/doctype/sales_order/sales_order.json
# erpnext/selling/doctype/sales_order_item/sales_order_item.json
# erpnext/setup/doctype/item_group/item_group.json
# erpnext/stock/doctype/delivery_note/delivery_note.json
# erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
# erpnext/stock/doctype/item/item.json
# erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
2019-01-08 13:41:46 +05:00
Saif
e5091cbc0f
chore: Updated DocType JSON Files to Clean Up Git Diff of Other PRs ( #16356 )
...
* chore: Updated DocType json files to clean up git diff of other PRs
* fix: remove auto-generated file
2019-01-07 18:19:30 +05:30
Saif Ur Rehman
e194a655df
fix: is_opening != 'Yes'
2019-01-02 16:09:34 +05:00
Anurag Mishra
0c8411d085
test cases sucess
2018-12-28 16:53:00 +05:30
Faris Ansari
af75d9a384
fix(website): Pagination in child item groups
...
Item groups pages which had child item groups were not paged at all
despite having next, prev buttons
2018-12-28 14:47:51 +05:30
Saif Ur Rehman
07acc2bf5a
Allow brand in quick entry
2018-12-27 23:10:20 +05:00
Saif Ur Rehman
c819ea38a0
-Added Item Default child table for Brand
...
-Item Default Precedence: Get defaults from Item Group, if no default, fetch from Brand
-Remove auto set Item's Item Defaults from Item Group: Item Default should be manually entered to override both Item Group and Brand defaults
2018-12-27 23:01:54 +05:00
Suraj Shetty
146be9f6a6
Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes
2018-12-24 16:08:43 +05:30
Suraj Shetty
b2965001d1
Replace 'Make' with 'Create'
2018-12-23 13:25:58 +05:30
Saif Ur Rehman
8ac261750b
Add and Modified DocTypes for Item Tax Template
2018-12-22 02:51:59 +05:00
Saurabh
e165fc0e1b
Merge branch 'staging' into develop
2018-12-13 10:45:32 +05:30
Prateeksha Singh
4ba9594b04
[setup] domain not in array
2018-12-12 22:09:00 +05:30
Prateeksha Singh
9c5676292c
[setup] add defaults stage
2018-12-12 21:29:55 +05:30
Prateeksha Singh
58db3c1c7c
[setup] fix install_defaults
2018-12-12 21:29:55 +05:30
Prateeksha Singh
0e728972e9
[setup][minor] remove unused import
2018-12-12 21:29:55 +05:30
Prateeksha Singh
d59b61cbd9
[fixtures] re-add market_segments and sales_stages utils
2018-12-12 21:29:55 +05:30
Prateeksha Singh
4da8dced94
[setup] remove unused imports
2018-12-12 21:29:55 +05:30
Prateeksha Singh
b274f8cb2a
[fix] setup chart of accounts
2018-12-12 21:29:55 +05:30
Prateeksha Singh
47118ab72a
[setup] remove redundant code
...
- [fix] domain setup from dictionary
2018-12-12 21:29:55 +05:30
Prateeksha Singh
9282e08099
[fix] >.< call setup_taxes
2018-12-12 21:29:55 +05:30
Prateeksha Singh
c3a49b9cad
[fix] set default_bank_account in company
2018-12-12 21:29:55 +05:30
Prateeksha Singh
1aee75aadc
[setup] separate out setup_company
2018-12-12 21:29:55 +05:30
Prateeksha Singh
8469b27c3a
[setup] add get_country_and_charts()
2018-12-12 21:29:55 +05:30
Prateeksha Singh
aeb8abf1ed
[setup] add market segments and sales stages
2018-12-12 21:29:55 +05:30
Prateeksha Singh
6f7233229e
[setup][fix] company fixtures
2018-12-12 21:29:55 +05:30
Prateeksha Singh
6bf22fa7d7
[setup][fix] get newly created root Territory for children
2018-12-12 21:29:55 +05:30
Prateeksha Singh
c1c057611e
[setup] bundle up fixtures and setup docs
2018-12-12 21:29:54 +05:30