Commit Graph

577 Commits

Author SHA1 Message Date
Suraj Shetty
c702408f99 chore: Remove unnecessary print statements 2021-05-06 18:37:45 +05:30
Ankush Menat
dedf2c1b61
fix: remove duplicate keys from dictionaries 2021-04-17 16:56:08 +05:30
Deepesh Garg
b717420842
fix: Role to override maintain same rate check in transactions (#25193)
* feat: configurable action if the same purchase/selling rate is not maintained

* fix: Role to override maintain same rate check in transactions

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-04-14 10:43:45 +05:30
Nabin Hait
10c61376e3
fix: Backport missing commits to develop branch (#25305) 2021-04-13 15:46:01 +05:30
Shivam Mishra
2fa3cac814 feat: update workspace folders 2020-12-03 15:48:57 +05:30
Shivam Mishra
2895645f86 feat: rename desk page to workspace 2020-12-03 15:39:53 +05:30
Shivam Mishra
9aaca25edb feat: update desk page json 2020-12-01 13:39:54 +05:30
Shivam Mishra
de68f74b4c chore: update all desk pages 2020-12-01 12:51:38 +05:30
Shivam Mishra
27e7c264f2 fix: link type 2020-11-30 14:58:16 +05:30
Shivam Mishra
61388d412b feat: update desk pages 2020-11-30 14:58:00 +05:30
Rushabh Mehta
542bc01718 fix(minor): update routes 2020-11-18 15:00:34 +05:30
Deepesh Garg
8859b71956
fix: Check for backdated validation only for transaction company (#23639)
* fix: Check SLE only for transaction company

* fix: Add tests

* fix: Move backdated entry validation from transaction base to stock ledger entry

* chore: Add tests

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-19 16:56:45 +05:30
Saqib Ansari
3d91d48b77 fix: validate only for stock transactions 2020-10-10 21:56:50 +05:30
Saqib Ansari
776d8f72cf chore: do not allow future transactions 2020-10-09 15:36:11 +05:30
marination
6087fcaa9b chore: Added video settings to List View Menu 2020-09-22 17:48:04 +05:30
gavin
d935b2753f
Merge branch 'develop' into youtube-analytics 2020-09-22 15:36:00 +05:30
Abhishek Balam
123eaea1a6 fix: added new doctypes in get_level 2020-09-18 16:35:59 +05:30
marination
37b99d202d fix: Separate function to get bulk and single youtube stats 2020-09-10 18:27:20 +05:30
marination
799d663398 fix: Make set_youtube_statistics reusable and job logic fix
- Make sure job runs only once every hour
- set_youtube_statistics should be usable in and outside class
2020-09-10 16:42:20 +05:30
Gavin D'souza
71ac399369 fix: Commonified function and updated scheduler events
Co-authored-by: marination <maricadsouza221197@gmail.com>
2020-09-10 13:58:48 +05:30
Gavin D'souza
0a0e258d8b feat: Add Desk Page for Utilities for Video group 2020-09-10 13:12:35 +05:30
marination
53cd60c217 fix: Patch reload doctype 2020-09-09 20:57:10 +05:30
marination
f18dd05c00 fix: Missing import and typo 2020-09-07 18:59:57 +05:30
Marica
54ab426c1c
Merge branch 'develop' into youtube-analytics 2020-09-07 18:54:11 +05:30
marination
06ee0ea00b feat: Added Scheduler Job to auto update statistics
- Added frequency in Video Settings
- Cron job to check half hourly job
- Hourly job to run job based on frequency
- Patch to set youtube id in video for ease in computing
2020-09-07 18:49:06 +05:30
marination
9ce38de439 chore: Key Validation and restructure
- Added API Key validation in Video Settings
- Moved Statistics section above description in Video
- Moved id retrieving from URL to py side
- Removed js side calls, added section toggling in js
- Restructured Code
2020-09-07 13:27:17 +05:30
kasgel
a59f8640d1
fix: pass stock_qty to get_pricing_rule_for_item
get_pricing_rule_for_item uses the "stock_qty" and "qty" arguments to filter pricing rules.
Not passing stock_qty prevents for example the shopping cart from filtering pricing rules appropriately based on Quantity.
2020-09-05 12:15:49 +02:00
marination
e3495116dd chore: Error Logging and exception hnadling on connection failure 2020-08-02 17:13:34 +05:30
marination
c16ace6732 fix: Codacy 2020-08-02 16:43:15 +05:30
marination
ccf4ab9f85 chore: Added Interactions Report and behaviour fixes
- Youtube Interactions Report with Chart and Summary
- Statistics change in doc on refresh and get updated in db as well
2020-08-02 16:26:36 +05:30
marination
d4817c8685 feat: Track Youtube interactions via Video DocType 2020-08-02 05:35:45 +05:30
Rucha Mahabal
ffbd7b4087 fix: move Video DocType from Core to Utilities module 2020-07-21 19:40:18 +05:30
Marica
eee12fbcb4
fix: Remove redundant variable declaration (#22641) 2020-07-10 12:34:59 +05:30
Marica
5f299a08bd
fix: General Message in previous doc validation for buying and selling (#22546) 2020-07-06 18:26:56 +05:30
Deepesh Garg
5dc175f068
fix(Immutable Ledger): Item wise backdated stock entry posting (#22366)
* fix(Immutable Ledger): Item wise backdated stock entry posting

* fix: Remove fiscal year query

* fix: Update message string
2020-06-22 19:05:39 +05:30
Deepesh Garg
873542bc7f
fix: Do not allow backdated stock transactions in previous fiscal year (#21967) 2020-05-27 20:26:38 +05:30
Deepesh Garg
2a9c5badc6
feat: Immutable ledger (#18740)
* fix: Reverse GL entry on cancellation of document

* fix: Removed set posting time field for multiple docs

* fix: Stop future reposting and reverse entry for purchase receipt and delivery note

* fix: Change is_cancelled field from select to check

* Revert "fix: Removed set posting time field for multiple docs"

This reverts commit 81fb808db7da69ab1e58ba226c0cd0b77e5b90c8.

* fix: Multiple fixes in GL Entry

* fix: Remove future reporting from doctypes

* fix: Canceled entry filters in Stock Ledger and General Ledger Report

* fix: Remove print statement

* fix: Validation for back dated entries

* fix: Codacy fixes

* fix: Add ignore links to multiple doctypes

* fix: Codacy Fixes

* fix: Ignore GL Entry and Stock Ledger entry while cancel

* fix: Test case fixes

* fix: Patch

* fix: Codacy

* fix: Budget Test Cases

* fix: Patch

* fix: Patch

* fix: Multiple test cases

* fix: changes in make_reverse_entry function

* fix: Update patch

* fix: Test Cases

* fix: Test Case fixes

* fix: Move patch upward in patches.txt

* fix: Budget Test Cases

* fix: Test Case and codacy

* fix: Patch

* fix: Minor label and UX fixes

* fix: Move freezing date check

* fix: Test Cases

* fix: Test cases

* fix: Test Cases

* fix: Test Case

* fix: Remove update_gl_entries_after function

* fix: Remove update_gl_entries_after function

* fix: Test Cases

* fix: Fiscal Year wise backdated entry

* fix: Update entries only for current SLE

* fix: Remove is_cancelled

* fix: Test Cases

* fix: Test cases

* fix: Test Cases

* fix: Uncomment account and stock balance sync logic

* fix: Stock balance and Account balance out of sync fixes

* fix: Test Cases

* fix: Test cases for POS, Stock Reco and Purchase Receipt

* fix: Stock Reco tests

* fix: Test stock reco precision

* fix: Test stock reco for fifo precision

* fix: Test stock reco for fifo precision

* fix: Stock Entry test case

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-30 10:38:58 +05:30
Marica
9ea1ad4051
fix: Re-order Item Error Email format (#21342)
* fix: Re-order Item Error Email format

* fix: Translated strings
2020-04-21 12:52:29 +05:30
Deepesh Garg
9062ce5191
fix: Spacing and indentations 2020-03-26 11:56:03 +05:30
Anupam K
10b7a51805 Better error message 2020-03-25 18:21:42 +05:30
Anupam K
b14085eb0e Better error message 2020-03-24 12:17:28 +05:30
Anupam K
95e35f9e81 Better error message 2020-03-24 11:52:34 +05:30
Saqib
56837bc09d
fix: check for available stock in product bundle's website warehouse (#20681) 2020-02-20 12:23:08 +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
Marica
40dffab79e fix: Product Page non-stock item status (#20383) 2020-01-24 15:52:27 +05:30
Rohan
7c8aaba449 fix: integer UOM check in transactions (#20176) 2020-01-07 11:23:53 +05:30
Rucha Mahabal
3f8c460584 feat: moved slide action functions from onboarding utils to doctypes 2019-11-26 15:22:45 +05:30
Rucha Mahabal
7728ae6988 fix: added company letter head slide 2019-11-25 13:23:53 +05:30
Rucha Mahabal
00677f334e fix: user progress code cleanup 2019-11-25 11:58:14 +05:30