Suraj Shetty
7ae2d59ffd
Merge branch 'staging-fixes' into permission-fixes
2018-12-18 15:41:03 +05:30
Suraj Shetty
07e5786e1b
Fix user permission checks
2018-12-10 19:10:18 +05:30
Frappe Bot
7c2a5bddb1
Merge branch 'staging' into develop
2018-12-06 09:50:25 +00:00
deepeshgarg007
94a3539015
Row check fix in stock analytics
2018-11-30 16:20:48 +05:30
deepeshgarg007
1a1c013b2a
Analytics report bug fixes and code cleaning
2018-11-29 08:34:47 +05:30
Ameya Shenoy
fe1f532bc0
Merge branch 'staging' into develop
2018-11-28 08:28:37 +00:00
deepeshgarg007
05c2989698
removed total from graph
2018-11-26 20:19:57 +05:30
deepeshgarg007
4c366eed23
Minor issue fixes
2018-11-15 12:02:07 +05:30
Frappe Bot
b5c7b96a73
Merge branch 'staging' into develop
2018-11-13 11:33:31 +00:00
Deepesh Garg
84483ff776
Stock analytics script report ( #15630 )
...
* Stock analytics script report
* Codacy Issue Fixes
* Codacy Issue Fixes
* Removed Trailing Whitespaces
* Code cleaning and optimization
* Minor Changes
* Code cleaning and spacing
* Added link for stock analytics in stock.py
* Refactoring and code cleaning
* Codacy issue fixes
2018-11-12 17:05:31 +05:30
Ameya Shenoy
f3f997f232
Merge branch 'staging' into develop
2018-10-31 13:51:52 +00:00
Ameya Shenoy
961849beb4
Merge branch 'master' into staging-fixes
2018-10-31 13:43:12 +00:00
rohitwaghchaure
cd11bdfdbb
[Fix] Supplier wise sales analytics report not showing item details which is added in purchase invoice with update stock ( #15869 )
2018-10-31 18:02:00 +05:30
Ameya Shenoy
c1231d65fd
Merge branch 'staging' into develop
2018-10-19 13:27:07 +00:00
Saif
b4cf72c770
Adding "Include UOM" in Reports with Qty and Rates ( #15541 )
...
* Added Include UOM field for Stock Balane, Stock Ledger and Stock Projected Qty
* Add columns in result list-of-lists instead of converting reports to list-of-dicts
* For requested changes
-Merged conversion factor query with item detail queries
-Ensuring snail_case
-Made columns consistently list-of-dicts
2018-10-18 17:59:47 +05:30
Ameya Shenoy
d1c467bcf5
Merge branch 'staging' into develop
2018-10-17 09:44:39 +00:00
Shreya Shah
8e71074e1c
fix(report): Add column for Item Name ( #15702 )
2018-10-16 14:36:49 +05:30
Shreya
82660913a5
fix(report): Add column for Item Name
2018-10-16 12:15:56 +05:30
Ameya Shenoy
f90af80344
Merge branch 'staging' into develop
2018-10-11 06:58:53 +00:00
Shreya Shah
8a4bcefec4
fix(accounts-receivable): Column values in Print and PDF ( #15621 )
2018-10-08 18:34:01 +05:30
Ameya Shenoy
da10f6ebd8
Merge branch 'staging' into develop
2018-10-04 11:51:30 +00:00
deepeshgarg007
719701f2a4
Enhancement in Budget Variance and other reports ( #15455 )
...
* Enhanced Budget Variance report and added filters and columns in other reports
* Update budget_variance_report.js
* Changes in budget variance report
* Spacing in column names
2018-10-02 12:52:13 +05:30
Nabin Hait
1e7c32b909
Payroll fixes and more ( #15475 )
...
* fix(payroll): multiple minor fixes related to salary structure
* Added GSTR-1 and GSTR-2 report in Accounts module page
* delete asset movement records on cancellation of Purchase Receipt
* Update consolidated_financial_statement.py
* minor fix
* minor fix
* add filters on item prices report (#15495 )
2018-09-26 18:01:00 +05:30
RicardoJohann
171c7d4128
add filters on item prices report ( #15495 )
2018-09-26 15:58:06 +05:30
Suraj Shetty
bfc195dd8b
Changes to support refactor in frappe pg-poc branch ( #15287 )
...
* Remove quotes from sql to make it compatible with postgres as well
* Fix queries
- Replace mysql specifc queries with standard ones
* Make repo URL chages to test pg-poc
* Add root passowrd to test site config
* Fix quotes issue
* Remove debug flag from a pricing rule query
* Remove python 3.6 version from travis.yml
* Fix improper query issue
* Fix incorrect query
* Fix a query
- This fix need to be changed when we will start supporting postgres
since date_format is not supported by postgres
* Get price list map as dict
* Convert price_list_currency_map to dict
2018-09-21 10:20:52 +05:30
Nagarajan
8be8345b65
Stock Projected Qty Item Group Filter ( #15340 )
...
* Update stock_projected_qty.js
* Update stock_projected_qty.js
* Update stock_projected_qty.py
* Update stock_projected_qty.js
2018-09-07 16:20:18 +05:30
Nabin Hait
a2a6568b7e
fix(reports): Made gstr1 ready for govt portal
2018-09-06 17:44:31 +05:30
Saurabh
5c3590fa8d
Merge branch 'master' into develop
2018-08-31 11:29:14 +05:30
rohitwaghchaure
624927bf0b
[Fix] Not able to export the Supplier-Wise Sales Analytics report ( #15271 )
2018-08-30 19:19:14 +05:30
Nabin Hait
fa06ee80e9
Fixed merge conflict
2018-07-27 12:54:00 +05:30
Zarrar
a22e0d0c99
return empty if no stock ledger entry found ( #14968 )
2018-07-23 11:31:04 +05:30
Saurabh
d7897f1c53
Resolved merge conflicts
2018-07-18 17:08:16 +05:30
rohitwaghchaure
07d0e9a2b2
Don't show disabled items in the stock balance report ( #14851 )
2018-07-09 16:56:41 +05:30
rohitwaghchaure
1501a6e58e
[Fix] Data missing issue in stock ledger report ( #14755 )
2018-07-01 16:42:00 +05:30
Bassam Ramadan
45725c2c7b
add missing brand filter to stock balance report ( #14597 )
...
add missing brand filter to stock balance report
2018-06-20 17:41:29 +05:30
Saurabh
0eb622f7da
[fix] resolve conflicts
2018-05-31 17:32:17 +05:30
Saurabh
3c1b153cdb
Merge pull request #14111 from netchampfaris/stock-ledger-report-hotfix
...
[fix] Stock Ledger report item filter
2018-05-28 15:23:21 +05:30
Ameya Shenoy
95e60927b4
Merge branch 'master' into develop
2018-05-24 08:45:14 +00:00
Manas Solanki
f7713ebfa7
[optimize] introduce two filter in the report in order to handle large item master data ( #14193 )
2018-05-23 19:43:04 +05:30
Achilles Rasquinha
efb731941d
ran 2to3, evaluation ( #13499 )
...
* ran 2to3, evaluation
* Update update_gstin.py
* Update accounts_receivable_summary.py
2018-05-23 11:31:24 +05:30
Faris Ansari
9e4889d756
[fix] Stock Ledger report item filter
...
- breaks when Item Code contains % symbol
2018-05-17 12:18:28 +05:30
Suraj Shetty
dcc90e3312
Add fix to support changes in user permission ( #13923 )
...
https://github.com/frappe/frappe/pull/5494
2018-05-04 17:52:57 +05:30
rohitwaghchaure
125c0caf12
Added brand in item price doctype, item prices report ( #13900 )
2018-05-03 16:23:57 +05:30
Saurabh
9738d52d5f
Merge branch 'master' into develop
2018-04-24 12:09:40 +05:30
Saurabh
d2065ce3bf
typo fix
2018-04-24 12:07:37 +05:30
Saurabh
2e7a45dbb4
resolved merge conflicts
2018-04-24 11:16:13 +05:30
Saurabh
2476a8aab9
a[fix] check content before making in condition
2018-04-17 20:45:06 +05:30
Saurabh
46743d00d6
Merge branch 'master' into develop
2018-04-17 12:00:21 +05:30
Saurabh
9fbb8192e1
[fix] do not escape % while using clause ( #13677 )
2018-04-17 11:56:46 +05:30
Nabin Hait
642d39098a
Fixed merge conflict
2018-04-13 14:38:57 +05:30
Nabin Hait
c10e106f8f
Optimization related to large number of items ( #13606 )
2018-04-12 13:25:03 +05:30
Sanjay Kumar
6225b769a6
remove external app reference and update get_warehouse_list ( #13597 )
2018-04-11 02:19:36 -08:00
Nabin Hait
e9638be032
fixed merge conflict
2018-04-06 15:18:27 +05:30
rohitwaghchaure
2ae6cfda5f
[Fix] Item variant details report ( #13545 )
2018-04-06 11:49:04 +05:30
Nabin Hait
2b682c82e8
Fixed merge conflict
2018-04-04 11:40:16 +05:30
Nabin Hait
5fd79f7f77
Update stock_ledger.py
2018-04-04 11:20:16 +05:30
Rushabh Mehta
d5f9ebd008
[optimize] item queries ( #13480 )
2018-04-02 23:37:33 +05:30
Nabin Hait
ff2e4c898a
Fixed merge conflict
2018-03-29 13:57:39 +05:30
Manas Solanki
ef770b593a
fix the item varint details
2018-03-29 13:25:00 +05:30
Nabin Hait
061d912749
Fixed merge conflict
2018-03-23 16:20:27 +05:30
rohitwaghchaure
93779c21a7
[Fix] Project not set in the stock ledger entry ( #13357 )
2018-03-21 17:52:41 +05:30
Nabin Hait
2c7a6e6b43
Reserve for subcontracting ( #13195 )
...
* [fix] #8427
* review comments changes
* Validation for reserved warhouse
* code improvements
* alignment
* test case
* message changes
* default warehouse / remove validation / change sql
* fix
* patch
* Fixed merge conflict
* Fixes and cleanups of reserve qty for subcontracting
* set from_warehouse only if purchase_order and purpose found (#12398 )
* [HotFix] Validation issue for subcontract stock entry (#12127 )
* [Fix] Validation issue for subcontract stock entry
* Update stock_entry.py
* Fixes and cleanups of reserve qty for subcontracting
* patch fixed
* Reload bin in patch
* [fix] set source warehouse in stock entry for manufacture
* [fix] #8540
* code alignment
* code alignment
* Move target warehouse validation to submit
* validation code improvement
* code changes for single stock entry
* validation fix
* call make_rm_stock_entry
* remove old stock entry method/rewrite test case
* Don't set bom_no against raw materials while trasferring items for sub-contracting
* minor fix
2018-03-12 14:12:12 +05:30
Nabin Hait
5e63c265db
Fixed merge conflict
2018-03-09 17:34:39 +05:30
Nabin Hait
052333ea63
subctracting stock entry should also be considered as consumed qty
2018-03-09 14:30:32 +05:30
Nabin Hait
c43c95e0aa
Fixed merge conflict
2018-03-05 14:54:44 +05:30
rohitwaghchaure
67cfa81de2
[Fix] Stock Ageing report does not work with group warehouse ( #13151 )
2018-03-05 11:00:42 +05:30
Nabin Hait
127c61e930
Fixed logic in itemwise recommended reorder level
2018-02-26 12:43:17 +05:30
Nabin Hait
802819df9d
Merge branch 'master' into develop
2018-02-23 16:59:44 +05:30
Zarrar
339426c926
fix permission issue for stock balance report - Item Group ( #13069 )
2018-02-23 16:58:55 +05:30
Nabin Hait
cf72d7f135
Fixed merge conflict
2018-02-22 14:47:26 +05:30
Shreya Shah
8a77a0e1e4
Add total row in all trends reports ( #13010 )
...
* total in sales order trends report
* total in all trends reports
2018-02-21 14:46:07 +05:30
Pawan Mehta
2fbb4923a7
item balance report ( #12983 )
...
* item balance report
* remove hard coding
* Update item_balance.json
* Update item_balance.json
Change name to "Item Balance (Simple)"
* Update item_balance.json
2018-02-20 12:17:49 +05:30
riyasrawther
d1134516c2
Warehouse wise Item Balance, Age and Value ( #12879 )
...
* Create warehouse_wise_item_balanace_age_and_value.py
* Create warehouse_wise_item_balance_age_and_value.js
* Create warehouse_wise_item_balance_age_and_value.json
* Update warehouse_wise_item_balance_age_and_value.json
* Update warehouse_wise_item_balance_age_and_value.json
* Update warehouse_wise_item_balance_age_and_value.json
* Update warehouse_wise_item_balance_age_and_value.js
* Rename warehouse_wise_item_balanace_age_and_value.py to warehouse_wise_item_balance_age_and_value.py
* Update warehouse_wise_item_balance_age_and_value.py
2018-02-16 14:53:53 +05:30
Achilles Rasquinha
714c7465fb
Updated Python 3 fixes
2018-02-15 11:31:05 +05:30
Saurabh
2735701aab
resolved merge conflicts
2018-02-14 11:51:09 +05:30
rohitwaghchaure
0aeeb7e02c
[Fix] Item variant details report ( #12869 )
2018-02-12 11:44:39 +05:30
Nabin Hait
2ef1f84041
Fixed merge conflict
2018-02-03 09:14:53 +05:30
Nabin Hait
b9ce104b09
Opening balance in stock ledger report ( #12729 )
2018-02-01 14:58:50 +05:30
Saurabh
fb2f97391f
resolved merge conflicts
2018-01-24 11:24:10 +05:30
Saurabh
4b9a55b0ef
[fix] If buying or selling price list not found, return empty dict
2018-01-24 07:48:56 +05:30
umaepoch
832453a757
Added Delay days field to Ordered Items to be Delivered report ( #12439 )
...
* Added Delay Days to Ordered Items to be Delivered Report
* Ordered Items to be Delivered
2018-01-15 15:43:16 +05:30
Saurabh
35d8ce4fbd
resolved merge conflicts
2018-01-12 16:58:32 +05:30
rohitwaghchaure
752d21e658
Code cleanup for item price stock report and fix report was not exporting properly in excel ( #12427 )
2018-01-11 12:28:48 +05:30
Nabin Hait
07e5376043
Fixes and cleanups of reserve qty for subcontracting
2018-01-05 18:19:59 +05:30
Nabin Hait
28d0230e56
Multiple small fixes
2018-01-05 13:14:25 +05:30
Pawan Mehta
bb7fab52d1
[fix] #11880- Item wise report showing price list and stock available ( #11885 )
...
* [fix] #11880
* review comments
* codacy fixes
2017-12-12 15:05:03 +05:30
Prateeksha Singh
744ff0010b
Variant report ( #11618 )
...
* Item Variant Details Report
* remove queries from inside for loop
* make attribute value map
* Update item_variant_details.py
2017-11-17 12:00:29 +05:30
Nabin Hait
78ab8235f6
Minor code cleanups in stock balance report
2017-11-15 14:43:54 +05:30
Brown-Harry Boma
b9e44217a2
[Fix]Codacy Issues
2017-11-15 14:43:54 +05:30
Brown-Harry Boma
2da8f6e89d
Add Items Variants Attributes columns to Stock Balance Report
2017-11-15 14:43:54 +05:30
Nabin Hait
15753074bf
Nestedset model fixes for changing parent and renaming ( #11467 )
2017-11-10 11:12:43 +05:30
Utkarsh Goswami
11bd5fc3b1
Description moved next to item code ( #10820 )
2017-09-18 15:05:50 +05:30
mbauskar
62f0722325
resolved merge conflicts
2017-08-21 08:58:42 +05:30
Makarand Bauskar
222e86bb13
[hotfix] fixed the mysql syntax error issue on stock ledger report ( #10442 )
2017-08-21 07:35:16 +05:30
Manas Solanki
0371d5a326
new item group filter in the stock ledger report ( #10400 )
2017-08-16 11:35:04 +05:30
tunde
80a9f37272
add options in get_columns
2017-08-04 12:08:09 +01:00
Makarand Bauskar
9c6e2c3637
[hotfix] included the get_purchase_trends_filters instead of get_sales_trends_filters in Purchase Receipts trends ( #10127 )
2017-07-27 16:23:57 +05:30
Makarand Bauskar
dfc5a454b3
[minor] fixed the delivery date issue in Ordered Item to be Dellivered report ( #10028 )
2017-07-25 10:48:43 +05:30
Nabin Hait
3020c8086c
Update stock_balance.py
2017-07-18 11:17:32 +05:30
pawan
36025468a1
[fix] #9899
2017-07-17 17:28:44 +05:30
