Rushabh Mehta
2f0dbd9bd8
[fix] test
2016-07-20 15:28:39 +05:30
Faris Ansari
8908d19bc9
[mobile ui] fix buttons
2016-07-20 14:00:08 +05:30
Nabin Hait
e2d0d7c5db
Merge pull request #5799 from nabinhait/fix104
...
Fixes
2016-07-20 12:38:49 +05:30
Nabin Hait
430a97aeba
Merge pull request #5800 from nabinhait/fix105
...
Patch fixed for expense claim type
2016-07-20 12:17:15 +05:30
Nabin Hait
9a5dc452f1
Patch fixed for expense claim type
2016-07-20 12:16:35 +05:30
Rushabh Mehta
fc8e589295
[fix] party status updating bug, fixes #5794 , #5796
2016-07-20 12:09:27 +05:30
Nabin Hait
9d93ad92bc
minor fixes
2016-07-20 11:28:50 +05:30
Nabin Hait
85648d9bd6
payment entry fixes
2016-07-20 11:28:50 +05:30
Nabin Hait
b1234fa5e8
Set missing values in asset
2016-07-20 11:28:50 +05:30
Nabin Hait
df2a75ad1d
Updated standard chart of accounts
2016-07-20 11:27:58 +05:30
Rushabh Mehta
c0cc9902d9
Merge pull request #5776 from saurabh6790/warehouse_accounting_fix
...
[fix] for setting warehouse in account head
2016-07-19 21:35:09 +05:30
Rushabh Mehta
f997c6981d
Merge pull request #5770 from saurabh6790/demo_expense_claim
...
[enhance] demo for expense claim #5731
2016-07-19 21:34:30 +05:30
Rohit Waghchaure
88514a246b
set paid amount with grand amount on invoice form
2016-07-19 20:04:44 +05:30
Rushabh Mehta
636acc2565
[minor] run stock reco in background if more than 100 items, fixes #4904
2016-07-19 17:14:48 +05:30
Saurabh
9cba6e1f25
[fix] test case fix for expense claim
2016-07-19 11:38:16 +05:30
Saurabh
718d835f45
[enhance] Add Accounts table in to mention expense account based on company #5777
2016-07-19 11:38:16 +05:30
Saurabh
f589c82d68
[enhance] demo for expense claim #5731
2016-07-19 11:38:15 +05:30
Rushabh Mehta
771773240b
Merge pull request #5788 from rohitwaghchaure/clean_timesheet
...
billable field access from grid and create timesheet without employee
2016-07-19 10:43:09 +05:30
Rushabh Mehta
02ba94784b
Merge pull request #5785 from rohitwaghchaure/batch_added_in_pos
...
[POS] Added batch and fixed issue of searching serial no #5779
2016-07-19 10:19:52 +05:30
Rushabh Mehta
6ecc0888ab
[minor] dont make tax template default, by default. #5695
2016-07-19 10:17:30 +05:30
Rohit Waghchaure
f14bf502ef
billable field access from grid
2016-07-18 23:30:46 +05:30
Rohit Waghchaure
03da40ba4c
[Fix] Added batch in POS
2016-07-18 17:50:50 +05:30
Rushabh Mehta
5f9566f3af
[fix] text field for sales, purchase invoice advance fixes #5773
2016-07-18 14:44:12 +05:30
Rushabh Mehta
5c52fa9785
[fix] variant error message
2016-07-18 14:40:14 +05:30
Rushabh Mehta
76b134192f
[fix] grid columns now restricted to 10
2016-07-18 14:30:27 +05:30
Nabin Hait
4fddff1606
Merge pull request #5767 from nabinhait/fix101
...
Payment Improvements
2016-07-16 11:55:12 +05:30
Nabin Hait
2842a86225
Merge pull request #5775 from revant/patch-1
...
Issue #5774
2016-07-16 11:28:15 +05:30
Nabin Hait
94105b04b8
Asset category mandatory validation while fetching item details
2016-07-16 11:20:50 +05:30
Saurabh
dcb41da02a
[fix] for setting warehouse in account head
2016-07-16 11:17:43 +05:30
Revant Nandgaonkar
88e16a7f82
removed force=True
2016-07-16 11:00:37 +05:30
Nabin Hait
37dd714e6c
Is Stock Item checkbox visibility
2016-07-16 11:00:29 +05:30
Nabin Hait
96376b2345
Trigger receive/paid amount on change of paid from/to
2016-07-16 11:00:29 +05:30
Nabin Hait
6831b9422b
payment entry improvements and deletion of payment tool
2016-07-16 11:00:29 +05:30
Nabin Hait
4f5f8d7806
Set target exchange rate from source if currency is same
2016-07-16 10:59:48 +05:30
Nabin Hait
e6cdb01bea
[fix] Query for account fields in Company
2016-07-16 10:59:48 +05:30
Nabin Hait
530b86b9b2
Merge pull request #5752 from KanchanChauhan/employee-holiday-attendance-report-renamed
...
Employee Attendance report renamed to Employees working on a holiday
2016-07-16 10:58:52 +05:30
Nabin Hait
4d64f6d4b4
Merge pull request #5772 from rohitwaghchaure/demo_records
...
Demo records for timesheet
2016-07-16 10:52:03 +05:30
Revant Nandgaonkar
cc08682879
Issue #5774
2016-07-15 23:41:22 +05:30
Rohit Waghchaure
ecb2031bbe
[Fix] Timesheet workstation holiday issue
2016-07-15 20:11:01 +05:30
Rohit Waghchaure
8002d47ff6
Demo records for timesheet
2016-07-15 19:24:21 +05:30
Rushabh Mehta
8d8bbb0588
[bugfix] opportunity naming
2016-07-15 16:50:52 +05:30
Rushabh Mehta
55ea7b1f61
[minor] set applicant name automatically
2016-07-15 16:43:25 +05:30
Rushabh Mehta
95383bb281
[fix] item attribute validation and tests
2016-07-15 15:12:06 +05:30
Kanchan Chauhan
9846b945d9
Patch to delete previous report
2016-07-15 14:06:20 +05:30
Kanchan Chauhan
7ff0c4eef4
Employee Attendance report renamed to Employees working on a holiday
2016-07-15 13:42:36 +05:30
Rushabh Mehta
3f549980c9
Merge pull request #5748 from rohitwaghchaure/v7_timesheet_issue
...
[WIP] Timesheet overlap issue and fields rearranged
2016-07-15 12:44:27 +05:30
Rushabh Mehta
20122aef79
[minor] optimize item attribute validation for #5756
2016-07-15 12:42:41 +05:30
Rushabh Mehta
b8bdfbcead
[minor] optimize item attribute validation for #5756
2016-07-15 12:41:08 +05:30
Rohit Waghchaure
3bc6a958c7
[Fix] Timesheet overlap issue
2016-07-14 18:27:49 +05:30
Saurabh
c63f2e2993
[fix] patch fix
2016-07-14 18:24:20 +05:30
Rushabh Mehta
176b63b354
[fix] remove first row on mapping, fixes #5707
2016-07-14 17:43:48 +05:30
Rushabh Mehta
62fcaa7900
Merge pull request #5758 from saurabh6790/is_group_fixes
...
[fix] alter fieldtype for is_group from select to check
2016-07-14 16:57:01 +05:30
Rushabh Mehta
528e145a54
[docs] fixes #5697
2016-07-14 17:00:05 +05:30
Rushabh Mehta
92d1b8cc6d
[fix] [demo] permissions for accounting
2016-07-14 16:18:20 +05:30
Rohit Waghchaure
de8418efe5
[Fix] Timesheet patch
2016-07-14 14:36:47 +05:30
Saurabh
6bc7b892c4
[fix] alter fieldtype for is_group from select to check
2016-07-14 14:06:28 +05:30
Rushabh Mehta
b814a54f2f
[demo] mute emails
2016-07-13 18:17:19 +05:30
Rushabh Mehta
ffa70e34de
[demo] [minor] fixes
2016-07-13 17:47:37 +05:30
Anand Doshi
d9b3c5ca60
[fix] use base.html's title block in home.html
2016-07-13 11:29:50 +05:30
Rushabh Mehta
8cfe18eccd
[demo] help
2016-07-13 11:30:10 +05:30
Rohit Waghchaure
e3fe828ea6
[Fix] Added note in timesheet and minor fixes
2016-07-13 09:40:35 +05:30
Rushabh Mehta
1f15cf43d6
Merge pull request #5715 from donysukardi/documentation-fixes
...
[fix] Documentation Fixes
2016-07-12 11:16:12 +05:30
Rushabh Mehta
4beba3aff9
Merge pull request #5705 from KanchanChauhan/fixed-employee-holiday-attendance-report
...
Added Holiday List filter
2016-07-12 11:11:43 +05:30
Dony Sukardi
84c9e6bb4a
[fix] Documentation Fixes
...
Fixes for the following issues:
- Render code block
- Fix ordered-list numbering
2016-07-12 04:01:06 +08:00
Rushabh Mehta
29b80b2233
Merge pull request #5701 from saurabh6790/item_reorder
...
[fix] fix get query for sub warehouse in reorder level table
2016-07-11 17:14:50 +05:30
Nabin Hait
cc2083ebd0
[fix] Advance payment adjustment in sales/purchase invoice
2016-07-11 16:12:18 +05:30
Rushabh Mehta
3ce24d64c2
[cleanup] payment entry form view
2016-07-11 16:08:46 +05:30
Kanchan Chauhan
54860cd57d
Added Holiday List filter
2016-07-11 15:16:47 +05:30
Rohit Waghchaure
3e012b7e16
[Fix] Time sheet rename issues
2016-07-11 15:00:38 +05:30
Saurabh
7151f91862
[fix] fix get query for sub warehouse in reorder level table
2016-07-11 13:19:06 +05:30
Rushabh Mehta
391c0efcee
[fix] make grids editable
2016-07-11 13:01:58 +05:30
Rushabh Mehta
cca33b2ff0
[cleanup]
2016-07-11 13:01:58 +05:30
Nabin Hait
e37625b0c2
Merge pull request #5693 from rohitwaghchaure/v7_pos_issue
...
[Fix] POS minor fixes.
2016-07-11 12:52:47 +05:30
Nabin Hait
54bd79bd93
Merge pull request #5690 from nabinhait/fix100
...
Deleted report Customers Not Buying Since Long Time
2016-07-11 12:52:35 +05:30
Nabin Hait
bbc394fd72
Changed patch order to fix old patches
2016-07-11 12:40:18 +05:30
Rohit Waghchaure
89ee3091af
[Fix] POS minor fixes.
2016-07-08 15:17:04 +05:30
Nabin Hait
f176cc03df
Deleted report Customers Not Buying Since Long Time
2016-07-08 09:03:13 +05:30
Nabin Hait
12e8277b6b
Merge pull request #5681 from nabinhait/sal_slip_print
...
Print formats for salary slip
2016-07-08 08:35:31 +05:30
Rohit Waghchaure
0d4a9c225f
[Salary Structure] Make salary_component field mandatory if salary_slip_based_on_timesheet is true
2016-07-07 17:04:54 +05:30
Rushabh Mehta
408d2c5db3
Merge pull request #5683 from rohitwaghchaure/v7_pos_issue_and_enhancement
...
[Fix] Access is pos from sales invoice form.
2016-07-07 16:46:32 +05:30
Rohit Waghchaure
539e913b46
[Fix] Access is pos from sales invoice form.
2016-07-07 16:44:40 +05:30
Rushabh Mehta
7333eb280f
[minor] typo in customer.js
2016-07-07 15:34:01 +05:30
Rushabh Mehta
ea0ff23891
[cleanup] form dashboards
2016-07-07 14:28:05 +05:30
Rushabh Mehta
964ad0fcae
[cleanup] rename "links" to "dashboard"
2016-07-07 14:28:05 +05:30
Rushabh Mehta
2a1e3bb31b
[fix] sender name in lead
2016-07-07 14:28:05 +05:30
Nabin Hait
027acde4f4
Print formats for salary slip
2016-07-07 13:17:21 +05:30
Nabin Hait
cfa9df2842
Merge pull request #5679 from nabinhait/pull_button_visibility
...
[fix] Condition for visibility of 'Get Items from Open Material Requests' in PO
2016-07-07 12:47:58 +05:30
Nabin Hait
ade217c0e0
Merge pull request #5678 from nabinhait/exchange_rate_issue
...
[fix] Dont set currency and exchange rate while Quotation made from Opportunity for lead
2016-07-07 12:47:36 +05:30
Nabin Hait
804b8f7baf
Merge pull request #5645 from KanchanChauhan/task-status-update-in-website
...
Task statuses updated in website
2016-07-07 12:46:46 +05:30
Rohit Waghchaure
2b590fd804
[Fix] Pricing rule issue
2016-07-07 12:22:22 +05:30
Kanchan Chauhan
6d76359c31
[WIP] Task statuses updated in website
2016-07-07 12:19:01 +05:30
Nabin Hait
a9d3981c86
[fix] Condition for visibility of 'Get Items from Open Material Requests' in PO
2016-07-07 11:34:34 +05:30
Nabin Hait
3950507d4b
[fix] Currency and exchange rate while Quotation made from Opportunity for lead
2016-07-07 11:12:44 +05:30
Nabin Hait
821367fee8
[fix] Dont set currency and exchange rate while Quotation made from Opportunity for lead
2016-07-07 10:55:47 +05:30
Nabin Hait
6a66138764
Merge pull request #5675 from rohitwaghchaure/rename_time_sheet_doctype
...
Rename Time Sheet doctype
2016-07-07 10:38:55 +05:30
Nabin Hait
8019ea73aa
Merge pull request #5653 from saurabh6790/V7_fixes_2
...
[fix] task visibility fix #5601
2016-07-07 10:35:02 +05:30
Nabin Hait
b71a14ceca
minor fix
2016-07-06 23:38:05 +05:30
Nabin Hait
378f5c48e5
[fix] Test cases
2016-07-06 23:38:05 +05:30
Nabin Hait
c19691632e
Button to make Depreciation Entry manually
2016-07-06 23:38:05 +05:30
Nabin Hait
e417000bbb
Fetch Fixed Asset property from item in Sales / Purchase Invoice
2016-07-06 23:38:05 +05:30
Nabin Hait
cea353a638
Validate expected value after useful life
2016-07-06 23:38:05 +05:30
Nabin Hait
e3e1b80fcc
Editable grid and query in asset category
2016-07-06 23:38:05 +05:30
Nabin Hait
b30acc7ddb
Fixes in Account
2016-07-06 23:38:04 +05:30
Nabin Hait
668d090eed
Fetch deatils from Item and Asset Category
2016-07-06 23:38:04 +05:30
Nabin Hait
abd6c5debb
Fixed asset item property and validations
2016-07-06 23:38:04 +05:30
Nabin Hait
2dec0db3bd
Is Fixed Asset and Asset Category field added in Item
2016-07-06 23:38:04 +05:30
Rohit Waghchaure
e94d18b4cd
Rename Time Sheet doctype
2016-07-06 20:38:50 +05:30
Nabin Hait
21f443e37c
Merge pull request #5674 from rohitwaghchaure/v7_fixes
...
[Fixes] RFQ contact and multiple creation of supplier quotation issue
2016-07-06 17:51:56 +05:30
Saurabh
38d261653f
[fix] load task table for project on saving of project
2016-07-06 17:26:21 +05:30
Rohit Waghchaure
f154c611bb
[Fixes] RFQ contact and multiple creation of supplier quotation issue
2016-07-06 17:26:15 +05:30
Saurabh
838dd6c530
[fix] task visibility fix #5601
2016-07-06 17:00:30 +05:30
Nabin Hait
70a1ddb6a1
Merge pull request #5671 from nabinhait/fixes90
...
Multiple fixes
2016-07-06 16:53:31 +05:30
Rohit Waghchaure
53bea82514
[Fixes] POS amount calculation issue
2016-07-06 16:15:10 +05:30
Nabin Hait
819ed21ab5
Removed Pro Order from Quick Entry
2016-07-06 16:13:44 +05:30
Nabin Hait
df2200b417
Added Valuation Rate field in Item for opening stock
2016-07-06 16:05:15 +05:30
Nabin Hait
4671038211
Item Name added in Stock Reconciliation
2016-07-06 16:05:15 +05:30
Nabin Hait
5f82a5387d
Query for warehouse and editable fields in grid
2016-07-06 15:35:23 +05:30
Nabin Hait
f3090b01c1
Merge pull request #5662 from KanchanChauhan/template-selection-salesorder
...
template selection of item disabledin Sales Order
2016-07-06 15:27:42 +05:30
Rohit Waghchaure
3188b56694
[Fixes] Time sheet fixes
2016-07-06 14:31:14 +05:30
Kanchan Chauhan
6cb5710ffc
template selection of item disabledin Sales Order
2016-07-06 13:25:44 +05:30
Nabin Hait
7796c2f0c0
Update rename_salary_components.py
2016-07-06 13:11:51 +05:30
Rohit Waghchaure
c8d231b26b
[Fix] Patch salary component
2016-07-06 12:33:54 +05:30
Rohit Waghchaure
a71d9d33af
Rename prevdoc field in purchase order and purchase receipt doctype
2016-07-06 12:13:29 +05:30
Nabin Hait
4647f24865
Merge pull request #5625 from KanchanChauhan/salary-component-cleanup
...
Salary component cleanup
2016-07-06 12:06:05 +05:30
Kanchan Chauhan
d963b76a4b
Salary component cleanup
2016-07-06 12:04:38 +05:30
Nabin Hait
d1a83d43ab
Merge pull request #5652 from saurabh6790/V7_fixes_1
...
[fix] link fixes for tree structures #5651
2016-07-06 10:54:54 +05:30
Anand Doshi
3177138655
[fix] moved disable setup wizard access to frappe
2016-07-05 21:34:21 +05:30
Saurabh
52ec0ed134
[fix] link fixes for tree structures #5651
2016-07-05 18:05:45 +05:30
Saurabh
c03a3bf580
[minor][fix] fix base_grand_total
2016-07-05 15:58:14 +05:30
Saurabh
1c5c511d2e
[fix] add payment entry in document flow
2016-07-05 12:46:38 +05:30
Saurabh
066ae8e4c4
[fix] make cheque print compatible with payment entry
2016-07-05 12:46:38 +05:30
Nabin Hait
04f0e61331
Merge pull request #5639 from saurabh6790/customer_save_fix
...
[fix] set addr_list and contact_list attr #5635
2016-07-05 10:57:34 +05:30
Nabin Hait
1e42a05c2d
Merge pull request #5636 from nabinhait/payment_entry_fix
...
Payment entry fix
2016-07-05 10:56:54 +05:30
Saurabh
bce02c4364
set addr_list and contact_list attr #5635
2016-07-04 18:28:20 +05:30
Nabin Hait
281b07cdb6
Warehouse patch fix
2016-07-04 18:17:57 +05:30
Nabin Hait
7f3938b19f
Warehouse patch fix
2016-07-04 18:12:08 +05:30
Rushabh Mehta
e38872294a
[fix] [patch]
2016-07-04 17:34:25 +05:30
Nabin Hait
f6a0d789d0
Payment entry fixes
2016-07-04 17:26:02 +05:30
Nabin Hait
e4bbb696ab
Payment Entry minor improvements
2016-07-04 17:26:02 +05:30
Rushabh Mehta
1d797f717b
[fix] warehouse validation for parent_account
2016-07-04 17:07:08 +05:30
Rushabh Mehta
bc10431b7d
Merge pull request #5631 from KanchanChauhan/address-viewww-fixed
...
Address view fixed for website
2016-07-04 15:50:40 +05:30
Kanchan Chauhan
1605ff02c6
[WIP] Address view fixed
2016-07-04 15:41:07 +05:30
Rushabh Mehta
a123025d78
Merge pull request #5630 from rohitwaghchaure/v7_time_log_batch_patch_fixes
...
[Fixes] Time log batch patch
2016-07-04 14:07:58 +05:30
Rohit Waghchaure
240407b155
[Fixes] Time log batch patch
2016-07-04 13:21:54 +05:30
Saurabh
51f66efc7a
[minor][fix] set transactions_exist on load of company
2016-07-04 13:06:29 +05:30
Saurabh
c2934ba9da
[minor][fix] holiday list exception message fix
2016-07-04 13:06:29 +05:30
Rushabh Mehta
c1d2247f2c
Merge pull request #5620 from nabinhait/payment_entry
...
Payment Entry
2016-07-04 13:01:16 +05:30
Nabin Hait
ff2f3ef1b1
Test Case Fixes
2016-07-04 11:42:25 +05:30
Nabin Hait
e196190d10
minor fix
2016-07-04 11:42:25 +05:30
Nabin Hait
56548cbfa2
Payment against negative invoice, negative outstanding allocation and much more
2016-07-04 11:42:25 +05:30
Nabin Hait
9db1b223da
Payment Entry: Test cases and default remarks
2016-07-04 11:42:24 +05:30
Nabin Hait
13093b4b68
Make payment entry aginst order, payment request and patch to rename advance table fields
2016-07-04 11:42:24 +05:30
Nabin Hait
05aefbbf5d
Payment Entry from invoice
2016-07-04 11:42:24 +05:30
Nabin Hait
221fa98b51
Payment Entry: Payment period based on invoice date
2016-07-04 11:42:24 +05:30
Nabin Hait
16d6959d01
Payment Entry included in Bank Reconciliation and related reports
2016-07-04 11:42:24 +05:30
Nabin Hait
1991c7b17d
Payment Reconciliation changes for Payment Entry
2016-07-04 11:42:24 +05:30
Nabin Hait
28a0528ae4
Advance Payment Entry adjustment against Invoice
2016-07-04 11:42:04 +05:30
Nabin Hait
e3a10170f7
Payment Entry submission and more
2016-07-04 11:41:24 +05:30
Nabin Hait
12e2a51519
[new][feature] Payment Entry
2016-07-04 11:41:24 +05:30
Rushabh Mehta
4177504860
[fix] [patch] reload doctype missing in patch
2016-07-04 11:41:12 +05:30
Rushabh Mehta
b33df4afe8
[cleanup] link methods made common
2016-07-04 11:39:25 +05:30
Rushabh Mehta
5f5f0bec2c
[fix] buttons for rfq and material request
2016-07-04 11:39:25 +05:30
Rushabh Mehta
dc8067eb33
[demo] new cleaner, more-flexible demo
2016-07-04 11:39:25 +05:30
Rushabh Mehta
8c2e79cf0d
[minor] fixes
2016-07-04 11:39:25 +05:30
Rushabh Mehta
878dfec46a
[minor]
2016-07-04 11:39:25 +05:30
Saurabh
f5ab5f3c0c
[minor][fix] reload warehouse before executing patches
2016-07-04 11:38:58 +05:30
Rushabh Mehta
6703792472
Merge pull request #5618 from rohitwaghchaure/sq_field_and_rfq_fixes
...
[Fixes] Fixed linked for MR to SQ from RFQ, changed field name in SQI
2016-07-04 10:59:11 +05:30
Rushabh Mehta
2be94f7675
Merge pull request #5615 from rohitwaghchaure/v7_rfq_fixes
...
[RFQ Enhancement] Added button on supplier row to download PDF for particular supplier
2016-07-04 10:58:33 +05:30
Rushabh Mehta
bed5f9e9b3
Merge pull request #5614 from suryanamha/patch-1
...
Update index.md
2016-07-04 10:58:03 +05:30
Rohit Waghchaure
ad884b9fa9
[Fixes] Time sheet dependency removed from sales invoice and patch fixes
2016-07-02 22:28:29 +05:30
Saurabh
b35906efc1
[fix] load dependancies on page load event
2016-07-02 17:13:11 +05:30
Saurabh
feefaaf1ee
[fix] Stock Analytics Report page fix
2016-07-01 18:15:17 +05:30
Rohit Waghchaure
4d8f4d76e1
[Fixes] Fixed linked for MR to SQ from RFQ, changed field name in SQI
2016-07-01 15:33:57 +05:30
Rohit Waghchaure
fc1fa9a774
[RFQ Enhancement] Added button on supplier row to download PDF for particular supplier
2016-07-01 14:53:11 +05:30
Rohit Sharma
c4fcd1996a
Update index.md
...
I have added few points and enhanced some of the existing text. Please accept the changes.
2016-06-30 16:44:59 +05:30
Rushabh Mehta
465b753848
Merge pull request #5613 from saurabh6790/bom_tree_fixes
...
[fix] BOM tree as default view
2016-06-30 15:54:47 +05:30
Rushabh Mehta
1b8b0cc18f
Merge pull request #5609 from KanchanChauhan/enable-shopping-cart-in-setup
...
Enable shopping cart by default during company creation in setup
2016-06-30 15:54:04 +05:30
Saurabh
621247807a
[fix] BOM tree as default view
2016-06-30 15:05:06 +05:30
Kanchan Chauhan
9116a84969
Enable shopping cart by default during company creation in setup
2016-06-30 15:02:26 +05:30
Rushabh Mehta
cfb81205b3
Merge pull request #5612 from shubham7saxena/rfq-sidebar
...
[minor][bug fix]added sidebar visibility to request for quotation link
2016-06-30 14:39:55 +05:30
shubham7saxena
778184e5e0
added sidebar visibility to request for quotation link
2016-06-30 14:27:28 +05:30
Rohit Waghchaure
a314872cb5
[RFQ] Enhancement and minor fixes
2016-06-30 02:26:02 +05:30
Rushabh Mehta
65256ed8cb
Merge pull request #5526 from KanchanChauhan/shopping-cart-dropdown-update
...
Shopping cart dropdown update
2016-06-29 21:59:29 +05:30
Rushabh Mehta
5b681666a0
Merge pull request #5605 from saurabh6790/warehouse_tree_fix_1
...
while creating warehouse tree check for non company warehouse and is_group default value fix
2016-06-29 21:58:31 +05:30
Rushabh Mehta
a11839307f
Merge pull request #5553 from saurabh6790/pos_fixes
...
[minor][fix] throw if payment modes are not set
2016-06-29 21:56:20 +05:30
Saurabh
1301b3b3d1
[fix] set default value for is_group to 0
2016-06-29 19:48:44 +05:30
Rohit Waghchaure
3fa0b51e5e
[Fixes] Time sheet fixes and changed timesheets to time_logs
2016-06-29 19:04:16 +05:30
Saurabh
028bbee317
[fix] nestedset warehouse fix
2016-06-29 19:03:40 +05:30
Saurabh
b8a57a4b4d
[fix] wareehouse nestedset fix if company not associated with warehouse
2016-06-29 19:01:49 +05:30
Saurabh
d7d878b6db
[fix] label fix
2016-06-29 18:48:20 +05:30
Rushabh Mehta
e6920f6a58
Merge pull request #5603 from KanchanChauhan/Maintenance-Module
...
New Maintenance Module
2016-06-29 16:08:46 +05:30
Kanchan Chauhan
fb3eb13ca4
New Maintenance Module
2016-06-29 15:51:02 +05:30
Anand Doshi
5b9c6e7fa6
[fix] [patch] remove default activity type "Planning"
2016-06-29 15:32:36 +05:30
Rushabh Mehta
da43539c53
Merge pull request #5558 from saurabh6790/doc_flow_fix
...
[minor][fix] fix filter in previous link mapper
2016-06-29 12:19:54 +05:30
Rushabh Mehta
26a76fb2d9
Merge pull request #5566 from KanchanChauhan/moving-newsletter-to-frappe
...
Newsletter moved to Frappe
2016-06-29 12:11:25 +05:30
Rohit Waghchaure
a62dcce46a
[Fix] make_for field removed
2016-06-29 01:42:52 +05:30
Anand Doshi
0e4119b2de
[fix] use get_domains to prevent mutation of nested dictionary
2016-06-28 21:37:28 +05:30
Kanchan Chauhan
65c8b5a216
Newsletter moved to Frappe
2016-06-28 17:28:40 +05:30
Saurabh
ee17e2f277
[fix] patch fix
2016-06-28 15:43:02 +05:30
Kanchan Chauhan
a756e3f765
Reverted changes
2016-06-28 15:02:35 +05:30
Saurabh
52c2affc9c
[fix] check for parent account with type stock in patch if not exists get parent account from existing warehouse accounts
2016-06-28 14:41:48 +05:30
Kanchan Chauhan
c8d47da6bc
Shopping cart and dropdown cart update
2016-06-28 11:29:43 +05:30
Saurabh
9a6c6663c1
[minor][fix] throw if payment modes are not set
2016-06-27 18:16:07 +05:30
Saurabh
82b8b38b3d
[fix] fix filter in previous link mapper
2016-06-27 17:51:29 +05:30
Rushabh Mehta
4803376da8
Merge pull request #5507 from neilLasrado/develop
...
Added Minimum Inventory level to Item Master
2016-06-27 17:48:45 +05:30
Neil Trini Lasrado
b7ff027937
Added Safety Stock to Item Master
2016-06-27 17:45:08 +05:30
Saurabh
2f788a909f
[fixes] time sheet patch fix
2016-06-27 17:44:12 +05:30
Rushabh Mehta
bff0cacd69
Merge pull request #5556 from rohitwaghchaure/time_sheet_wages
...
[Fixes] Timesheet
2016-06-27 17:31:43 +05:30
Rohit Waghchaure
e95ee43d51
[Fixes] Timesheet
2016-06-27 17:28:48 +05:30
Rushabh Mehta
d362b734a2
Merge pull request #5529 from saurabh6790/module_flow
...
[fix] previous document links
2016-06-27 17:23:46 +05:30
Saurabh
93d68ac0c2
[fixes] change is group to check box
2016-06-27 17:16:56 +05:30
Saurabh
99892c7ce7
[fix] provision to convert group to ledger and vice versa
2016-06-27 17:16:56 +05:30
Rushabh Mehta
822209cb03
Merge pull request #5538 from rohitwaghchaure/time_sheet_wages
...
[Enhancement] Time log wages and multiple active salary structure
2016-06-27 17:13:48 +05:30
Rushabh Mehta
3be51643cc
[fix] ignore setup wizard updates
2016-06-27 17:16:00 +05:30
Rushabh Mehta
689130cf9b
[minor] fix holiday_list validation
2016-06-27 17:16:00 +05:30
Saurabh
ce22d34fcf
[fix] report Stock Projected Qty
2016-06-27 17:05:13 +05:30
Rohit Waghchaure
d6c986da8f
[Enhancement] Time log wages and multiple active salary structure
2016-06-27 16:46:39 +05:30
Rushabh Mehta
18357664cb
[fix] routing for item group
2016-06-27 15:42:48 +05:30
Rushabh Mehta
a2c4dad90e
[fix] product search
2016-06-27 14:55:01 +05:30
Saurabh
b6d6b8420d
[fix] add filters and child doc name in previous link mapper
2016-06-27 14:48:26 +05:30
Saurabh
2a0b111726
[fix] mark completed docuemts on document flow
2016-06-27 12:28:55 +05:30
Saurabh
8f24ecb173
[fix] set previous doc links for document flow
2016-06-27 12:28:55 +05:30
Saurabh
d9131ec4ff
[minor][fix] remove website generator call on after rename
2016-06-27 12:25:05 +05:30
Anand Doshi
771ab0c8c3
[fix] [patch] re-route
2016-06-27 12:04:48 +05:30
Rushabh Mehta
ee3204373c
Merge branch 'develop' of github.com:frappe/erpnext into develop
2016-06-27 10:14:39 +05:30
Anand Doshi
d6b734e2e3
[fix] DuplicateEntryError for Warehouse Account Creation
2016-06-26 17:43:14 +05:30
Saurabh
78333c7e07
[fixes] check group condition
2016-06-26 14:27:46 +05:30
Saurabh
7fecb50360
[enhance] rename warehouse account type to stock
2016-06-26 14:27:46 +05:30
Nabin Hait
2ee4d79609
Merge pull request #5540 from KanchanChauhan/customize-retirement-age
...
Retirement Age option in HR Settings
2016-06-26 14:25:45 +05:30
Kanchan Chauhan
68f5ae5cbf
Changes done
2016-06-26 14:10:24 +05:30
Nabin Hait
14f0a6fa89
Merge pull request #5534 from KanchanChauhan/itemprice-update-in-pricelist
...
Item Price update in Price List
2016-06-26 13:07:35 +05:30
Rushabh Mehta
dad5140eac
[minor] add task status
2016-06-26 12:21:20 +05:30
Saurabh
520fb73676
[fix] authorization rule fix for sales order
2016-06-26 12:09:49 +05:30
Nabin Hait
c65f160776
[fix] Identify account group for warehouse based on account type
2016-06-26 08:25:51 +05:30
Anand Doshi
f576f3b17b
implemented get_site_info for erpnext and patch to move setup complete to system settings
2016-06-25 19:52:26 +05:30
Rushabh Mehta
5cba40b74f
[fix] [bug] task deletion from project fixes #5470
2016-06-25 18:44:59 +05:30
Rushabh Mehta
723cd64249
[fix] tree view hooks and patch fix
2016-06-25 18:30:03 +05:30
Kanchan Chauhan
2ff7d2aade
Fixed
2016-06-25 17:54:25 +05:30
Kanchan Chauhan
4c0df04db0
Retirement Age option in HR Settings
2016-06-25 17:45:16 +05:30
Nabin Hait
8942d1782c
Merge pull request #5481 from bcornwellmott/patch-2
...
Create Manufacture MRs for BOM Items
2016-06-25 14:01:32 +05:30
Nabin Hait
4cc7bcc412
Merge pull request #5495 from bcornwellmott/patch-3
...
Add "Get items from Material Request"
2016-06-25 13:58:50 +05:30
Nabin Hait
2efecac823
Merge pull request #5522 from cgpurbaugh/patch-2
...
Some minor grammatical and spelling changes
2016-06-25 13:54:19 +05:30
Nabin Hait
173b328380
Merge pull request #5527 from bcornwellmott/patch-4
...
Fix Percent Billed to show Percentage
2016-06-25 13:53:55 +05:30
Nabin Hait
7b6cdf4a63
Merge pull request #5518 from saurabh6790/warehouse_tree
...
Warehouse tree
2016-06-25 13:49:15 +05:30
Nabin Hait
0420833a59
Merge pull request #5531 from saurabh6790/cheque_print_fixes
...
[fixes] set default values to cheque print and set background image o…
2016-06-25 13:43:56 +05:30
Saurabh
dc2fa86222
[fixes] rename ctype to doctype
2016-06-25 11:16:55 +05:30
Saurabh
001d4d74fa
[fix] in set_valuation_method check for is group condition
2016-06-25 11:06:15 +05:30
Saurabh
3a0f96bd00
[patch] patch to move all warehouses under all warehouse group
2016-06-25 11:06:14 +05:30
Saurabh
4d02949814
[fixes] validate trash condition for warehouse and related account, move existing warehouses under all warehouse group, set account parent and is group for warehouse account
2016-06-25 11:06:14 +05:30
Saurabh
ec8babe7ac
[minor][fix]
2016-06-25 11:06:14 +05:30
Saurabh
1702273968
[fix] rename account browser and sales browser to tree/doctype for view
2016-06-25 11:06:14 +05:30
Saurabh
ac53357f53
[fixes] renamed _treeview to _tree
2016-06-25 11:06:14 +05:30
Saurabh
a9ba7343c4
[fix] deprecate browser pages for accounts, cost_center, sales , bom, item group
2016-06-25 11:06:14 +05:30
Saurabh
9c7b0079c5
[fixes] warehose group wise stock report and test cases for warehouse hierarchy and warehouse group wise reorder level
2016-06-25 11:06:13 +05:30
Saurabh
3d6aecd618
[fixes] set warehouse group wise reorder level, validate ledger (leaf warehouse) on sle and bin
2016-06-25 11:06:13 +05:30
Saurabh
554f6f70aa
[fixes] nested set fix for warehouse, tree for accounts and cost center
2016-06-25 11:06:13 +05:30
Saurabh
0e47bfeb16
[enhance] treeview to BOM, sales person, Cost Center and Chart of acounts
2016-06-25 11:06:13 +05:30
Saurabh
5f48cb6128
[enhancement] BOM treeview
2016-06-25 11:06:13 +05:30
Saurabh
d647945102
[fixes]
2016-06-25 11:06:13 +05:30
Saurabh
eda1afb4eb
[fixes] comnify tree view
2016-06-25 11:06:13 +05:30
Saurabh
091ca75fa3
[enhance] warehouse browser page for warehouse tree
2016-06-25 11:06:12 +05:30
Saurabh
dfbcdeb8a0
[enhancement] warehouse tree structure
2016-06-25 11:06:12 +05:30
Saurabh
a4a3b022ee
[fix] return route from make_route of child class
2016-06-25 10:43:02 +05:30
Kanchan Chauhan
5ee8fccb1a
Item Price update in Price List
2016-06-24 17:11:15 +05:30
Rushabh Mehta
994fa8dcef
Merge pull request #5530 from rmehta/website-route-fixes
...
[redesign] website routing system
2016-06-24 16:37:43 +05:30
Rushabh Mehta
bd9680f82e
[added] web-forms
2016-06-24 16:41:33 +05:30
Rushabh Mehta
a334062b03
[redesign] website routing system
2016-06-24 16:18:07 +05:30
Nabin Hait
438565f678
Merge branch 'master' into develop
2016-06-24 16:12:26 +05:30
Nabin Hait
23b190414c
bumped to version 6.27.25
2016-06-24 16:41:59 +06:00
Nabin Hait
0bfd4849ca
minot fix
2016-06-24 16:04:31 +05:30
Nabin Hait
2effad33d0
Merge branch 'master' into develop
2016-06-24 12:48:24 +05:30
Nabin Hait
0e19e72a5d
bumped to version 6.27.24
2016-06-24 13:16:27 +06:00
Nabin Hait
6dfc78b12a
Item Valuation Rate in case of negative inventory
2016-06-24 12:28:55 +05:30
Saurabh
777f556b14
[fixes] set default values to cheque print and set background image only if attachment exist
2016-06-23 20:25:37 +05:30
bcornwellmott
813dddeb10
Fix Percent Billed to show Percentage
...
Previously was showing Currency
2016-06-22 14:49:31 -07:00
Rushabh Mehta
8a065e0028
[rename] Bulk Email to Email Queue
2016-06-22 12:58:39 +05:30
Rushabh Mehta
4d54fb258c
Merge pull request #5514 from cgpurbaugh/patch-1
...
Update tasks.md
2016-06-22 12:09:21 +05:30
Rushabh Mehta
6e7dc12fde
Merge pull request #5476 from umairsy/14-jun
...
In the Setup Wizard, changed field label from Bank Account to Bank Name
2016-06-22 12:09:01 +05:30
Rushabh Mehta
560ee7bb12
Merge pull request #5480 from vjFaLk/restrict-newsletter-list
...
Added code to Restrict Newsletter List Recipients
2016-06-22 12:08:41 +05:30
Rushabh Mehta
4cf914d902
[minor] added mins to first response for opportunity
2016-06-22 11:22:12 +05:30
Christopher G. Purbaugh
01d4d30e8a
Some minor grammatical and spelling changes
2016-06-21 15:42:20 -04:00
Nabin Hait
a531ebea8a
Merge branch 'master' into develop
2016-06-21 16:44:05 +05:30
Nabin Hait
a5162b7529
Merge branch 'hotfix'
2016-06-21 16:42:40 +05:30
Nabin Hait
2eb9b34ff2
bumped to version 6.27.23
2016-06-21 17:11:34 +06:00
Nabin Hait
5db108116a
Merge pull request #5446 from rohitwaghchaure/purchase_register_total_amount_issue
...
[Fixes] Purchase register, showing wrong value for total amount if tax has deducted.
2016-06-21 16:29:27 +05:30
Nabin Hait
bf3e26dd2d
Merge pull request #5466 from rohitwaghchaure/shipping_address_autocomplete_issue
...
[Fix] Shipping address's get_query not working on autocomplete.
2016-06-21 16:28:12 +05:30
Christopher G. Purbaugh
55990efe29
Update index.md
...
Removed some repetitive text, changed some of the wording.
2016-06-20 15:08:08 -04:00
Christopher G. Purbaugh
22e0489ac7
Update tasks.md
2016-06-20 14:36:28 -04:00
Christopher G. Purbaugh
7f89c1aec0
Update tasks.md
...
Just some small grammatical corrections
2016-06-20 14:28:44 -04:00
Umair Sayyed
5918dc87f3
small fixes
2016-06-17 12:28:21 +05:30
bcornwellmott
9af68078f6
Add "Get items from Material Request"
...
Allows users to pull items from multiple Material Requests into a Request for Quotation
2016-06-16 14:10:57 -07:00
Rohit Waghchaure
c65c38d293
[POS] Minor fixes
2016-06-16 11:49:37 +05:30
bcornwellmott
c0a3311836
Create Manufacture MRs for BOM Items
...
Corrects an issue where items with BOMs have Purchase material request submitted instead of Manufacture material requests.
2016-06-15 11:16:12 -07:00
Rushabh Mehta
2cb7a9f235
[ux] taxes table editable
2016-06-15 16:45:03 +05:30
Valmik Jangla
2225decb2b
Restrict Newsletter lists
2016-06-15 16:04:17 +05:30
Rushabh Mehta
b5f2c78f8f
[list] reports for item list
2016-06-15 12:57:22 +05:30
Rushabh Mehta
dc1758b36e
[report] minutes to first response for issues
2016-06-14 18:26:09 +05:30
Rushabh Mehta
f7e6ec0654
[report] minutes to first response for issues
2016-06-14 18:08:51 +05:30
Rushabh Mehta
57f35ddb4a
[minor] fix update_mins_to_first_response patch
2016-06-14 16:29:33 +05:30
Rushabh Mehta
1d1bc27a57
[minor] fix update_mins_to_first_response patch
2016-06-14 16:27:50 +05:30
Rushabh Mehta
a55fb6426c
[patch] mins_to_first_response in opporutnity and issue
2016-06-14 15:54:54 +05:30
Maxwell Morais
f8122646ba
Set get_contact_details
and get_address_display
to the right standard!
2016-06-14 15:19:00 +05:30
Umair Sayyed
9a0ff298ce
Changed field label from Bank Account to Bank Name
2016-06-14 12:25:34 +05:30
Nabin Hait
1df75c930f
Merge pull request #5390 from MaxMorais/patch-5
...
get_address_display cannot be called directly
2016-06-14 11:32:06 +05:30
Rohit Waghchaure
9fe40d557f
[POS] Enhancement to set default payment as cash, functionality to clear amount value, renamed doctype Payments and some fixes.
2016-06-14 01:11:09 +05:30
Rushabh Mehta
d1eba515e9
[cleanup] fixes to v7
2016-06-13 17:47:13 +05:30
Anand Doshi
7f8142d30d
[fix] reuse user.reset_password in RFQ
2016-06-13 17:23:18 +05:30
Rushabh Mehta
dd7524f844
[minor] msgprint as alert
2016-06-12 11:16:23 +05:30
Rushabh Mehta
538607e6b6
[cleanup] a better message for insufficient stock
2016-06-12 11:03:00 +05:30
Rohit Waghchaure
2dd26055c9
[Fix] Shipping address's get_query not working on autocomplete.
2016-06-11 01:48:00 +05:30
Rushabh Mehta
e0686b32f3
[minor] cleanups
2016-06-10 12:38:52 +05:30
Rohit Waghchaure
28c02fe51d
[Fix] POS page loading issue, if system has only one item
2016-06-10 00:48:03 +05:30
Anand Doshi
51ad436e16
[fix] sales and accounts browser name
2016-06-09 19:37:35 +05:30
Anand Doshi
34482788f4
[fix] removed bad import
2016-06-09 16:57:16 +05:30
Anand Doshi
8f6e6ff543
[fix] removed bad import
2016-06-09 16:57:08 +05:30
Anand Doshi
d492b675a7
[fix] removed bad import
2016-06-09 16:56:54 +05:30
Anand Doshi
754f8b42f5
[version] changed to 7.0.0-beta
2016-06-09 16:31:57 +05:30
Anand Doshi
227b238fb1
[fix] change in versioning: store __version__ in __init__.py
2016-06-09 16:31:01 +05:30
Anand Doshi
36a0c5c564
[fix] change in versioning: store __version__ in __init__.py
2016-06-09 16:29:46 +05:30
Anand Doshi
db6b832302
[fix] change in versioning: store __version__ in __init__.py
2016-06-09 16:29:12 +05:30
Rushabh Mehta
d56306add0
[minor] [fix] quotation cancelled status issue, fixes #5221
2016-06-09 15:56:48 +05:30
Rushabh Mehta
743de9b306
[minor] website field in customer and allow_import for purchase receipt, fixes #5227
2016-06-09 15:11:45 +05:30
Rushabh Mehta
cb29d9886c
[minor] fixes #5252
2016-06-08 17:31:11 +05:30
Rushabh Mehta
e9d2c3d46e
[fix] report requested items to be transferred, fixes #5295
2016-06-08 16:41:09 +05:30
Rushabh Mehta
6e837599b1
[minor] added cost center to item wise sales register, fixes #5301
2016-06-08 16:35:10 +05:30
Rushabh Mehta
e778e59e4c
[minor] always show issues in sidebar
2016-06-08 15:34:54 +05:30
Rushabh Mehta
7ce345a827
[minor] re-organize issue
2016-06-08 11:10:34 +05:30
Rushabh Mehta
0b955e6c33
[minor] production planning, fix description
2016-06-08 11:10:34 +05:30
Anand Doshi
16e2442278
[cleanup] document flow
2016-06-07 18:55:23 +05:30
Saurabh
a8217dc7e9
[fixes] build json fixes
2016-06-07 17:19:36 +05:30
Saurabh
7d0e78d399
[fixes] this.frm instead of cur_frm
2016-06-07 17:19:36 +05:30
Saurabh
2966d89e2a
[fixes] create module flow list
2016-06-07 17:19:36 +05:30
Saurabh
9df3d0fb8a
[enhance] show module flow on top of document
2016-06-07 17:19:36 +05:30
RobertSchouten
f28a5da952
[fix] show company in list view
...
allows address and contact to only contain company not customer or supplier or sales partner
2016-06-07 17:03:41 +08:00
Maxwell Morais
1ea13f1f49
Set get_contact_details
and get_address_display
to the right standard!
2016-06-07 02:35:11 -03:00
Maxwell Morais
57b6b1dc85
Set get_contact_details
to the right standard!
2016-06-07 02:32:47 -03:00
Rushabh Mehta
6125abc495
Merge pull request #5430 from shreyasp/issue/prod-order-qty
...
[Fix] Allow user to quantity in fraction while transferring material using production order
2016-06-07 10:58:20 +05:30
Rohit Waghchaure
690a0805f6
[Fixes] Purchase register, showing wrong value for total amount if tax has deducted.
2016-06-07 10:46:59 +05:30
ShashaQin
6cac50b52e
Update bom.py
2016-06-07 09:38:57 +08:00
Nabin Hait
3bc300a207
Merge branch 'master' into develop
2016-06-03 11:57:30 +05:30
Nabin Hait
ef7b6ab8ef
bumped to version 6.27.22
2016-06-03 12:20:19 +06:00
Rushabh Mehta
eb1e0673e2
Merge pull request #5354 from saurabh6790/cheque_print
...
Cheque print
2016-06-02 17:48:58 +05:30
Rushabh Mehta
c5c0d96064
Merge pull request #5395 from saurabh6790/payment_request_ux
...
[enhance] ux fixes for payment request, added jinja for payment reque…
2016-06-02 17:48:36 +05:30
Rushabh Mehta
aed79e993f
[fix] item attribute validation, fixes #5308
2016-06-02 17:49:16 +05:30
Rushabh Mehta
675f9c6e6e
[minor] reset barcode if item is changed, fixes #5314
2016-06-02 16:34:00 +05:30
Rushabh Mehta
af7d929386
[minor] fix supplier/customer and editable columns in BOM
2016-06-02 12:39:36 +05:30
bcornwellmott
c39c665136
[BUG] Fix Create Material Request OperationalError
...
The call was invalid because "it.name" doesn't exist. Needs to be replaced with "item.name"
2016-06-01 08:31:05 -07:00
shreyas
3b79f19614
[Fix] Allow user to quantity in fraction while transferring material using production order
2016-06-01 17:45:10 +05:30
Nabin Hait
9f98296c9c
minor fix
2016-06-01 16:21:43 +05:30
Rushabh Mehta
7db1793543
[fix] notification control UX - add update to top, fixes #5349
2016-06-01 13:24:28 +05:30
Nabin Hait
2460ee897a
Merge pull request #5367 from KanchanChauhan/job_openings_public
...
[Minor Fix] Job Opening should not require login
2016-06-01 13:18:26 +05:30
Nabin Hait
8e4ec8d84a
Merge pull request #5416 from nabinhait/tax_rule_based_on_county
...
Tax Rule based on County
2016-06-01 13:09:53 +05:30
Nabin Hait
cc07148336
Merge pull request #5428 from ShashaQin/patch-21
...
Update fiscal_year.py
2016-06-01 12:58:13 +05:30
Nabin Hait
29d85b0ab8
test case fixed
2016-06-01 12:54:26 +05:30
Nabin Hait
9a5cf6000e
[fix] Test cases and editable fields settings for request for quotation
2016-06-01 12:54:26 +05:30
Nabin Hait
4eaeda710d
Tax Rule based on County
2016-06-01 12:54:26 +05:30
Rushabh Mehta
535f3b0975
[minor] make task editable in project and add description to designation fixing #5361
2016-06-01 12:52:50 +05:30
Rushabh Mehta
277cda195c
[fix] for #5419
2016-06-01 12:29:08 +05:30
Rushabh Mehta
aa60fd9037
[fix] new_doc to frappe.new_doc
2016-06-01 11:46:33 +05:30
ShashaQin
5dd72fe196
Update fiscal_year.py
2016-06-01 11:39:53 +08:00
Nabin Hait
919b1b9d5b
Merge pull request #5408 from neilLasrado/hotfix-2
...
Fixed error in Gross Profit report
2016-05-31 17:41:19 +05:30
Nabin Hait
54f723b654
Merge pull request #5413 from kressi/patch-1
...
[doc] fixed typo
2016-05-31 17:40:54 +05:30
Nabin Hait
7ab088ed3f
Merge pull request #5414 from nabinhait/journal_entry_ux
...
Fetch party info in Journal Entry on selection of reference Invoice
2016-05-31 17:38:22 +05:30
Nabin Hait
6a110331e8
Merge pull request #5415 from nabinhait/company_permissions_fix
...
Ignore permissions for account/warehouse creation from Company
2016-05-31 17:38:08 +05:30
Nabin Hait
bb502f8588
Merge pull request #5417 from nabinhait/grid_editable_fields
...
[fix] Enabled editable fields in Budget
2016-05-31 17:37:36 +05:30
Nabin Hait
b0f7e5b23f
Merge pull request #5424 from shreyasp/issue/delete-root-account
...
[Fix] User allowed to delete the root account in Chart of Accounts
2016-05-31 17:37:08 +05:30
shreyas
2bb845e53f
[Fix] User allowed to delete the root account in Chart of Accounts
2016-05-31 17:15:28 +05:30
Rushabh Mehta
0dcb861b56
[minor]
2016-05-31 07:22:51 +05:30
Rushabh Mehta
bc92824bc4
[minor] rename item_name if same as item, on rename and removed item selector
2016-05-31 07:22:51 +05:30
Nabin Hait
37c53f0a04
[fix] Enabled editable fields in Budget
2016-05-30 18:20:31 +05:30
Nabin Hait
f169e5c04d
Ignore permissions for account/warehouse creation from Company
2016-05-30 12:15:36 +05:30
Nabin Hait
9fdd37e1ad
Fetch party info in Journal Entry on selection of reference Invoice
2016-05-30 11:49:16 +05:30
Michael Kressibucher
f96ec0950d
[doc] fixed typo
2016-05-29 17:57:37 +02:00
Neil Trini Lasrado
efccb8a704
Fixed error in Gross Profit report
2016-05-27 13:24:02 +05:30
Neil Trini Lasrado
45328f7729
Fixed error in bom autoname
2016-05-27 13:04:20 +05:30
Nabin Hait
a60ceba6d4
[fix] reload gl entry doctype in patch
2016-05-27 12:44:18 +05:30
Nabin Hait
0014aa9c26
[fix] Charts in report
2016-05-27 12:21:36 +05:30
Nabin Hait
591a5aba56
Added Project in GL Entry and General Ledger report
2016-05-26 17:51:20 +05:30
Nabin Hait
37b5e0c99f
Merge pull request #5399 from nabinhait/report-graph
...
Charts on reports / activity page, deprecated financial analytics report
2016-05-26 17:42:36 +05:30
Nabin Hait
1ade5927c4
fixed conflict
2016-05-26 16:56:30 +05:30
Nabin Hait
01eb7d02cc
bumped to version 6.27.21
2016-05-26 17:25:34 +06:00
Nabin Hait
5af737dd67
Update sales_order.py
2016-05-26 16:54:25 +05:30
Anand Doshi
07dfb475ca
[fix] newsletter progress percentage
2016-05-26 16:41:14 +05:30
Anand Doshi
ac7c81bb98
[fix] compiled erpnext.less to erpnext.css
2016-05-26 16:41:04 +05:30
Nabin Hait
310d64d565
Fixed conflict
2016-05-26 16:10:02 +05:30
Nabin Hait
c5d186c497
bumped to version 6.27.20
2016-05-26 16:15:34 +06:00
Nabin Hait
b46d021f2a
Charts on reports / activity page, deprecated financial analytics report
2016-05-26 15:26:01 +05:30
Nabin Hait
44c1b8e63b
Line/Bar chart in Balance Sheet / Profit and Loss statement
2016-05-26 15:26:01 +05:30
Nabin Hait
28bdff5a55
Pie chart for ageing analysis in accounts receivale/payable
2016-05-26 15:26:01 +05:30
Nabin Hait
8ed2f87480
Update company.py
2016-05-25 20:06:24 +05:30
Rohit Waghchaure
f2aa1764cc
[POS] enhancement and minor fixes
2016-05-25 15:04:46 +05:30
Saurabh
ed0816832d
[enhance] ux fixes for payment request, added jinja for payment request message
2016-05-25 11:55:30 +05:30
Rushabh Mehta
1885645d6d
[fix] [patch]
2016-05-24 16:10:21 +05:30
Rushabh Mehta
c96c4d6424
[minor] ignore xss in email sender
2016-05-24 16:02:49 +05:30
Rushabh Mehta
b574658c93
[minor] allow any time logs to be batched, fixes #5386
2016-05-24 12:13:31 +05:30
Nabin Hait
40d63d0675
Merge pull request #5378 from saurabh6790/hotfix
...
[fix] update setup wizard access
2016-05-24 11:47:31 +05:30
Saurabh
e450490bfb
[document] document for cheque print
2016-05-24 10:28:16 +05:30
Saurabh
81501ddc6d
[fixes] add setting to mark cheque account pay only
2016-05-24 10:28:14 +05:30
Saurabh
2fc0ffad34
[fixes] js templating to get cheque print view
2016-05-24 10:28:14 +05:30
Saurabh
9ca9f2d551
[Fixes] UX fixes
2016-05-24 10:28:14 +05:30
Saurabh
bb95d36218
[fixes] field re-structuring
2016-05-24 10:28:14 +05:30
Saurabh
1b62ecea44
[enhancement] cheque print
2016-05-24 10:28:14 +05:30
Nabin Hait
79ddf67289
Merge pull request #5362 from nabinhait/budget
...
Budgeting
2016-05-23 17:56:42 +05:30
Rushabh Mehta
3b10619aef
Merge pull request #5391 from rohitwaghchaure/posting_date
...
Added today as default in transactions.
2016-05-23 17:55:22 +05:30
Nabin Hait
8f70370457
Chart of accounts fixed for Spain
2016-05-23 17:41:51 +05:30
Nabin Hait
03b08e7a91
[fix] Period closing voucher
2016-05-23 16:28:39 +05:30
Rohit Waghchaure
bc894428ca
Added today as default in transaction.
2016-05-23 15:22:36 +05:30
Nabin Hait
832988e2fd
test case fixed
2016-05-23 13:04:26 +05:30
Nabin Hait
d9117cb726
reload budget doctype in patch
2016-05-23 13:04:26 +05:30
Nabin Hait
ca90963d5b
Redesigned budgets
2016-05-23 13:04:26 +05:30
Nabin Hait
b9bc7d6df3
[feature] New document for Budget
2016-05-23 13:04:26 +05:30
Maxwell Morais
498cc58522
get_address_display cannot be called directly
...
The new function get_address_display dont allow directly call, since it dont support, `frm, cdt, cdn` as arguments
2016-05-22 20:19:30 -03:00
François
dfc0a30e69
minor edits
2016-05-22 14:22:02 +02:00
Rohit Waghchaure
62dbbfba0d
[Fix] during making of material request from sales order, system fetching product bundle items only if so has both product bundle and purchase item
2016-05-20 17:09:29 +05:30
Rushabh Mehta
ac123c57f3
[cleanup] website / portal css
2016-05-20 16:37:14 +05:30
Nabin Hait
04f3286c04
Update company.py
2016-05-20 15:47:56 +05:30
Saurabh
31c0d43b95
[fix] update setup wizard access
2016-05-20 15:30:00 +05:30
Nabin Hait
66ee4d8cd7
Merge branch 'master' into develop
2016-05-20 15:15:21 +05:30
Nabin Hait
a54a2a99f4
bumped to version 6.27.19
2016-05-20 15:45:20 +06:00
Nabin Hait
d112417301
[hotfix] setup wizard access
2016-05-20 15:12:45 +05:30
Rohit Waghchaure
6c60c164f1
[Fixes] material request's editable fields overriding with purchase common
2016-05-20 14:03:09 +05:30
Rushabh Mehta
d0cee1b61b
[fix] minor fixes to pos
2016-05-20 12:54:59 +05:30
Rushabh Mehta
40b3a5bcc4
[optimize] communication query for heatmap
2016-05-20 12:54:59 +05:30
Nabin Hait
563bd056d7
Merge branch 'master' into develop
2016-05-20 12:18:28 +05:30
Nabin Hait
6c5a9bbe6b
bumped to version 6.27.18
2016-05-20 12:48:27 +06:00
Nabin Hait
3956c94bbb
Merge pull request #5340 from rohitwaghchaure/support_week_new
...
[Fix] Sales Invoice shows default date while no default mentioned
2016-05-20 12:06:22 +05:30
Nabin Hait
2edf6b84d6
Merge pull request #5364 from rohitwaghchaure/setup_wizard_access_issue
...
[Fix] Restrict access to setup wizard page if setup is already completed
2016-05-20 11:40:00 +05:30
Nabin Hait
5dfcfc5606
Merge pull request #5366 from saurabh6790/set_default_bank_acc_in_bank_reco
...
[fixes] set default bank account in bank reconciliation statement report
2016-05-20 11:36:44 +05:30
Nabin Hait
baf3e3721f
Merge pull request #5371 from saurabh6790/reset_user_must_always_select_on_transaction_change
...
[fixes] Reset "User must always select" on change of transaction
2016-05-20 11:36:06 +05:30
Nabin Hait
58e493ad51
Merge pull request #5372 from rohitwaghchaure/setup_wizard_translation_issue
...
[Translation] [Fix] Exception in setup wizard, item attributes Large and Extra Large has same translation
2016-05-20 11:35:53 +05:30
Anand Doshi
1d88c6a742
[fix] [patch] home page + erpnext.css
2016-05-20 10:42:04 +05:30
Rushabh Mehta
532eedf411
[enhance] more editable grids
2016-05-19 18:22:49 +05:30
Rohit Waghchaure
9333b6208a
[Translation] [Fix] Exception in setup wizard, item attributes Large and Extra Large has same translation
2016-05-19 17:01:49 +05:30
Rohit Waghchaure
d818bcd888
[Fixes] tax rule, tax rule working even if tax template inside the rule is disabled.
2016-05-19 16:53:01 +05:30
Saurabh
c0c8af06da
[fixes] set default bank account in bank reconciliation statement report
2016-05-19 12:32:08 +05:30
Saurabh
dc16b7e34a
[fixes] Reset on change of transaction
2016-05-19 12:26:40 +05:30
Rushabh Mehta
35047ac283
[ux] direct editing in material request
2016-05-18 18:17:38 +05:30
Kanchan Chauhan
adad5fb11e
[Minor Fix] Job Opening should not require login
2016-05-18 16:33:29 +05:30
Rohit Waghchaure
d2e02a3023
[Fix] Restrict access to setup wizard page if setup is already completed
2016-05-18 14:52:57 +05:30
Nabin Hait
1daebc04d0
Merge pull request #5360 from neilLasrado/hotfix
...
Fixed reports
2016-05-18 10:39:19 +05:30
Anand Doshi
e13c3ad048
[fix] [patch] homepage
2016-05-18 01:46:23 +05:30
Neil Trini Lasrado
4668a69cf5
Fixed reports
2016-05-17 19:04:08 +05:30
Rohit Waghchaure
5d97d89a03
[Fix] Sales Invoice shows default date while no default mentioned
2016-05-17 15:13:17 +05:30
Nabin Hait
a09285122f
Added root type for Income. Fixes #5356
2016-05-17 10:37:31 +05:30
Anand Doshi
0d66260d31
[fix] [patch] update home page
2016-05-17 10:21:08 +05:30
Rushabh Mehta
a484ff751b
Merge pull request #5353 from MaxMorais/patch-4
...
Small improvement in maintenance scheduler
2016-05-16 14:56:17 +05:30
Maxwell Morais
92b0be93c7
Removed HTML tags from messages
...
Remove HTML from messages
2016-05-16 06:24:55 -03:00
Maxwell Morais
89fdbdf404
Translation improvements
...
Translation improvements
2016-05-16 06:08:51 -03:00
Maxwell Morais
52a66fc90b
Reduce start and end date verification
...
Given the actual scenario, that verify if the start_date <= end_date, do schedule a Maintenance, 2 days are required, but in many cases only one day is required!
2016-05-16 06:06:59 -03:00
Maxwell Morais
4e7b52952e
Added warning
...
Added a warning to show a information to the active user
2016-05-16 05:38:04 -03:00