Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,165 Commits 3 Branches 0 Tags 1 GiB
77c36f6d22
Commit Graph

605 Commits

Author SHA1 Message Date
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
Rucha Mahabal
3cf2c2b3d5 feat: slides for onboarding wizard in ERPNext 2019-11-21 20:47:08 +05:30
Kenneth Sequeira
c269c68727 fix: allow read-only on new address form (#19304) 2019-10-15 16:34:55 +05:30
prssanna
3bd15d3aaa feat: remove leaderboard from erpnext 2019-09-24 13:06:31 +05:30
Mangesh-Khairnar
9955b189e4 fix: leaderboard chart 2019-07-01 12:20:09 +05:30
Sahil Khan
73e281d339 feat(sync_site): return more data in level 2019-05-09 14:32:15 +05:30
Sagar Vora
f97c5dad82 Merge branch 'staging' into develop 2019-01-29 18:39:14 +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
scmmishra
3f9b231f31 [fix] Links now redirect to erpnext.com 2019-01-25 12:56:27 +05:30
Aditya Hase
f3c22f342c fix(unicode): Import unicode_literals in every file 2019-01-22 18:36:10 +05:30
Frappe Bot
fdd5d54d41 Merge branch 'staging' into develop 2019-01-05 09:11:15 +00:00
Rohit Waghchaure
8f62aec2e3 [Fix] Not able to delete department 2019-01-01 14:06:40 +05:30
Suraj Shetty
b2965001d1 Replace 'Make' with 'Create' 2018-12-23 13:25:58 +05:30
Britlog
7d9689cc92 [Fix] Website Conversion factor query (#15866) 
* [Fix] Conversion factor query

* Update product.py
 2018-11-13 11:36:41 +05:30
Charles-Henri Decultot
64b6421fce Add event in transaction base correction (#15631) 2018-10-11 16:54:26 +05:30
Shreya Shah
a5add289bb Refactor Naming Series (#15070) 
* Patch to create Property Setter for existing naming series

* Update existing naming series options with new

* Add patch link to patches.txt

* Update patch

* Fix codacy

* Fix as per suggestions

* Remove old patch for property setter

* Improve as per suggested

- Modified the naming
- Also refactored naming for doctypes having autoname with series
- Added a patch to make property setter for autoname

* Fix Travis

* Rebase with develop
 2018-08-28 13:44:48 +05:30
Himanshu Mishra
859d942b22 Cached calls (#15109) 
* [optimize]: bin updates

* [optimise]: use frappe.get_cached_value instead of get_value for item

* [fix]: change db.get_cached_value to get_cached_value
 2018-08-08 18:33:50 +05:30
Rushabh Mehta
708e47aadf optimize(various) 2018-08-08 16:37:31 +05:30
Charles-Henri Decultot
614959d5f8 Correction of the get_price method for pricing rules (#15082) 
* Addition of currency arg in get_price

* Change Price to Rate
 2018-08-06 14:42:04 +05:30
Saurabh
0eb622f7da [fix] resolve conflicts 2018-05-31 17:32:17 +05:30
Rohit Waghchaure
06f91e2dc1 [Fix] Translation issue in leaderboard 2018-05-28 14:43:17 +05:30
Prateeksha Singh
b434f2687e [charts] update, without new build system 2018-05-21 18:04:50 +05:30
rohitwaghchaure
eff678d2d6
Merge pull request #13918 from manassolanki/item-level-defualts 
[enhancement] add the item defaults in the child-table for multi-company
 2018-05-16 14:04:47 +05:30
Rushabh Mehta
0b628386de [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
Manas Solanki
087a2259d9 update for default warehouse 2018-05-16 12:44:07 +05:30
Saurabh
2ca83d61ea Resolve merge conflicts from enterprise_sprint branch 2018-05-14 21:15:46 +05:30
Zlash65
890707854d config/utility level changes 2018-05-14 11:45:38 +05:30
Suraj Shetty
00cced12a0 Success Action (#13666) 
* success action config for  sales invoice

* remove "Notification Control" doctype and its usage

* add default success action after_install or while migration (patch)

* rename for_doctype to ref_doctype

* case change

* minor fix

* Remove unnecessary code

* Replace message with translatable message

* Fix 'cannot import error'
 2018-05-03 19:06:32 +05:30
Saurabh
2e7a45dbb4 resolved merge conflicts 2018-04-24 11:16:13 +05:30
Zlash65
fa5ecb066e typo fix in leaderboard 2018-04-22 12:11:01 +05:30
Zarrar
92109b01fd translate while creating items from user progress (#13530) 2018-04-06 10:27:55 +05:30
Prateeksha Singh
b60a52b194 Hub Market (#13325) 
* [hub] enable hub with OAuth token from user's client ID

* [hub] settings schema for adding users

* [hub] image view style listing

* [hub] broken image link fallback

* [wip]

* [hub] bootstrap timeline

* [hub] setup quick view

* [hub] reformat ratings, add companies autocomplete filter

* [hub] common listing frames

* [hub] setup sort selector

* [hub] timeline

* [hub] customize list header

* [hub] genuine form fieldtypes

* [hub] review products

* [hub] suggest missing categories remotely

* [hub] Wishlist; header and title templates

* [hub] link wishlist, remove company migration

* [hub] calculate ratings
 2018-04-03 10:44:13 +05:30
Britlog
e3a9b9fe49 [Website] Price in items list and sales uom management (#13335) 
* Price in items list and sales uom management

* Price in product search page

* Display website stock in sales uom

* Add set_product_info_for_website to avoid duplicate code

* Add price uom in item list and page

* Update product.py
 2018-03-20 14:28:44 +05:30
Achilles Rasquinha
ecc4fdd3ef Check Set Sales Target Item exists in User Slides 2018-03-19 22:21:45 +05:30
Achilles Rasquinha
d0786b45c3 fix issue 2018-03-19 22:17:37 +05:30
Zarrar
0702f29860 Add Ends-On field in the Lead doctype (#13147) 
* add ends_on date in lead to be mapped with calendar event

* set default ends_on to 1 hour from contact_time
 2018-03-12 18:49:54 +05:30
Prateeksha Singh
9362cf37e0 [charts] update charts API 2018-03-12 09:54:56 +05:30
Nabin Hait
c43c95e0aa Fixed merge conflict 2018-03-05 14:54:44 +05:30
rohitwaghchaure
0df95fa781 Multi-UOM for sales/purchase return (#13132) 
* Multi-UOM for sales/purchase return

* Update sales_and_purchase_return.py
 2018-03-01 11:31:33 +05:30
Zarrar
6578bc11b6 wrong query formed to delete events (#13119) 2018-03-01 10:54:55 +05:30
Achilles Rasquinha
96698c9a77 Use range instead xrange (#13128) 
* Use range instead of xrange

* convert float to int
 2018-02-28 16:12:51 +05:30
Nabin Hait
0e3db275e5 Merge branch 'master' into develop 2018-02-22 18:10:39 +05:30
Nabin Hait
cf72d7f135 Fixed merge conflict 2018-02-22 14:47:26 +05:30
tundebabzy
c15978fca0 fix indentation 2018-02-22 09:50:49 +01:00
Nabin Hait
7d862276af Cleanup and fixes on leaderboard 2018-02-22 13:59:41 +05:30
Nabin Hait
e4fe2d9603 Merge branch 'leaderboard' of https://github.com/vishdha/erpnext into vishdha-leaderboard 2018-02-22 11:35:10 +05:30
Shreya Shah
0bde9e11c7 clear log if no attachments (#13023) 2018-02-22 10:55:40 +05:30
vishdha
09d56754ea [fix] Codacy issue 2018-02-21 16:10:09 +05:30
vishdha
e9166d7c19 [fix] Sales partner details get from sales Order and company currency details from selected company 2018-02-21 15:35:58 +05:30
vishdha
9a64d4371e [fix] Codacy Issue 2018-02-21 15:35:58 +05:30
vishdha
d4491d361f [new] Filter based on company: 2018-02-21 15:35:58 +05:30
vishdha
09acb779d7 [new] Leader board 2018-02-21 15:35:58 +05:30
Zarrar
bc5515651b [Hotfix] Selecting create on blank field throws error (#13014) 
* selecting create on blank field error fix

* error when fetching default_print_format
 2018-02-21 11:13:14 +05:30
Achilles Rasquinha
1697a7aa81 replaced string_types with basestring 2018-02-15 11:39:45 +05:30
Faris Ansari
d53b149828 [deadlock fix] Save if not set (#12896) 2018-02-13 16:31:00 +05:30
Faris Ansari
f0056f7338 [deadlock fix] Save if not set 2018-02-13 12:18:24 +05:30
Nabin Hait
2ef1f84041 Fixed merge conflict 2018-02-03 09:14:53 +05:30
tundebabzy
5df64d84a1 code review fix 2018-02-01 17:05:54 +01:00
tundebabzy
29c8142678 refactor adjust_for_expired_items and others as per code review 
use get_all instead of get_list

rename `adjust_for_expired_items` to `adjust_qty_for_expired_items`
 2018-01-31 10:51:06 +01:00
Saurabh
03f6b3e588 resolved merge conflicts 2018-01-29 16:25:33 +05:30
tundebabzy
c7c1defe64 after adjusting stock_qty for expired, set in_stock flag 2018-01-27 12:16:13 +01:00
tundebabzy
c14f1f145b adjust stock_qty for expired quantities 
adjust based on warehouse

add parameters to `get_qty_in_stock` so it can be useful in other parts of the code base
 2018-01-27 12:16:13 +01:00
Prateeksha Singh
4c58299eb0
[fix] encode if letterhead 2018-01-25 17:29:57 +05:30
Rohit Waghchaure
abc0632925 Merge branch 'master' into develop 2018-01-19 15:49:29 +05:30
Rohit Waghchaure
c987500e08 Merge branch 'master' into develop 2018-01-19 13:29:57 +05:30
Manas Solanki
c6d5611408
Issue in the data import while importing the invoice 2018-01-18 11:20:24 +05:30
Faris Ansari
00e547d319 Encode letterhead filename (#12525) 2018-01-18 09:28:13 +05:30
Saurabh
4b0dd8a159 Merge branch 'master' into develop 2018-01-15 18:36:35 +05:30
Faris Ansari
184491bbbe [hotfix] Validate posting_time (#12484) 2018-01-15 14:18:53 +05:30
Nabin Hait
cb495fb33b Merge branch 'master' into develop 2018-01-05 13:17:00 +05:30
Manas Solanki
a521efc990 fix for the non stock items for the shopping cart (#12294) 2018-01-05 12:47:20 +05:30
Shreya Shah
48351e0339 cancelled sales invoice totals shouldn't be reflected in leaderboard for customer (#12292) 2018-01-05 12:45:43 +05:30
Manas Solanki
1f4b530e68 remove the print statements 2017-12-21 12:57:43 +05:30