Kanchan Chauhan
52a5cb9ae3
[Fix] Holiday Calendar Fix
2017-02-23 16:15:12 +05:30
nick9822
089c5caea5
Sales analytics error after upgrade
...
Hi Team,
We were getting errors in sales analytics report after the upgrade.
https://discuss.erpnext.com/t/sales-analytics-report-hangs-on-erpnext-v7/17951/6
With the efforts of @Tropicalrambler into the report we made it work by putting checkpoint for item.
Please see whether its good or there is better solution for it.
Thanks,
Nick
2017-02-22 17:09:29 +05:30
Nabin Hait
10ec553859
Merge branch 'hotfix'
2017-02-22 15:05:27 +05:30
Nabin Hait
633698affc
bumped to version 7.2.23
2017-02-22 15:35:27 +06:00
Nabin Hait
1965949c67
Merge pull request #7816 from mbauskar/hotfix
...
[minor] minor fixes for journal entry get_exchange_rate trigger
2017-02-22 15:03:32 +05:30
mbauskar
a8fa10d2a9
[minor] minor fixes for journal entry get_exchange_rate trigger
2017-02-22 14:51:09 +05:30
Nabin Hait
1bdb6a57f2
Merge pull request #7809 from rohitwaghchaure/financial_statement_company_issue
...
[Fix] Company fiscal year issue in financial statement
2017-02-22 11:41:16 +05:30
Nabin Hait
8c9bc8edbb
Merge pull request #7807 from nabinhait/hotfix
...
Company, Currency, Conversion Rate fields are mandatory in BOM
2017-02-21 16:06:20 +05:30
Rohit Waghchaure
49523d7f80
[Fix] Company fiscal year issue in financial statement
2017-02-21 14:20:26 +05:30
Nabin Hait
6e1a2b16a5
Company, Currency, Conversion Rate fields are mandatory in BOM
2017-02-21 13:11:02 +05:30
Nabin Hait
7056ce54d7
Update salary_structure.py
2017-02-20 23:28:47 +05:30
Nabin Hait
6cbe02400a
Merge pull request #7672 from KanchanChauhan/remove-joining-datep-validation
...
From date, to date moved from Salary Structure to Salary Structure Employee
2017-02-20 19:31:49 +05:30
Nabin Hait
6a85752ead
Merge branch 'hotfix' into remove-joining-datep-validation
2017-02-20 19:31:38 +05:30
Nabin Hait
e17519accb
Update salary_structure.py
2017-02-20 19:30:44 +05:30
Nabin Hait
f8cff128b3
Merge branch 'hotfix'
2017-02-20 14:52:01 +05:30
Nabin Hait
66b373033a
bumped to version 7.2.22
2017-02-20 15:22:01 +06:00
Nabin Hait
64e222697c
Merge pull request #7769 from nabinhait/setup_fy_dates
...
Set fiscal year start and end date based on country
2017-02-17 15:18:28 +05:30
Nabin Hait
e285258374
Merge pull request #7762 from mbauskar/hotfix
...
[minor] timestamp fixes for heatmap
2017-02-17 15:18:01 +05:30
Nabin Hait
a6eb1434b3
Merge pull request #7771 from rmehta/item-name
...
[minor] item name not mandatory and item price with quick edit
2017-02-17 15:17:24 +05:30
Rushabh Mehta
0c5375d0fa
[minor] item name not mandatory and item price with quick edit
2017-02-17 14:57:31 +05:30
Nabin Hait
6af7dd4e1b
Set fiscal year start and end date based on country
2017-02-17 14:47:33 +05:30
Nabin Hait
801fa80b39
Merge pull request #7764 from rohitwaghchaure/clean_supplied_items
...
[Fix] Cleanup supplied items if supply raw material is set as No
2017-02-17 12:36:05 +05:30
Nabin Hait
9e5b3dad29
Minor fix in assesment
2017-02-17 11:03:44 +05:30
Rohit Waghchaure
4b9d2f2733
[Fix] Cleanup supplied items if supply raw material is set as No
2017-02-16 18:53:23 +05:30
mbauskar
e7b87ad071
[minor] timestamp fixes for heatmap
2017-02-16 16:05:46 +05:30
Nabin Hait
1b59b624c3
Merge branch 'hotfix'
2017-02-16 15:59:58 +05:30
Nabin Hait
a7d6b68bc0
bumped to version 7.2.21
2017-02-16 16:29:58 +06:00
Nabin Hait
c70a4d2037
Merge pull request #7760 from rmehta/add-activation-1
...
[add] site activation level
2017-02-16 15:51:04 +05:30
Rushabh Mehta
6dd461fec4
[add] site activation level
2017-02-16 14:53:21 +05:30
Nabin Hait
d5d0b36973
Merge branch 'hotfix'
2017-02-16 14:37:49 +05:30
Nabin Hait
7677b56f7c
bumped to version 7.2.20
2017-02-16 15:07:48 +06:00
Nabin Hait
b280398626
Merge pull request #7739 from rohitwaghchaure/payment_entry_currency_symbol_issue
...
[Fix] Payment Entry currency symbol issue
2017-02-16 14:21:24 +05:30
Nabin Hait
99c6c79834
Update payment_entry.js
2017-02-16 14:21:04 +05:30
Nabin Hait
3437a9a123
minor fix
2017-02-16 12:14:30 +05:30
Nabin Hait
6a2e138021
Merge pull request #7731 from nabinhait/hotfix
...
Check existing SO, PO and MR for enabling / disabling 'Is Stock Item' checkbox
2017-02-15 17:25:56 +05:30
Rohit Waghchaure
ff41c82c2b
[Fix] Payment Entry currency symbol issue
2017-02-15 11:44:15 +05:30
Nabin Hait
99dfa3060a
Check existing SO, PO and MR for disabling 'Is Stock Item' checkbox
2017-02-13 16:06:02 +05:30
Nabin Hait
89b6c47b2e
Merge pull request #7712 from rohitwaghchaure/minor_fix_item_valuation_method
...
[Fix] Valuation method changing issue in the item
2017-02-13 15:42:22 +05:30
Nabin Hait
ec07d18222
Merge pull request #7716 from KanchanChauhan/apply-now-job
...
[Fix] Apply Now button redirect fixed for Job Opening
2017-02-13 15:42:02 +05:30
Kanchan Chauhan
1cd5e583ba
[Fix] Apply Now button redirect fixed for Job Opening
2017-02-10 17:58:41 +05:30
Nabin Hait
bdd470a6d1
Update item.py
2017-02-10 17:12:48 +05:30
Rohit Waghchaure
2f09dc0e62
[Fix] Valuation method changing issue in the item
2017-02-10 15:29:45 +05:30
Nabin Hait
eee23eaf5c
Merge pull request #7702 from mbauskar/hotfix
...
[minor] payment entry company trigger
2017-02-09 13:48:09 +05:30
mbauskar
d487bf77e1
[minor] payment entry company trigger
2017-02-09 12:57:25 +05:30
Nabin Hait
efd5eadfea
Merge branch 'hotfix'
2017-02-08 11:32:47 +05:30
Nabin Hait
57e97c06e6
bumped to version 7.2.19
2017-02-08 12:02:47 +06:00
Nabin Hait
6f93cd5bd0
Merge pull request #7692 from rohitwaghchaure/minor_fixes_v_7_2
...
Minor fixes
2017-02-08 11:21:54 +05:30
Nabin Hait
533d22e88b
Merge pull request #7606 from rohitwaghchaure/data_import_tool_for_cost_center
...
[Fix] Allow data import tool for cost center
2017-02-08 11:21:25 +05:30
Rohit Waghchaure
b3489548a9
minor fix
2017-02-08 11:20:04 +05:30
Nabin Hait
ccd2e00331
Merge pull request #7676 from nabinhait/missing_val_rate
...
Get standard/historical valuation rate where missing, if item is not a sample item
2017-02-08 11:05:06 +05:30