Marica
91a9d3fbe5
fix: Reload doc in Healthcare company patch ( #21808 )
2020-05-20 16:12:46 +05:30
Faris Ansari
ca2b323117
fix: Move address and contact templates to frappe
2020-05-20 14:56:29 +05:30
Nabin Hait
e9864aa578
Merge branch 'anupamvs-crm-onboarding' into develop
2020-05-20 12:55:59 +05:30
Nabin Hait
7cbbd68176
fix: CRM module dashboard and onboarding
2020-05-20 12:55:34 +05:30
rohitwaghchaure
df78e29957
Merge pull request #21724 from rohitwaghchaure/production-forecasting
...
feat: production forecasting using exponential smoothing method
2020-05-20 12:30:56 +05:30
Nabin Hait
189be3c68b
Merge branch 'crm-onboarding' of https://github.com/anupamvs/erpnext into anupamvs-crm-onboarding
2020-05-20 12:07:55 +05:30
Rohit Waghchaure
841a8db5d1
updated manufacturing desk
2020-05-20 12:06:07 +05:30
Nabin Hait
9d04c06c62
fix: HR dashboard and onboarding
2020-05-20 12:05:03 +05:30
Rohit Waghchaure
e6147ed9bc
feat: production forecasting using exponential smoothing method
2020-05-20 11:31:06 +05:30
rohitwaghchaure
bd4629568d
Merge pull request #21793 from deepeshgarg007/general_ledger_against_voucher
...
fix: Against voucher in General Ledger
2020-05-20 10:30:11 +05:30
Deepesh Garg
3949b51026
Merge pull request #21785 from anupamvs/sales-order-tax-fix
...
fix: tax id is not fetched when creating sales order from quotation
2020-05-19 21:49:11 +05:30
Anupam K
75e8b1b519
tax id is not fetched in when creating sales order from quoation
2020-05-19 21:39:56 +05:30
Nabin Hait
6277367d21
fix: project desk
2020-05-19 21:18:26 +05:30
Nabin Hait
0b10c6a1bc
Merge branch 'project-refresh' of https://github.com/scmmishra/erpnext into scmmishra-project-refresh
2020-05-19 21:03:39 +05:30
Nabin Hait
041e31b8ba
fix: added dashboard link in healthcare desk
2020-05-19 20:58:00 +05:30
Nabin Hait
4db4464123
Merge branch 'healthcare-charts-and-onboarding' of https://github.com/ruchamahabal/erpnext into ruchamahabal-healthcare-charts-and-onboarding
2020-05-19 20:53:08 +05:30
Deepesh Garg
1b1787c61a
fix: Against voucher in General Ledger
2020-05-19 20:51:30 +05:30
Rucha Mahabal
0c03834190
fix(minor): pass ignore_mandatory flag for Lab Test Item Creation ( #21784 )
2020-05-19 20:30:20 +05:30
Rucha Mahabal
99d348ffa3
fix: Patch for Setting Missing Company in Healthcare DocTypes ( #21790 )
...
* fix: patch for setting missing company in Healthcare DocTypes
* fix: check doctype exists
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-19 20:28:19 +05:30
Nabin Hait
939441117a
Merge branch 'marination-purchase-dashboard' into develop
2020-05-19 20:22:48 +05:30
Nabin Hait
e005078c0d
feat: buying module dashboard and onboarding
2020-05-19 20:22:25 +05:30
Deepesh Garg
9a914dc592
fix: Tax amount in GSTR-1 JSON
2020-05-19 20:01:25 +05:30
rohitwaghchaure
aa85e511da
feat: Production Planning Against Sales Order/Material Request/Work Order ( #21763 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-05-19 19:51:45 +05:30
Nabin Hait
ddec05ee07
Merge branch 'marination-stock-dashboard' into develop
2020-05-19 19:08:58 +05:30
Nabin Hait
8b686a5721
feat: stock module dashboard and onboarding
2020-05-19 19:08:30 +05:30
rohitwaghchaure
f128b1c0c5
refactor: changed the fieldtype from data to small text ( #21782 )
2020-05-19 19:05:42 +05:30
Deepesh Garg
e6d9cec6de
Merge pull request #21788 from deepeshgarg007/gst_instate_v13
...
fix: Instate Invoice not appearing in GSTR-1 report
2020-05-19 19:04:24 +05:30
Deepesh Garg
007eda7164
fix: Instate Invoice not appearing in GSTR-1 report
2020-05-19 18:59:36 +05:30
Deepesh Garg
9aaed1de54
Merge pull request #21777 from scmmishra/rename-dash
...
refactor: rename dashboards in desk page
2020-05-19 17:22:29 +05:30
Marica
0e59ae405e
Merge branch 'develop' into purchase-dashboard
2020-05-19 17:09:01 +05:30
marination
50d4bf578b
fix: Date filters added to dashboards, number cards and minor fixes.
2020-05-19 17:02:47 +05:30
Nabin Hait
8db28b5647
Merge branch 'stock-dashboard' of https://github.com/marination/erpnext into marination-stock-dashboard
2020-05-19 16:51:59 +05:30
Shivam Mishra
8caffe2c71
refactor: use text editor in issue web form ( #21767 )
2020-05-19 16:37:34 +05:30
Shivam Mishra
31f00b6052
refactor: rename dashboards in desk page
2020-05-19 15:56:47 +05:30
rohitwaghchaure
65c90959d1
fix: renamed manufacturing dashboards to manufacturing ( #21776 )
2020-05-19 15:54:24 +05:30
Rucha Mahabal
7c759d4276
Merge branch 'develop' into healthcare-charts-and-onboarding
2020-05-19 15:39:27 +05:30
Rucha Mahabal
df1cd0ef70
fix: update default dashboard in Healthcare Desk Page
2020-05-19 15:38:46 +05:30
Marica
e50ca69bb9
Merge branch 'develop' into stock-dashboard
2020-05-19 14:39:31 +05:30
Himanshu
19ecde2197
fix: add naming series ( #21769 )
2020-05-19 14:30:42 +05:30
marination
658f29915a
fix: PR and DN trend report charts, group by fixes
2020-05-19 13:58:13 +05:30
Rucha Mahabal
89dab1bc25
refactor: open links in new tab in form tour
2020-05-19 13:46:06 +05:30
Mangesh-Khairnar
e401be2a1a
Merge pull request #21654 from scmmishra/woocommerce-shipping
2020-05-19 13:31:26 +05:30
marination
64b36dba4f
fix: Changed Form Tour order and grammar fixes.
2020-05-19 13:27:10 +05:30
marination
a5fcaf66f9
fix: Added filters in number Cards
2020-05-19 13:05:22 +05:30
Rucha Mahabal
f472a19889
fix: mark onboarding steps as mandatory
2020-05-19 13:03:22 +05:30
Rohit Waghchaure
84011b79d1
fix: updated manufacturing onboarding and desk
2020-05-19 13:00:54 +05:30
Nabin Hait
f2fb9368db
fix: manufacturing dashboard
2020-05-19 12:32:39 +05:30
Rucha Mahabal
0799c679d4
feat: Healthcare Onboarding
2020-05-19 12:07:23 +05:30
Shivam Mishra
afeed27f8f
Merge branch 'develop' into project-refresh
2020-05-19 11:54:50 +05:30
Shivam Mishra
d3d3836943
style: cleaner conditions and returns
2020-05-19 11:53:28 +05:30
Nabin Hait
b03072f83f
fix: merge conflict
2020-05-19 11:35:08 +05:30
Rucha Mahabal
b8db275a35
feat: Department wise Patient Appointments custom chart
2020-05-19 01:46:48 +05:30
Rucha Mahabal
de3751387a
refactor: Lab Tests and Clinical Procedures charts to Percentage type
2020-05-18 19:15:08 +05:30
Rucha Mahabal
5162faa7df
fix: add default filters in Dashboard Charts
2020-05-18 18:59:59 +05:30
Rucha Mahabal
24477d5d06
feat: added Number Cards to Healthcare Dashboard
2020-05-18 18:15:20 +05:30
Nabin Hait
9aae6f4793
feat: accounting dashboard + desk
2020-05-18 18:03:11 +05:30
Rucha Mahabal
fb29714911
feat: Healthcare Dashboard
2020-05-18 16:28:11 +05:30
Marica
c734db5d45
fix: Validate Filters in Sales Funnel. ( #21761 )
...
* fix: Validate Filters in Sales Funnel.
* fix: Style fixes
2020-05-18 14:38:57 +05:30
Himanshu
d94a38eb51
fix: make queries show searchfields ( #21685 )
...
* fix: make queries show searchfields
* Update erpnext/controllers/queries.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
* Update queries.py
* Update erpnext/controllers/queries.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
* Update erpnext/controllers/queries.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
* fix: make fields string for sql
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-18 14:26:26 +05:30
rohitwaghchaure
be750096ed
fix: bom incorrect price list rate for raw material if price list currency is different from company currency ( #21585 )
...
* fix: bom incorrect price list rate for raw material if price list currency is different from company currency
* fixed test cases
* fixed base_rate calculation and added plc_conversion_rate trigger
2020-05-18 14:23:30 +05:30
Shivam Mishra
4cd4109905
Merge branch 'develop' into woocommerce-shipping
2020-05-18 13:50:31 +05:30
Anurag Mishra
57bfee8ea9
fix: dashboard changes
2020-05-18 13:27:15 +05:30
Rucha Mahabal
1ac2512c73
refactor: desk page colors and filters
2020-05-18 12:55:05 +05:30
Rohit Waghchaure
1c9210b303
made changes in the dashboards, renamed number cards
2020-05-18 11:57:25 +05:30
Rohit Waghchaure
366bce678f
added onboarding for manufacturing
2020-05-18 11:57:25 +05:30
Rohit Waghchaure
34f4a2398b
feat: manufacturing dashboards
2020-05-18 11:57:25 +05:30
Nabin Hait
31b8be6c41
Merge branch 'accounts_dashboard' of https://github.com/deepeshgarg007/erpnext into deepeshgarg007-accounts_dashboard
2020-05-18 11:31:30 +05:30
Deepesh Garg
ec8c28e487
Revert "fix(accounting): Allow 0 threshold in Tax Withholding Category"
2020-05-18 11:27:38 +05:30
Shivam Mishra
2a2937bcbe
Merge branch 'develop' into woocommerce-shipping
2020-05-18 11:19:45 +05:30
Marica
f4f307c36a
fix: Patch to set status in old serial no data ( #21720 )
...
* fix: Patch to set status in old serial no data
* fix: Avoid get_doc in patch
* fix: fetch all values and check status in one query
2020-05-18 11:18:44 +05:30
Nabin Hait
1862f5f29a
feat: Payroll based on employee cost center ( #21609 )
2020-05-18 07:37:04 +05:30
Rucha Mahabal
9e8414798c
Merge branch 'develop' into multi_company
2020-05-17 22:53:03 +05:30
Rucha Mahabal
53934b7e3b
fix: failing test due to inpatient record
2020-05-17 22:44:19 +05:30
Rucha Mahabal
d3a5df2202
fix: codacy issues
2020-05-17 22:34:42 +05:30
Rucha Mahabal
2888e12dfc
fix: vital signs title field
2020-05-17 22:23:53 +05:30
Rucha Mahabal
30314f18f7
fix: patient appointment title
2020-05-17 22:06:02 +05:30
Rucha Mahabal
40d49306d3
fix: pass ignore_mandatory flag when updating customer from patient
2020-05-17 21:46:42 +05:30
Raffael Meyer
3bce13eaa2
fix: remove guest access ( #21693 )
2020-05-17 20:58:37 +05:30
rohitwaghchaure
8e3fc5ee6e
fix: incorrect stock valuation for repack entry ( #21736 )
2020-05-17 20:28:39 +05:30
Anurag Mishra
779fc898b1
fix: Future date half day validation ( #21718 )
...
* fix: Future date half day validation
* fix: Allow half day attendance only via leave application
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-17 20:18:30 +05:30
Rucha Mahabal
e83d1d221d
Merge branch 'develop' into multi_company
2020-05-17 20:02:12 +05:30
Shivam Mishra
bdc97e6b48
Merge branch 'develop' into woocommerce-shipping
2020-05-16 19:40:45 +05:30
Shivam Mishra
d69e3eb5d7
feat: use name instead of customer name to link address and contact
2020-05-16 19:37:03 +05:30
Shivam Mishra
180bda7618
refactor: return address and contact objects
2020-05-16 19:20:55 +05:30
Shivam Mishra
fc514ba940
feat: save contact to woocommerce
2020-05-16 19:19:18 +05:30
Deepesh Garg
bf16956d10
Merge pull request #21656 from kevingdc/bugfix/tax-withholding-category-description
...
fix(accounting): Tax Withholding Category Description default
2020-05-16 18:07:45 +05:30
Deepesh Garg
2a0e3e3515
fix: Remove strip
2020-05-16 18:07:03 +05:30
Deepesh Garg
2567815b03
Merge pull request #21655 from kevingdc/bugfix/zero-threshold-in-tax-withholding-category
...
fix(accounting): Allow 0 threshold in Tax Withholding Category
2020-05-16 17:55:51 +05:30
rohitwaghchaure
7435174300
Merge pull request #21747 from rohitwaghchaure/fix-supplier-schema-save-issue
...
fix: promotional scheme not able to save
2020-05-16 11:34:23 +05:30
Rohit Waghchaure
49dbbdc4cb
fix: promotional scheme not able to savce
2020-05-16 04:59:59 +05:30
marination
75c65fd1b1
fix: Handle empty chart state and change desk dashboard
2020-05-15 23:47:51 +05:30
marination
a74d433cd8
fix: Fixed Dashboard Charts, modified fixtures and minor changes
2020-05-15 23:37:48 +05:30
marination
e46916be56
Merge branch 'develop' of https://github.com/frappe/erpnext into purchase-dashboard
2020-05-15 21:17:25 +05:30
rohitwaghchaure
5cfbdf4bcb
fix: user not able to view product ( #21740 )
2020-05-15 19:36:23 +05:30
Deepesh Garg
7be71c88f2
fix: Better validation message for group accounts ( #21725 )
2020-05-15 19:23:41 +05:30
Deepesh Garg
1b821fec4b
Merge pull request #21742 from nextchamp-saqib/payment-remark-fix
...
fix: update remark on submitting payment entry
2020-05-15 17:48:51 +05:30
Saqib Ansari
03d165ff79
fix: update remark on submitting payment entry
2020-05-15 16:39:02 +05:30
Deepesh Garg
a812ad7555
Merge pull request #21699 from nextchamp-saqib/pur-inv-status-fix
...
fix: purchase inv shows overdue for fraction of outstanding
2020-05-15 15:46:23 +05:30
marination
ec1f9594fa
fix: Refined Onboarding, desk cards and renamed field in Buying Settings
2020-05-15 15:17:11 +05:30
Deepesh Garg
5ee8327415
Merge pull request #21729 from nabinhait/basic-hra-comp
...
fix: Submit perm for other income and removed caching while getting hra and basic from company
2020-05-15 14:44:37 +05:30
Saqib Ansari
940856cc16
fix: add tests for set_status
2020-05-15 14:30:24 +05:30
rohitwaghchaure
2ee400989b
Merge pull request #21273 from marination/quoted-item-report
...
refactor: Quoted Item Comparison Report
2020-05-15 13:47:48 +05:30
marination
2a73b3ef25
Merge branch 'develop' of https://github.com/frappe/erpnext into purchase-dashboard
2020-05-15 13:40:46 +05:30
marination
be5c45a9ae
chore: Fixtures and empty state handling in chart widgets
2020-05-15 13:21:58 +05:30
Deepesh Garg
7d61c03af4
fix: Add missing dimensions in GL entries ( #21689 )
...
* fix: Add misssing dimensions in GL entries
* fix: Add project filter in trial balance report
* fix: Use current dimensions instead of dimensions from asset
2020-05-15 12:58:48 +05:30
Deepesh Garg
d75af70110
Merge pull request #21712 from Mangesh-Khairnar/fix-error-log-title
...
fix: error log title for failing bank transactions
2020-05-15 12:16:53 +05:30
Rohan
200af04657
format: better error messages for invalid coupon codes (develop) ( #21599 )
...
* format: better error messages for invalid coupon codes
* fix: remove unnecessary docstatus check
2020-05-15 12:10:34 +05:30
Mangesh-Khairnar
f984bee5f9
fix: duplicate leave expiry creation ( #21505 )
...
* fix: validate existing ledger entries to avoid duplicates
* patch: remove duplicate ledger entries created
* fix: consider only submitted ledger entries
* fix: delete duplicate leaves from the ledger
* fix: check if duplicate ledger entry exists
* chore: formatting changes
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-15 11:55:42 +05:30
rohitwaghchaure
c649468f37
Fixed typo
2020-05-15 11:35:41 +05:30
theopen-institute
3373dad708
Added a posting_date field to Fee Schedule, which carries forward to created Fees
2020-05-15 08:51:39 +05:45
rohitwaghchaure
b8011197d9
Merge branch 'develop' into quoted-item-report
2020-05-15 04:54:40 +05:30
rohitwaghchaure
10e24d9249
Merge pull request #21600 from anupamvs/lead-customer-issue
...
fix: adding Email and Phone in Contact child table
2020-05-15 04:43:38 +05:30
rohitwaghchaure
abcd40c75f
Merge pull request #21715 from anupamvs/sm-fix
...
fix: Twitter and LinkedIn Auth fix
2020-05-15 04:37:40 +05:30
Saqib
41b47a68b3
fix: item price not fetching when customer is unset in item price ( #21488 )
...
* fix: item price not fetching when customer is unset in item price
* fix: item price of selling type has hidden supplier value
* fix: remove test variable
* fix: test
* patch: invalid customer/supplier based on item price type
* fix: invalid query
* fix: patch
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-05-15 04:24:36 +05:30
marination
3f7678416f
chore: Stock Onboarding
2020-05-15 04:13:02 +05:30
marination
fd8e0becd0
Merge branch 'develop' of https://github.com/frappe/erpnext into stock-dashboard
2020-05-15 01:36:30 +05:30
marination
bb95cd5fd8
chore: Added Dynamic Charts to DN and PR Trends Reports
2020-05-15 01:33:43 +05:30
Deepesh Garg
33f654ebfe
Merge branch 'develop' of https://github.com/frappe/erpnext into accounts_dashboard
2020-05-14 22:57:27 +05:30
Deepesh Garg
8bbac6defc
fix: Onboarding and Dashboard for accounts module
2020-05-14 22:57:11 +05:30
Anupam K
79a8bd1cdf
CRM Onboarding
2020-05-14 18:42:44 +05:30
Shivam Mishra
0fbc96cc8c
Merge pull request #21731 from prssanna/custom-chart-fix
...
fix: add heatmap_year parameter to get
2020-05-14 18:27:07 +05:30
prssanna
39cb749f95
fix: add heatmap_year parameter to get
2020-05-14 18:25:58 +05:30
Nabin Hait
200f80c3d3
fix: Added submit permission in employee other income
2020-05-14 17:18:29 +05:30
Nabin Hait
10df3d5081
fix: Get basic and hra component from db, not from cache
2020-05-14 17:15:36 +05:30
marination
10bd2417ff
feat: Custom Dashboard 'Warehouse wise Stock Value' with Chart Source
2020-05-14 15:35:18 +05:30
marination
021acd0a01
chore: Stock Ageing and Item Shortage Reports with Charts
2020-05-14 13:20:43 +05:30
Suraj Shetty
dde39c3d1a
chore: Drop Python2 support ( #21704 )
...
* chore: Drop Python2 support
* test: Fix test redundancy by removing countries
3 countries seems ennough to test coa template feature
2020-05-14 12:09:36 +05:30
Saqib Ansari
13096cdbfe
fix: invalid conditional statement
2020-05-13 22:02:56 +05:30
Saqib
2b8f307ffe
Merge branch 'develop' into pur-inv-status-fix
2020-05-13 21:56:45 +05:30
Afshan
bd7e535885
Fix: Set General Ledger 'Group By' filter as 'Group by Voucher(Consolidated)' when opened from Invoice ( #21673 )
...
* fix for issue #21419
* changing group by filter to default Group by Voucher (Consolidated)
2020-05-13 19:48:42 +05:30
Anupam K
1aaedd68b9
Twitter and LinkedIn Auth fix
2020-05-13 17:55:18 +05:30
Mangesh-Khairnar
4a9fd9ef6d
fix: error log title for failing bank transactions
2020-05-13 16:11:22 +05:30
Deepesh Garg
12a9328a63
Merge pull request #21668 from abhishekbalam/develop
...
feat(Selling): Territory Wise Treeview In 'Customer Acquisition and Loyalty' Report
2020-05-13 14:26:40 +05:30
Saqib
7adfc34a26
Merge branch 'develop' into pur-inv-status-fix
2020-05-13 14:02:19 +05:30
Anurag Mishra
36aea71fd7
fix: new dashboard and report
2020-05-13 10:47:36 +05:30
Deepesh Garg
e9cc9f99d2
Merge pull request #21702 from abhishekbalam/error_msg_typo
...
fix: typo in error message in loan_security_pledge.py
2020-05-12 19:11:42 +05:30
Abhishek Balam
673e704bb5
typo in error message in loan_security_pledge.py
2020-05-12 19:09:27 +05:30
marination
e4fc5ba83c
fix: Report conditional query simplification.
2020-05-12 18:58:54 +05:30
marination
7adca986fb
chore: Onboarding v2
2020-05-12 18:40:35 +05:30
marination
354b01617e
chore: Dashboard Fixtures
2020-05-12 17:35:17 +05:30
Deepesh Garg
cdeb897fff
fix: Account shortcut in desk page
2020-05-12 17:23:15 +05:30
Shivam Mishra
846ca09950
Merge branch 'develop' of https://github.com/frappe/erpnext into project-refresh
2020-05-12 17:13:59 +05:30
Abhishek Balam
411b125906
new parent updating logic, made requested changes
2020-05-12 15:25:35 +05:30
Saqib Ansari
734bfcdfc2
fix: purchase inv shows overdue for fraction of outstanding
2020-05-12 14:11:33 +05:30
marination
94ba286fd2
Merge branch 'develop' of https://github.com/frappe/erpnext into purchase-dashboard
2020-05-12 13:17:34 +05:30
marination
d99f85bf3c
chore: Fixtures using new sync api
2020-05-12 13:16:05 +05:30
Deepesh Garg
c6bd012e72
Merge branch 'develop' of https://github.com/frappe/erpnext into accounts_dashboard
2020-05-12 11:30:07 +05:30
Shivam Mishra
498f658321
refactor: rename getting started to home ( #21674 )
...
* feat: rename getting started to home
* feat: added patch for renaming
2020-05-11 20:47:08 +05:30
Marica
97715f2877
fix: Message for missing valuation rate ( #21686 )
2020-05-11 20:45:37 +05:30
Deepesh Garg
b52e40037a
fix: Remove domain restriction from Location doctype ( #21659 )
2020-05-11 20:01:57 +05:30
Chinmay Pai
30f26b4457
fix: do not setup charts if not setup_complete or no company found ( #21670 )
...
* fix: do not setup charts if not setup_complete or no company found
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
* chore: remove check for setup_complete
moved the check for setup_complete to frappe
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
* chore: return an empty dict from get_data if company not set
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-05-11 19:54:46 +05:30
sahil28297
28c9468dad
fix(patch): use translated string while setting notification template ( #21679 )
2020-05-11 19:28:10 +05:30
Nabin Hait
85a89812a4
fix: Run income-tax-slab patch only if slab already exists in payroll period ( #21684 )
2020-05-11 19:23:18 +05:30
Marica
8a85b9428b
Merge branch 'develop' into quoted-item-report
2020-05-11 17:56:11 +05:30
Deepesh Garg
e684727923
Merge pull request #21519 from nextchamp-saqib/sales-report-total-row
...
chore: add total row in sales analytics report
2020-05-11 17:07:59 +05:30
Nabin Hait
6e5952fa69
fix: Changed label for payroll working days based on field
2020-05-11 16:11:43 +05:30
Abhishek Balam
87776c335b
code improvements
2020-05-11 15:18:40 +05:30
Deepesh Garg
ece1b4bc5a
Merge pull request #21676 from rohitwaghchaure/fixed-qty-validation-in-stock-entry
...
fix: '<' not supported between instances of 'str' and 'int'
2020-05-11 12:27:20 +05:30
Deepesh Garg
0defefda92
feat: Standard accounts dashboard
2020-05-11 12:14:46 +05:30
Rohit Waghchaure
3a914a7cd7
fix: '<' not supported between instances of 'str' and 'int'
2020-05-11 11:44:45 +05:30
rohitwaghchaure
f6c7461eb8
Merge pull request #21661 from marination/barcode-update
...
fix: Item Barcode stays the same after updating.
2020-05-11 11:01:01 +05:30
rohitwaghchaure
6a61636c58
Merge pull request #21665 from anupamvs/assessment-issue
...
fix: Assessment Plan not getting created
2020-05-11 07:17:46 +05:30
rohitwaghchaure
5abccc1a61
Merge pull request #21601 from rohitwaghchaure/fix-completed-qty-in-work-order
...
fix: work order operation completed qty
2020-05-11 07:07:28 +05:30
rohitwaghchaure
76dd10f48a
Merge pull request #21652 from rohitwaghchaure/fixed-branch-code-and-swift-number
...
fix: wrong fieldname branch_code in add_fetch
2020-05-11 07:06:42 +05:30
Deepesh Garg
e720882410
Merge pull request #21642 from kevingdc/bugfix/fix-budget-variance-report
...
fix(accounting): fix incorrect output in Budget Variance Report
2020-05-10 17:27:46 +05:30
Deepesh Garg
b81bd5f70c
fix: Formatting fixes
2020-05-10 17:24:11 +05:30
Abhishek Balam
500dff63e7
fix: adjusted width of colums to see full column names, also fixes #21556
2020-05-10 14:53:59 +05:30
Abhishek Balam
5ec5584319
In treeview, bold only for root territory, looks cleaner
2020-05-10 00:24:43 +05:30
Abhishek Balam
7cbc902d90
removed validation for root node in territory, codacy recommended changed
2020-05-09 22:35:28 +05:30
Abhishek Balam
b59f2780eb
fix: renamed view types, added default
2020-05-09 22:09:02 +05:30
Abhishek Balam
d543830a59
feat(Selling): Added Territory wise treeview to 'Customer Acquistion and Loyalty' report
2020-05-09 21:56:53 +05:30
Suraj Shetty
65d3ac814d
fix: Add accidentally removed function
2020-05-09 17:39:59 +05:30
Anupam K
aadf264b49
Assessment Plan not getting created
2020-05-09 16:15:51 +05:30
Suraj Shetty
d53822f012
Merge pull request #21618 from scmmishra/sync-dashboards
2020-05-09 14:15:20 +05:30
Kevin Chan
bc05855805
fix: Simplify get_dimension_account_month_map
...
This commit updates get_dimension_account_month_map to no longer show
the actual expense when there is no budget. This also removes the other
functions and queries related to it. Spaces are also converted to tabs.
2020-05-09 16:02:11 +08:00
Deepesh Garg
9b70a0ac18
Merge pull request #21663 from deepeshgarg007/gross_net_profit
...
fix: Gross and net profit report fix
2020-05-08 19:56:58 +05:30
Deepesh Garg
3392e6b80c
fix: User filters instead of hardcoded values
2020-05-08 19:53:09 +05:30
Deepesh Garg
8d9f86f781
fix: Gross and net profit report fix
2020-05-08 19:45:57 +05:30
Anupam K
be6eb201b7
Appending Email and Phone in Child Table
2020-05-08 17:33:21 +05:30
marination
65123d2adc
fix: Item Barcode stays the same after updation.
2020-05-08 16:30:46 +05:30
rohitwaghchaure
8b9574d434
Merge pull request #21657 from rohitwaghchaure/fixed-stock-and-account-value-comparison-report
...
fix: local variable 'lft' referenced before assignment
2020-05-08 15:39:24 +05:30
Rohit Waghchaure
074ea2f882
fix: local variable 'lft' referenced before assignment
2020-05-08 15:33:35 +05:30
Kevin Chan
9d81f97fe6
fix: Tax Withholding Category Description default
...
This commit fixes a bug that happens when a Purchase Invoice uses a
Tax Withholding Category without a category_name. The category_name is
used as the tax description which is a required field. The bug was
fixed by using the Tax Withholding Category's name as the description
if the category_name is empty.
2020-05-08 18:01:18 +08:00
Kevin Chan
e29283630b
fix: Zero threshold in Tax Withholding Category
...
This fixes a bug in Tax Withholding Category where if it has a threshold
of 0, it doesn't apply to Purchase Invoices. The bug was fixed by
updating the condition.
2020-05-08 17:45:08 +08:00
Shivam Mishra
a788ab281e
fix: typo in function name
2020-05-08 15:13:48 +05:30
Shivam Mishra
da41724d9d
feat: save shipping address to woocommerce customer
2020-05-08 15:12:08 +05:30
Rohit Waghchaure
7d4ccdf240
fix: wrong fieldname branch_code in add_fetch
2020-05-08 13:27:25 +05:30
sahil28297
5b1a0fe00e
fix: bump erpnext develop to version 13-dev ( #21651 )
2020-05-08 13:06:50 +05:30
rohitwaghchaure
b29926c913
Merge pull request #21632 from SDLyu/patch-1
...
format: Add address template for Taiwan.
2020-05-08 11:12:36 +05:30
rohitwaghchaure
f0385d0671
Merge pull request #21638 from MyuddinKhatri/lead-update-fix-v13
...
fix(crm): fix lead while updating contact details (develop)
2020-05-08 10:37:11 +05:30
rohitwaghchaure
67c33d1f8b
Merge pull request #21643 from sahil28297/fix_lead_name
...
fix(lead): strip lead_name before splitting
2020-05-08 10:35:48 +05:30
rohitwaghchaure
e74f689ffa
Merge pull request #21644 from anupamvs/lms-label
...
fix: renaming LMS to Learning Management System
2020-05-08 10:29:39 +05:30
rohitwaghchaure
6a9c84b5f6
Merge pull request #21641 from frappe/mergify/bp/develop/pr-21635
...
fix: Job Card submitted qty (bp #21635 )
2020-05-08 10:28:19 +05:30
rohitwaghchaure
02af52fffb
Merge pull request #21612 from anupamvs/social-media-auth
...
fix: fixing callback urls
2020-05-08 10:27:43 +05:30
rohitwaghchaure
b310d6f372
Merge pull request #21649 from anupamvs/payment-order-fix
...
fix: Payment Order not allowing to create Payment Entry
2020-05-08 10:26:42 +05:30
Anupam K
8b52697723
Payment Order not allowing to create Payment Entry
2020-05-08 02:23:28 +05:30
Rucha Mahabal
383a94d730
fix: delete old appointment analytics tree grid report
2020-05-07 23:32:53 +05:30
Anupam K
ebf3b78b42
renaming LMS to Learning Management System
2020-05-07 19:20:16 +05:30
Marica
c1a890a739
Merge branch 'develop' into quoted-item-report
2020-05-07 17:45:32 +05:30
marination
31a747b98a
fix: Query enhancement, cleanup, added extra filter
...
- Query changes as requested
- Moved chart generation from js to py
- Added Supplier Multiselect filter
2020-05-07 17:38:00 +05:30
