rohitwaghchaure
6a7495dbc8
Removed set only once for maintain stock field in item master ( #12878 )
2018-02-12 17:25:24 +05:30
tundebabzy
6e90f49a35
Wrong Exchange Rate Is Fetched When Exchange Rate Is Different From Company Currency For Price Lists #12712 ( #12714 )
...
* unconditionally fetch exchange rate
* Revert "unconditionally fetch exchange rate"
This reverts commit d0d404d342092b5ba4398ed3bd8d8ff8f60b5f8a.
* allow for `plc_conversion_rate` field to be reset
* fetch exchange rate using price list currency and company currency not form currency
* clean up
2018-02-12 15:18:57 +05:30
rohitwaghchaure
6e7e70c977
Added PDC from journal entry in AR report ( #12844 )
2018-02-12 11:55:07 +05:30
rohitwaghchaure
0aeeb7e02c
[Fix] Item variant details report ( #12869 )
2018-02-12 11:44:39 +05:30
Shreya Shah
caccd2289d
posting-date-fix ( #12849 )
2018-02-12 11:34:46 +05:30
rohitwaghchaure
45ac31ab93
[Fix] Not able to save sales order ( #12851 )
2018-02-12 11:27:37 +05:30
rohitwaghchaure
7477899d2e
Formatter, code cleanup ( #12852 )
2018-02-12 11:25:58 +05:30
Saurabh
cab73b8a02
[fix] execute update_time_and_costing and update_project only for distinct task and projects
2018-02-09 17:04:12 +05:30
Manas Solanki
c7a9e3424b
Merge pull request #12845 from manassolanki/fix-so-update
...
don't set the ordered_qty in SO on load from BIN
2018-02-09 13:16:14 +05:30
Manas Solanki
a884bd9c6a
don't set the ordered_qty in SO on load from BIN
2018-02-09 13:12:07 +05:30
Manas Solanki
37b2aa2b11
changes in the education module ( #12827 )
...
update the module page
remove fee from beta
2018-02-08 19:00:51 +05:30
Saurabh
c1f982a9bb
bumped to version 10.0.21
2018-02-08 15:34:25 +06:00
Faris Ansari
6041f5cb8c
[hotfix] Advance Total validation
2018-02-08 13:33:52 +05:30
rohitwaghchaure
144c9977a2
Merge pull request #12819 from netchampfaris/hotfix-get_party_account
...
get_party_account only if company is set
2018-02-08 11:42:41 +05:30
Faris Ansari
f7717b9ec2
get_party_account only if company is set
2018-02-08 11:11:21 +05:30
Saurabh
1a4d77a962
Fixes #12810 for Offline POS
2018-02-08 01:32:48 +05:30
Saurabh
056c1709c6
Fixes #12810
2018-02-08 00:22:53 +05:30
rohitwaghchaure
b553b7a69d
PDC Enhancements ( #12462 )
2018-02-07 18:32:51 +05:30
Nabin Hait
67d6dc1ac6
bumped to version 10.0.20
2018-02-07 16:37:19 +06:00
Nabin Hait
33f967d97c
Account name length fixed in HUngary and Germen COA
2018-02-07 16:00:42 +05:30
rohitwaghchaure
9a5037193f
Removed DR/CR from balance column ( #12791 )
...
* Removed DR/CR from balance column
* Update general_ledger.html
* Update general_ledger.py
2018-02-07 12:10:14 +05:30
Shreya Shah
80423de611
posting date in journal entry should not be nowdate ( #12801 )
2018-02-07 12:08:08 +05:30
Manas Solanki
b4693c6957
fix for making the invoice from the timesheet ( #12803 )
2018-02-07 12:07:27 +05:30
Rohit Waghchaure
e8d22bb999
[Fix] Incorrect change amount if enabled rounded total
2018-02-05 18:13:29 +05:30
Vishal Dhayagude
cce29fabf4
[fix] validation between Selling Price and Valuation Rate should not be validated in the Sales Return entry ( #12767 )
2018-02-05 12:25:51 +05:30
rohitwaghchaure
0f5c18ca81
[Fix] For non stock item, not able to place an order from shopping cart ( #12758 )
2018-02-05 12:25:02 +05:30
rohitwaghchaure
a4c40e0fd6
[Fix] After accesing POS page, it does not work when going back from another page ( #12763 )
2018-02-05 12:24:06 +05:30
Nabin Hait
9d2f04139c
bumped to version 10.0.19
2018-02-03 09:43:12 +06:00
Saurabh
41c47e3ffa
Merge pull request #12677 from tundebabzy/issue-12535-1
...
Website Cart Should Not Show Expired Items As 'In Stock' #12535
2018-02-02 15:58:07 +05:30
rohitwaghchaure
cf6360d825
Merge pull request #12739 from jay-parikh/hotfix
...
Enable/Disable Discount in POS using POS Profile #11748
2018-02-02 13:12:38 +05:30
Jay Parikh
2c95ab3897
Code fix for Enable/Disable Discount in POS using POS Profile #11748
2018-02-01 22:52:58 -08:00
Jay Parikh
171e5af995
Fixed indentation issue in pull # 11748
2018-02-01 21:39:20 -08:00
tundebabzy
5df64d84a1
code review fix
2018-02-01 17:05:54 +01:00
tundebabzy
a829d5a4d5
Merge branch 'hotfix' into issue-12535-1
2018-02-01 16:56:05 +01:00
Nabin Hait
91c5e4c429
Validate rate in PO with supplier quotation only if checking is enabled via Buying Settings ( #12734 )
2018-02-01 18:58:22 +05:30
Nabin Hait
cae13bf048
Fixes in purchase register report ( #12737 )
2018-02-01 18:58:14 +05:30
Nabin Hait
2aba97bff1
Fetch items from BOM in Material Request
2018-02-01 18:52:50 +05:30
Jay Parikh
d4359faa31
Enable/Disable Discount in POS using POS Profile #11748
2018-02-01 04:26:24 -08:00
Rohit Waghchaure
d85247cd7a
[Fix] Pay button not working in pos
2018-02-01 17:18:38 +05:30
Nabin Hait
b9ce104b09
Opening balance in stock ledger report ( #12729 )
2018-02-01 14:58:50 +05:30
Rushabh Mehta
82fa04ce32
Update projects.py
2018-01-31 22:20:14 +05:30
rohitwaghchaure
32a5f38595
Merge pull request #12633 from vishdha/issue_12388
...
[fix] Sales order link to purchase order not working fixed
2018-01-31 17:30:43 +05:30
tundebabzy
4990cf7783
remove stray code
2018-01-31 11:35:56 +01:00
Nabin Hait
bff1971bb2
bumped to version 10.0.18
2018-01-31 16:09:15 +06:00
Zarrar
4e05f02038
error in throw message rectify ( #12719 )
2018-01-31 15:33:51 +05:30
Nabin Hait
7918b92d95
Invalid date value comparison, fixes for mariadb 10.2.3+
2018-01-31 15:30:03 +05:30
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
vishdha
df1653827f
[fix] Patch for material request to purchase order added
2018-01-31 15:11:24 +05:30
Vishal
fc05cc4e70
[fix] link with supplier quotation to purchase order
2018-01-31 15:10:39 +05:30
Vishal
4dc329f5ea
[fix] Sales order link to purchase order not working fixed
2018-01-31 15:10:39 +05:30
Nabin Hait
e37e5d6134
minor fix in patch for mariadb version
2018-01-31 15:00:18 +05:30
Zarrar
dea99cc3a8
treeview not set when routed from bom form ( #12707 )
2018-01-31 13:07:04 +05:30
Nabin Hait
bc640fe6a6
minor fix in old patch
2018-01-30 19:26:28 +05:30
Nabin Hait
dba5e7645b
Minor fix in old patch
2018-01-30 16:38:47 +05:30
Nabin Hait
927d13fadb
Minor fix in old patch
2018-01-30 15:59:44 +05:30
Nabin Hait
0f75a022f2
Minor fix in old patch
2018-01-30 15:32:17 +05:30
Nabin Hait
4eae6c985c
Fixed test records for supplier
2018-01-30 15:27:29 +05:30
tundebabzy
2f4854ad1a
create new dialog everytime ( #12696 )
2018-01-30 12:18:15 +05:30
Nabin Hait
585254456e
Check credit limit while making DN, if bypassed on SO ( #12702 )
2018-01-30 12:11:22 +05:30
rohitwaghchaure
ce5b93ca77
[Fix] Allow user to edit rate in online POS ( #12701 )
2018-01-30 10:39:46 +05:30
Saurabh
f3d30c5bb9
bumped to version 10.0.17
2018-01-29 19:23:53 +06:00
Saurabh
8df20f6501
Merge pull request #12695 from Zlash65/fix-dn
...
[Hotfix] Stock entry issue
2018-01-29 18:52:32 +05:30
Zlash65
f7a4d4221b
check precision with qty
2018-01-29 18:47:21 +05:30
Shreya Shah
406d449e12
fix posting date in journal entry on load ( #12694 )
2018-01-29 18:01:20 +05:30
Saurabh
373066e0ca
bumped to version 10.0.16
2018-01-29 18:12:37 +06:00
rohitwaghchaure
52beb77539
Don't validate payment terms for POS ( #12692 )
2018-01-29 17:40:44 +05:30
Saurabh
e1e690541c
set payment term name in payment_terms ( #12693 )
2018-01-29 17:39:56 +05:30
rohitwaghchaure
86c7ede321
Merge pull request #12690 from rohitwaghchaure/subscription_sent_email_issue
...
[Fix] Subscription send notification issue
2018-01-29 17:01:00 +05:30
Rohit Waghchaure
7e033aae11
[Fix] Subscription send notification issue
2018-01-29 16:53:37 +05:30
Zarrar
5bf77beb83
precision while checking qty ( #12688 )
2018-01-29 16:47:52 +05:30
Nabin Hait
1e1b2364ab
Optimization: don't update outstanding amount while cancelling payment entry for advance adjustment ( #12689 )
2018-01-29 16:45:43 +05:30
Saurabh
05eed01eec
bumped to version 10.0.15
2018-01-29 16:54:55 +06:00
Nabin Hait
cfa9d1adb7
Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date ( #12685 )
...
* Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date
* Payment Terms patch for credit days defined in customer group
2018-01-29 16:07:21 +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
tundebabzy
794ecda618
corrected wrong get_diff arguments
2018-01-27 05:54:40 +01:00
Manas Solanki
8985077652
Assessment Module Report ( #12605 )
...
* updated course wise assessment report
* added new report Final assessment grades
2018-01-26 11:20:33 +05:30
rohitwaghchaure
bfa898ff9b
[Fix] System pull the valuation rate even if allow zero valuation rate is enabled ( #12537 )
2018-01-26 10:59:00 +05:30
tundebabzy
0a33a359ca
Merge pull request #12659 from tundebabzy/issue-12658
...
set batch number only in Sales Invoice and Delivery Note - #12659
2018-01-26 06:10:13 +01:00
tundebabzy
f9b5c74871
set batch number only in Sales Invoice and Delivery Note
2018-01-25 19:21:05 +01:00
Prateeksha Singh
4c58299eb0
[fix] encode if letterhead
2018-01-25 17:29:57 +05:30
rohitwaghchaure
3574c96c8c
Update item_dashboard_list.html
2018-01-25 17:11:52 +05:30
Vinayak Jethe
5743ce2b6b
Made changes as per suggestions
2018-01-25 13:37:20 +05:30
Vinayak Jethe
84f7727432
Merge branch 'hotfix' of https://github.com/frappe/erpnext into fix-to-issue-#12512
2018-01-24 19:48:24 +05:30
Vinayak Jethe
549c196beb
Fixes issue #12512
2018-01-24 19:47:59 +05:30
Saurabh
cadd31cb0c
[Fix] Solves issue #12588
2018-01-24 16:38:22 +05:30
Vinayak Jethe
46c82c45e0
Revised changes for codacy
2018-01-24 14:24:58 +05:30
Vinayak Jethe
2c8ce5a717
Fixes issue #12512
2018-01-24 13:51:26 +05:30
Saurabh
381d452b78
bumped to version 10.0.14
2018-01-24 11:52:53 +06:00
Saurabh
6cc10104f0
[fix] enable rename for payment terms and payment term template
2018-01-24 11:15:02 +05:30
Saurabh
4b9a55b0ef
[fix] If buying or selling price list not found, return empty dict
2018-01-24 07:48:56 +05:30
Saurabh
c8399fd093
Merge pull request #12614 from rohitwaghchaure/removed_set_only_once_for_batch_serialno
...
Disabled property set only once for has serial no and has batch no field in item doctype
2018-01-23 18:08:56 +05:30
Rohit Waghchaure
266e66cd1b
Disabled property set only once for has serial no and has batch no field in item doctype
2018-01-23 18:06:12 +05:30
rohitwaghchaure
f3a452850e
Merge pull request #12617 from saurabh6790/ux_fix
...
parse value before setting it to dissable_rounded_total on Purchase Invoice
2018-01-23 17:35:16 +05:30
Saurabh
57df096725
Merge pull request #12600 from vishdha/allow_rename
...
[new] Allow Rename and Member link with user
2018-01-23 16:49:48 +05:30
Shreya
dfae11bcee
disabled warehouse in list view
2018-01-23 16:46:24 +05:30
rohitwaghchaure
d78e6e04ea
Run country fixtures if country changed in the company ( #12494 )
2018-01-23 15:42:46 +05:30
Saurabh
3959aeb848
[fix] parse value before setting it to dissable_rounded_total on Purchase Invoice
2018-01-23 15:40:43 +05:30
rohitwaghchaure
51293390e4
Merge pull request #12611 from shreyashah115/fetch-conversion-factor
...
[Fix] Fetch uom conversion factor in material request
2018-01-23 12:41:01 +05:30
Shreya
a137fe82a1
fix error message
2018-01-23 11:00:58 +05:30
Shreya
e2b31085a7
fetch uom conversion factor in material request
2018-01-23 10:54:23 +05:30
Vishal
a54815fd9d
[new] Allow Rename and Member link with user
2018-01-22 16:02:45 +05:30
Saurabh
b9f678b350
bumped to version 10.0.13
2018-01-22 15:59:14 +06:00
Saurabh
fb4caff0b2
Merge pull request #12573 from rohitwaghchaure/reorder_issue
...
[Fix] Wrong projected qty for warehouse group in the process of reorder item, which making extra material requests
2018-01-22 16:49:54 +07:00
Saurabh
e72915847c
Merge pull request #12570 from rohitwaghchaure/currency_in_balance_column
...
Added currency in balance column in general ledger print
2018-01-22 16:35:37 +07:00
rohitwaghchaure
1d93bd50eb
Merge pull request #12585 from rohitwaghchaure/sales_income_account_issue
...
[Fix] Income account can not be group
2018-01-22 15:04:46 +05:30
rohitwaghchaure
8e998875a5
Merge pull request #12590 from shreyashah115/total-on-items-remove
...
[Fix] Calculate taxes when shipping rule not present at removal of item
2018-01-22 15:03:11 +05:30
Rohit Waghchaure
c4c2bf0bfb
[Fix] Image patch showing in the item link
2018-01-22 13:47:28 +05:30
Shreya
39adc8f85f
calculate total when items are removed
2018-01-22 13:08:05 +05:30
Rohit Waghchaure
8676590cfe
[Fix] Income account can not be group
2018-01-22 12:35:36 +05:30
Rohit Waghchaure
bc94914338
[Fix] Sales payment summary issue
2018-01-20 17:01:31 +05:30
Rohit Waghchaure
f83f6aae22
[Fix] Wrong projected qty for warehouse group in the process of reorder item making extra material requests
2018-01-20 15:44:38 +05:30
Rohit Waghchaure
edef642794
Added currency in balance column in general ledger print
2018-01-20 12:54:25 +05:30
Zlash65
93344dff26
group_by_account not displayed fix
2018-01-19 19:06:39 +05:30
Rohit Waghchaure
0e61b52022
bumped to version 10.0.12
2018-01-19 16:19:28 +06:00
rohitwaghchaure
0efd7934b8
Merge pull request #12530 from frappe/manassolanki-patch-2
...
Issue in the data import while importing the invoice
2018-01-19 15:35:23 +05:30
Rohit Waghchaure
e1815f0989
bumped to version 10.0.11
2018-01-19 13:59:56 +06:00
rohitwaghchaure
c59d52d073
Merge pull request #12550 from rohitwaghchaure/po_permission_issue
...
[Fix] Error in PO. No Permission for Buying Settings
2018-01-19 13:00:36 +05:30
rohitwaghchaure
7b605a628e
Merge pull request #12543 from rohitwaghchaure/precision_issue_bom
...
[Fix] Precision issue while making material requests from production planning tool
2018-01-19 13:00:16 +05:30
Rohit Waghchaure
2f3ad64bd6
[Fix] Precision issue while making material requests from production planning tool
2018-01-19 12:47:55 +05:30
Rohit Waghchaure
86cbde9057
[Fix] Error in PO. No Permission for Buying Settings
2018-01-19 12:45:53 +05:30
rohitwaghchaure
65a669c81e
Merge pull request #12534 from rohitwaghchaure/patch_fix_v7
...
[Fix] Timesheet patch
2018-01-19 11:37:18 +05:30
Rohit Waghchaure
de420322b5
[Fix] Sales payment summary issue
2018-01-18 17:20:21 +05:30
rohitwaghchaure
c8e016522d
Merge pull request #12533 from rohitwaghchaure/pos_css_issue
...
[Fix] POS css
2018-01-18 16:12:00 +05:30
Rohit Waghchaure
5c4f52ccf1
[Fix] POS css
2018-01-18 16:10:19 +05:30
Rohit Waghchaure
95adb60a8f
Fix patch
2018-01-18 15:52:52 +05:30
Manas Solanki
c6d5611408
Issue in the data import while importing the invoice
2018-01-18 11:20:24 +05:30
rohitwaghchaure
bd47abdc9a
[Enhance] Running Balance in GL Report ( #12491 )
...
* Running Balance in GL Report
* Supplier invoice no in GL Report/Print Format
2018-01-18 09:32:43 +05:30
Faris Ansari
00e547d319
Encode letterhead filename ( #12525 )
2018-01-18 09:28:13 +05:30
Nabin Hait
f1b098e03c
payment terms filter in AR Summary report ( #12529 )
2018-01-18 09:23:32 +05:30
Nabin Hait
f76fb50685
bumped to version 10.0.10
2018-01-17 19:21:20 +06:00
rohitwaghchaure
da941af687
Set due date in purchase invoice based on suppler invoice date ( #12395 )
2018-01-17 16:23:04 +05:30
Nabin Hait
91fd29a963
Remove enqueuing update_total_sales method, sometimes it does not include current invoice ( #12522 )
2018-01-17 16:14:31 +05:30
Umair Sayed
230805b016
Update total.html ( #12511 )
2018-01-17 14:41:38 +05:30
rohitwaghchaure
60febc5465
[Fix] Gross profit validation issue ( #12516 )
2018-01-17 14:40:59 +05:30
Faris Ansari
4d4ce3e5cf
Rename enquiry_type to opportunity_type in MultiSelect dialog ( #12517 )
2018-01-17 14:40:27 +05:30
Vishal Dhayagude
052b51ab20
[fix] Fetch UOM conversion and stock_uom from BOM into material request ( #12513 )
...
* [fix]Fetch UOM conversion and stock_uom from BOM into material Request
* Update material_request.js
2018-01-17 14:39:54 +05:30
Nabin Hait
2bfa1803e9
GL Entry on asset sale ( #12514 )
...
* GL Entry on asset sale
* Asset sale test case fixed
2018-01-17 14:39:05 +05:30
Nabin Hait
b44ef0b249
Delete employee records on deletion of company
2018-01-16 19:21:02 +05:30
Saurabh
d40bfeb7d3
bumped to version 10.0.9
2018-01-15 19:06:34 +06:00
Faris Ansari
f18cd2eaf7
[fix] is_root check
2018-01-15 18:30:01 +05:30
Nabin Hait
a2426fcc9e
Get default tax template only if tax template not selected or template is for other company ( #12492 )
2018-01-15 17:45:46 +05:30
Faris Ansari
184491bbbe
[hotfix] Validate posting_time ( #12484 )
2018-01-15 14:18:53 +05:30
Vishal Dhayagude
eec0f7fd6b
[non_profit][fix] Chapter listing and join and leave chapter issue ( #12463 )
...
* [fix] Chapter listing and Join and leave chapter issue
* [minor] Changes in chapter html, chapter title to chapter name
2018-01-15 14:10:23 +05:30
Vishal Dhayagude
e04aedadcd
[fix] Add to cart issue fixed ( #12474 )
2018-01-15 14:01:05 +05:30
Vishal Dhayagude
e88f928f0f
[fix] Image with name listing ( #12479 )
2018-01-15 12:29:39 +05:30
Saurabh
59edc6028d
bumped to version 10.0.8
2018-01-12 17:24:26 +06:00
Saurabh
93d3020e4b
Merge pull request #12464 from Zlash65/fix-company-bom-deletion
...
[Fix] Delete BOM only when found
2018-01-12 16:47:54 +05:30
Manas Solanki
b19fd57043
[fix] set required quantity if item in bom found ( #12460 )
2018-01-12 16:28:30 +05:30
rohitwaghchaure
7b78f6bee6
Added rounded total in the POS and fix rounded issue in js side ( #12457 )
2018-01-12 16:28:16 +05:30
