Zlash65
dcf7401104
random time fix and other minor fixes
2018-10-10 14:28:16 +05:30
Zlash65
143d4da901
Production Plan fix
2018-10-10 14:28:16 +05:30
Zlash65
c24d2fdf6c
setup leave & expense approver for each department
...
- assign approver in expense claim
2018-10-10 14:28:16 +05:30
Zlash65
a259466643
add relevant department to employees
2018-10-10 14:28:16 +05:30
Zlash65
0309bbee30
function call requires company as parameter
2018-10-10 14:28:16 +05:30
Zlash65
796bffbee1
fix payroll and stock related data
2018-10-10 14:28:16 +05:30
Zlash65
4c07970545
remove user permission from HR Manager user
2018-10-10 14:28:16 +05:30
Zlash65
fa7c8a9f8b
update employee and user records
2018-10-10 14:28:16 +05:30
Saurabh
99c064305f
Merge branch 'master' into staging-fixes
2018-10-09 17:55:33 +05:30
Saurabh
2dc8972794
bumped to version 10.1.58
2018-10-09 18:25:32 +06:00
Zlash65
a1036ad50b
setup wizard failing fix
2018-10-09 17:38:28 +05:30
Shreya Shah
8a4bcefec4
fix(accounts-receivable): Column values in Print and PDF ( #15621 )
2018-10-08 18:34:01 +05:30
Shreya Shah
5b34d00bc0
fix(accounts-receivable): Column values in Print and PDF ( #15622 )
2018-10-08 18:20:51 +05:30
Nabin Hait
d2c5b50842
fix(warehouse-account): get warehouse account map fallback handling ( #15625 )
...
* fix(warehouse-account): get warehouse account map fallback handling
* fix: import issue
2018-10-08 18:19:53 +05:30
Ameya Shenoy
563b1d153b
bumped to version 11.0.3-beta.9
2018-10-08 09:43:48 +00:00
Ameya Shenoy
ecba14e6cf
Merge branch 'master' into staging-fixes
2018-10-08 09:39:49 +00:00
Ameya Shenoy
b509b06edf
bumped to version 10.1.57
2018-10-08 09:37:37 +00:00
Zarrar
87441bf62e
columns without fieldname's data not shown ( #15618 )
2018-10-08 14:34:34 +05:30
Zarrar
5fcccda883
[Minor] Supplier Quotation ( #15578 )
...
* throw meaningful error if RFQ does not have selected supplier
* Update supplier_quotation.py
* codacy fix
2018-10-08 14:30:53 +05:30
Shreya Shah
4fb9230d16
Add missing method link_to_mrs to buying.js ( #15613 )
2018-10-08 14:18:03 +05:30
Shreya Shah
95d93913ce
fix(link_to_mr): Add missing method to buying.js ( #15616 )
2018-10-08 14:17:37 +05:30
Shreya Shah
37d3686372
fix(setup_taxes): Pop if frappe.message_log ( #15615 )
2018-10-08 14:17:16 +05:30
Ameya Shenoy
0bd254b02b
bumped to version 11.0.3-beta.8
2018-10-08 07:27:35 +00:00
rohitwaghchaure
5e466bace4
Removed update_job_card_reference method ( #15614 )
2018-10-08 12:36:45 +05:30
Shreya Shah
c2857fd2cc
fix(setup_taxes): Pop if frappe.message_log ( #15611 )
2018-10-08 12:35:18 +05:30
Jamsheer
063cf9c582
Jam staging fixes ( #15608 )
...
* Test Inpatient Record - Fix
* Test Inpatient Record - Fix
2018-10-08 10:48:42 +05:30
Ameya Shenoy
cfdd629fd7
bumped to version 11.0.3-beta.7
2018-10-07 07:59:34 +00:00
Ameya Shenoy
272956980d
Merge pull request #15606 from codingCoffee/abc
...
fix: make location from warehouse patch
2018-10-07 13:25:05 +05:30
Ameya Shenoy
f7b5b7beb4
fix: make location from warehouse patch
...
- optimization by preventing patch execution if Asset doesn't exist
2018-10-07 13:08:00 +05:30
Ameya Shenoy
cd9be8f0a6
bumped to version 11.0.3-beta.6
2018-10-07 06:23:22 +00:00
Shreya Shah
5615cb4735
Set default only if customer_address not found ( #15605 )
...
* Set default only if customer_address not found
* Similar fix for Purchase Invoice and shipping_address
2018-10-07 11:42:07 +05:30
Shreya Shah
e7e269d4a4
[Error] Display appropriate msg if company is different for TDS ( #15601 )
...
* fix(tds): Display appropriate msg if company is different
* Update tax_withholding_category.py
2018-10-06 17:56:21 +05:30
Zlash65
58a080a1b1
add voucher detail no while creating gl entry
2018-10-06 16:34:58 +05:30
Ameya Shenoy
538678afc4
bumped to version 11.0.3-beta.5
2018-10-05 09:09:53 +00:00
Ameya Shenoy
ad908779be
Merge branch 'master' into staging-fixes
2018-10-05 08:54:58 +00:00
Ameya Shenoy
97dbb4d125
bumped to version 10.1.56
2018-10-05 08:54:46 +00:00
Shreya Shah
5cff01634e
Merge pull request #15593 from Zlash65/fix-mod
...
[Minor] Item master - get_query for deferred accounts
2018-10-05 14:14:46 +05:30
Shreya Shah
32206029ac
Fix Codacy
2018-10-05 14:14:33 +05:30
Shreya Shah
deb9f0e03c
Merge pull request #15594 from shreyashah115/tds-report
...
Handle IndexError if no data found
2018-10-05 14:11:43 +05:30
Shreya Shah
db5ffce742
Merge pull request #15592 from shreyashah115/jv
...
Allow Reverse JV for all submitted docs
2018-10-05 13:33:11 +05:30
Shreya
0d7bd43367
Handle IndexError if no data found
2018-10-05 13:22:09 +05:30
Zlash65
2123b97d31
add get_query for revenue and expense account
2018-10-05 12:26:32 +05:30
Shreya
4f5214a136
Allow reverse jv for all submitted docs
2018-10-05 12:19:09 +05:30
Saif
00a16a9337
set_item_default was referencing a variable company of "company" ( #15576 )
2018-10-05 11:54:03 +05:30
Shreya Shah
17ac38ff29
Enable save before saving to update form after save ( #15579 )
2018-10-05 11:51:13 +05:30
Jamsheer
be6e426fe0
Healthcare Service Unit - added company abbr as suffix ( #15590 )
2018-10-05 11:38:15 +05:30
Ranjith Kurungadam
dc2bab2b72
fix healthcare patch ( #15584 )
2018-10-05 11:36:58 +05:30
Valmik
4c61861163
Add Delivery Trip to Delivery Note dashboard ( #15587 )
2018-10-05 11:36:31 +05:30
Saif
4faea037bb
Remove Test Letter Head from GSTR-1 ( #15591 )
2018-10-05 11:35:01 +05:30
Ameya Shenoy
2291558c5f
bumped to version 11.0.3-beta.4
2018-10-04 13:14:29 +00:00
rohitwaghchaure
d69dc954c7
Merge pull request #15580 from sagarvora/fix-TabError
...
fix TabError in install_fixtures.py
2018-10-04 17:22:44 +05:30
Ameya Shenoy
5ae344593e
bumped to version 11.0.3-beta.3
2018-10-04 11:42:56 +00:00
Rohit Waghchaure
18678696db
Fix issue after merging hotfix into staging-fixes
2018-10-04 16:33:43 +05:30
Ameya Shenoy
7d929c508f
Merge branch 'master' into staging-fixes
2018-10-04 09:25:07 +00:00
Ameya Shenoy
79dc8ac9cc
bumped to version 10.1.55
2018-10-04 09:11:50 +00:00
Rohit Waghchaure
9f2859701e
[Fix] WorkOrderItem object has no attribute operation
2018-10-04 13:25:49 +05:30
Sagar Vora
b13b9b4ed3
fix TabError in install_fixtures.py
2018-10-04 11:39:20 +05:30
Zlash65
6e3b1a58a1
service_stop_date should be editable after submit
2018-10-04 09:30:27 +05:30
rohitwaghchaure
f9930ff2a4
Merge pull request #15573 from rohitwaghchaure/cost_center_issue_while_saving
...
[Fix] Cost center issue
2018-10-03 18:47:28 +05:30
Shreya Shah
3204c94fdd
Merge pull request #15570 from shreyashah115/fix-filter-error
...
[Bug] Item wise sales register filters
2018-10-03 17:38:41 +05:30
Shreya
cbb112f2db
Fix filter error
2018-10-03 17:37:40 +05:30
Rohit Waghchaure
8bf9f377dd
[Fix] Cost center issue
2018-10-03 16:59:43 +05:30
Rohit Waghchaure
d1b87ba41c
Book cost of goods sold instead of stock adjustment
2018-10-03 16:29:43 +05:30
rohitwaghchaure
d6cacbe565
Merge pull request #15567 from rohitwaghchaure/fix_payment_request
...
[Fix] Payment request not working
2018-10-03 16:03:48 +05:30
Rohit Waghchaure
210f4984f7
[Fix] Payment request not working
2018-10-03 15:55:51 +05:30
Charles-Henri Decultot
75fa6b3ee8
[Enhancement] Improvement to the sales pipeline ( #15524 )
...
* Additions to sales pipeline
* Codacy corrections
* Codacy corrections
* Codacy corrections
* Replace _ with dummy for unused variable
* Performance + dates corrections
* Itertuples modification
* Removing trailing whitespaces
* Sales stage doctype
* Divide sales stages fixtures in separate functions
* Remove duplicate fixtures
* Add newline after method
* Missing requirement
2018-10-03 10:41:40 +05:30
Charles-Henri Decultot
efd776da46
Events in timeline ( #15485 )
...
* Events in timeline
* Namespace correction
* Codacy correction
* Addition of sales partners in participants
* Correct json indent
2018-10-03 10:41:26 +05:30
rohitwaghchaure
a5576f5b21
[Fix] Stock difference between gl entry and stock ledger entry booked in stock adjustment ( #15374 )
2018-10-03 10:39:50 +05:30
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
Shreya Shah
7d115183e4
Improvise and fix indicators in Portal list ( #15552 )
2018-10-02 12:46:26 +05:30
Charles-Henri Decultot
3b11debcd2
Gocardless correction ( #15554 )
2018-10-02 12:46:15 +05:30
Charles-Henri Decultot
b2281cc1fd
Lead to customer UX enhancement ( #15525 )
...
* Lead to customer UX enhancement
* Market segment
* Market Segment to DocType
* Specific function for fixtures
* Merge issue correction
* Doctype merge correction
2018-10-02 11:25:00 +05:30
Shreya Shah
5a2aced586
Merge pull request #15551 from Zlash65/minor-fix
...
[Minor] Delivery trip test fix
2018-10-02 11:12:51 +05:30
Rushabh Mehta
11e2119670
style(icon): revert to old icon
2018-10-02 11:06:55 +05:30
Zlash65
6a5e6ed2ff
delivery trip notification to customer fix
2018-10-01 17:28:42 +05:30
Zlash65
9e67b8ec4d
fix driver name selection
2018-10-01 17:27:12 +05:30
Zlash65
622bd10946
add date data [mandatory]
2018-10-01 15:37:31 +05:30
rohitwaghchaure
8976ad5ca1
Merge pull request #15523 from rohitwaghchaure/fix_attendance_tool_issue
...
[Fix] Attendance tool
2018-10-01 15:07:49 +05:30
Rohit Waghchaure
c7f8b82fff
[Fix] Attendance tool
2018-10-01 12:30:58 +05:30
Rohit Waghchaure
8fbf856618
[Fix] Salary slip
2018-10-01 12:00:45 +05:30
Saif
90cf2ddc01
Make pricing rule from Supplier and Customer Doc ( #15533 )
...
* Make pricing rule from Supplier and Customer Doc
* Make sure the "+" button also works the same way as the "Make" button
2018-09-30 22:16:31 +05:30
Alchez
6ecb2556b7
Add Delivery Settings + improve 'Notify Customers' functionality ( #15322 )
...
* Add Delivery Settings + improve 'Notify Customers' functionality
* Minor improvements
* Add patch to create a default dispatch notification template
* Fix travis errors
2018-09-30 21:38:47 +05:30
Charles-Henri Decultot
4fd7a4e0d7
Lead notes ( #15510 )
...
* Notes field in Lead
* Add notes to lead details report
2018-09-30 21:20:55 +05:30
Zarrar
e4c9ac3961
[Minor] Cash Flow report - custom ( #15522 )
...
* python 2-3 fix for filter
* pass filters while fetching data to financial statement report
2018-09-30 21:19:01 +05:30
rohitwaghchaure
90f9f9d3d8
Code optimization for deferred revenue ( #15527 )
2018-09-30 21:12:50 +05:30
Faris Ansari
6575e52942
fix: Refactor Review Area according to new Text Editor ( #15536 )
...
- depends on https://github.com/frappe/frappe/pull/6159
2018-09-30 21:08:46 +05:30
rohitwaghchaure
1cf71d96b1
Merge pull request #15530 from rohitwaghchaure/consolidated_report_issue_v11
...
[Fix] Consolidated Financial Statement report
2018-09-28 17:06:57 +05:30
Rohit Waghchaure
ea0ef95539
[Fix] Consolidated Financial Statement report
2018-09-28 17:05:55 +05:30
Saif
c2dd9ab778
Fix the problem that naming series would remove trailing '-' from series prefix if ##### was not entered ( #15514 )
2018-09-27 15:48:04 +05:30
Shreya Shah
0fc4917d81
Merge pull request #15516 from shreyashah115/product-page
...
Fetch Item Group's name and image on website
2018-09-27 15:12:42 +05:30
Shreya
5c335550e3
Fetch item_group's name and image on website if children
2018-09-27 13:55:59 +05:30
Nabin Hait
7d6d678e8d
purchase receipt return entry in dashboard
2018-09-26 19:04:11 +05:30
Nabin Hait
c22ba2ec26
fix(sales return): validation message fix
2018-09-26 18:56:45 +05:30
Nabin Hait
183972f58f
fix(stock_entry): allow creating stock entry against work order even if item rate is zero
2018-09-26 18:34:07 +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
deepeshgarg007
c3772f1ac4
minor fix ( #15503 )
2018-09-26 15:55:43 +05:30
Shreya Shah
352e6494f3
Contact and email fields in Payment Entry ( #15490 )
...
* Add contact_person and contact_email fields to Payment Entry
* Minor fix
* Map contact details while making Payment Entry
* Update payment_entry.py
2018-09-26 15:38:34 +05:30
rohitwaghchaure
0cf0ebf08b
[Refactored] Asset Depreciation Ledger report based on GL entries ( #15415 )
...
* [Refactored] Asset Depreciation Ledger report is based on GL entries
* Provision to make manual JV from the asset if Calculate Depreciation is disabled
2018-09-26 15:24:49 +05:30
Ameya Shenoy
90197dd341
bumped to version 11.0.3-beta.2
2018-09-26 08:52:54 +00:00
Ameya Shenoy
12ec142a69
fix(multiple): syntax and patch
...
- syntax fix for using super class
- check "All Departments" in department name with translations
2018-09-26 14:05:48 +05:30
Ameya Shenoy
b8a5fb7392
bumped to version 11.0.3
2018-09-26 07:32:44 +00:00
Ameya Shenoy
9d3a97fd15
Merge branch 'master' into staging-fixes
2018-09-26 07:28:53 +00:00
Ameya Shenoy
e04431ea5c
bumped to version 10.1.54
2018-09-26 07:26:49 +00:00
deepeshgarg007
86152eb5c8
Sales person Commission Report and more ( #15431 )
...
* Commission For Sales Person
* Changes Made
* Changes made in sales person dashboard and commission report
* Update sales_person_commission_summary.py
2018-09-25 19:08:16 +05:30
rohitwaghchaure
fafc277666
[Fix] BOM update tool, too many writes in one request. Please send smaller requests ( #15432 )
2018-09-25 18:59:20 +05:30
rohitwaghchaure
fe1e4a41e6
Validate negative stock serial number ( #15492 )
2018-09-25 18:36:32 +05:30
Faris Ansari
7a8c5b0c2c
fix(setup wizard): Validate FY dates ( #15473 )
2018-09-25 18:34:33 +05:30
Aditya Hase
a38b77cbfd
feature(chart-of-accounts): Rebuild HSM Tree after bulk insertion ( #15457 )
...
* feature(chart-of-accounts): Rebuild HSM Tree after bulk insertion
* Update chart_of_accounts.py
2018-09-25 18:10:50 +05:30
Zarrar
b113349f31
minor fix for auto-opt-in for customer ( #15483 )
2018-09-24 14:30:07 +05:30
Ameya Shenoy
cdedb27cf0
bumped to version 11.0.2
2018-09-21 11:04:20 +00:00
Zarrar
e83ff38c10
[Enhance] Deferred Expense ( #15437 )
...
* added section for deferred expense in item master
* added default expense account field in Company master
* added deferred expense section in purchase invoice item
* validation and getter code added
* scheduler event to book expense every month
* codacy, import fix and other minor fixes
* rectify debit credit logic for expense
* commonify js code for deferred expense and revenue
* remove deferred calculation and validation
* common file to calculate deferred revenue and expense
* codacy fixes
* expense account root_type - Asset, specific method naming
2018-09-21 15:45:40 +05:30
Saurabh
3ef12bb7f2
bumped to version 11.0.1
2018-09-20 14:00:46 +06:00
Saurabh
75d90b9d8f
a[resolved] merge-conflicts
2018-09-20 13:28:23 +05:30
Saurabh
3b281a0a1b
bumped to version 10.1.53
2018-09-20 13:52:36 +06:00
Saif
772dc6e82c
Various permission fixes ( #15448 )
...
* Removed test letter head from Consolidated Financial Statement
* Removed incorrect role permissions
2018-09-20 13:20:17 +05:30
rohitwaghchaure
a60ab1af75
[Fix] Salary slip is not saving ( #15449 )
2018-09-20 13:18:49 +05:30
Nabin Hait
8fb04ff1b2
Merge branch 'develop' into staging-fixes
2018-09-20 12:51:26 +05:30
rohitwaghchaure
550fc695f1
[Fix] Precision issue in the accounts receivable report ( #15440 )
2018-09-19 19:03:40 +05:30
Ameya Shenoy
a2f0b34147
fix(item, item default): changed the modified date ( #15442 )
...
The patch move_item_defaults_to_child_table_for_multicompany used to
fail since the doctypes Item and Item Defaults weren't reloaded properly
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-09-19 19:02:52 +05:30
Ameya Shenoy
28fd02e4a8
fix(desktop_icon): remove land unit icon if exists ( #15430 )
...
* fix(desktop_icon): remove land unit icon if exists
Patch to delete the 'Land Unit' icon form 'Desktop Icon' doctype if
exists, since 'Land Unit' has been merged with 'Location'
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
* Update remove_land_unit_icon.py
2018-09-19 13:15:52 +05:30
Faris Ansari
2ab6e0e39b
fix(translations): Replace translations by keyword with indexed version ( #15426 )
...
* fix(translations): Replace translations by keyword with indexed version
Keywords in the translation also gets translated which
results in an error because python cannot find the key
* Update buying_controller.py
2018-09-19 13:13:59 +05:30
Mangesh-Khairnar
0374cc54ba
[bug fix]:stopped orders in progress report ( #15428 )
2018-09-19 13:10:53 +05:30
Nabin Hait
63a58a6752
Merge branch 'staging' into develop
2018-09-18 11:44:42 +05:30
Shreya Shah
13761dde38
[Report] Lead Conversion Time ( #15237 )
...
* New Report Lead Conversion Time
* Add column for support tickets and a row for Average
2018-09-18 10:55:35 +05:30
Jamsheer
c07e8e5b0d
[Fix] Healthcare minor fixes and field rename ( #15413 )
...
* Healthcare practitoiner in Clinical Procedure
* Insert and Update Patient Medical Record from Healthcare DocTypes
* vital signs remove extra columns
* Rename Healthcare Field test_name
* Healthcare Util - get_drugs_to_invoice - fix
* Rename Healthcare Field test_code
* Rename Healthcare Field test_comment
* Rename Healthcare Field test_created
* Rename Healthcare Field test_template
* Rename Healthcare Field test_rate
* Rename Healthcare Field test_description
* Rename Healthcare Field test_groups
* Rename Healthcare Field test_group
* Rename Healthcare Field test_template_type
* Rename Healthcare Field test_uom
* Rename Healthcare Field test_normal_range
* Rename Healthcare Field test_event
* Rename Healthcare Field test_prescription
* Rename Healthcare Field test_particulars
* Patch - Rename healthcare fields
* Sales Invoice - Filter updated for get drugs to invoice
* Patient Appointment - fix - get_event
2018-09-18 10:54:03 +05:30
RicardoJohann
267e806d7f
added description field and changed to one filter datepicker ( #15425 )
2018-09-18 10:48:20 +05:30
JC
31f2c1c3d3
fix ‘BOMItem’ object has no attribute ‘operation’ error in bench run-tests --doctype ‘BOM’ ( #15423 )
2018-09-18 10:47:27 +05:30
Govind S Menokee
d38160c816
[FIX] Remove deprecated gen_object.next() function ( #15418 )
...
BOM tree view was getting impacted due to use of a deprecated function.
This fix replaces deprecated object.next() function with next(gen_object).
2018-09-18 10:42:21 +05:30
Faris Ansari
aa856c474a
fix(setup wizard): Validate FY dates ( #15419 )
...
- start date should be less than end date
2018-09-18 10:42:04 +05:30
Frappe PR Bot
db8c1f254e
[Translation] Updated Translations ( #15414 )
2018-09-17 16:54:30 +05:30
Charles-Henri Decultot
d6bce7429e
Bank statement import corrections ( #15405 )
...
* Bank statement import corrections
* Bank statement corrections
* Missing semi-columns
2018-09-17 12:34:11 +05:30
Zarrar
013493de7a
lable for discount_amount should be configurable ( #15408 )
2018-09-17 11:06:49 +05:30
theopen-institute
ba1c0c900d
Fix potential crash in payment_entry.py ( #15411 )
...
The new code for cost center checking in payment_entry.py crashes if `voucher_type` is `None`, which is an explicit possibility if party type is Employee. This commit adds a simple check to make sure that voucher_type is not None before running `get_doc`.
2018-09-17 10:59:39 +05:30
Zarrar
e79e4cb9b1
python 2-3 fix, *.keys() return dict_keys object in py3 ( #15409 )
2018-09-17 10:56:42 +05:30
Zarrar
ada13213c0
reload Patient Appointment doctype with added fields ( #15397 )
2018-09-14 15:32:04 +05:30
Faris Ansari
31e5431fe0
fix(urljoin): 2 and 3 compatible ( #15401 )
2018-09-14 15:31:35 +05:30
Zlash65
2619596917
pass filters as parameter
2018-09-13 12:56:04 +05:30
Nabin Hait
5be3968544
fix(add_file): added missing init file
2018-09-12 18:56:15 +05:30
Ameya Shenoy
ecac822613
Merge pull request #15393 from codingCoffee/hub
...
fix(patch): delete hub documents
2018-09-12 17:50:02 +05:30
Ameya Shenoy
18310c240f
fix(patch): delete hub documents
...
While deteting the "Data Migratun Plan" docs the patch used to break,
since it was linked to docs from "Data Migration Run". Modified the
patch to also delete the linked "Data Migration Run" docs.
2018-09-12 17:46:58 +05:30
Doridel Cahanap
6d0ae5b23b
Allow Rename for Custom Tariff ( #15389 )
2018-09-12 17:13:12 +05:30
Prateeksha Singh
5ba14fe685
[patch][fix] remove hub node module removing code
2018-09-12 16:59:17 +05:30
Prateeksha Singh
238ed98653
Re-add Hub Node module
2018-09-12 16:36:10 +05:30
Nabin Hait
9fde97cdd2
Fixed merge conflict
2018-09-12 15:45:20 +05:30
Saurabh
393dd4286a
[resolved] merge-conflicts
2018-09-12 14:48:30 +05:30
Saurabh
6d5a29af6a
bumped to version 10.1.52
2018-09-12 15:14:25 +06:00
Zarrar
8dade79002
return blank if no data found ( #15387 )
2018-09-12 14:24:23 +05:30
Nabin Hait
6173e091ee
fix(test): test cases fixed
2018-09-12 11:46:20 +05:30
Zarrar
2b6584a296
accounts table should be mandatory in budget ( #15386 )
2018-09-12 11:14:24 +05:30
Ahmed Madi
20d8c52d2a
Update salary_slip.js ( #15200 )
2018-09-12 11:02:57 +05:30