Rushabh Mehta
1df70cedc1
[fix] remove feature setup docs
2016-11-21 16:38:13 +05:30
Neil Trini Lasrado
6566431fc5
Rearranged scheduling Tool
2016-11-21 16:21:25 +05:30
Neil Trini Lasrado
defdd784f4
Added Student Batch Name & Batch Creation Tool in Schools Module.
2016-11-21 16:21:25 +05:30
Rushabh Mehta
75d455422a
[fix] [patch] rename_quality_inspection_field
2016-11-21 16:19:50 +05:30
Nabin Hait
8d161ef2e1
Merge pull request #6899 from shreyasp/docs-update
...
Updated Docs for Purchase Order and Supplier Quotation
2016-11-21 15:28:27 +05:30
Nabin Hait
d50d6a559c
Merge pull request #7012 from rmehta/remove-count-star
...
[optimize] remove count(*) from queries
2016-11-21 15:28:01 +05:30
Nabin Hait
e60d51b74c
Merge pull request #6969 from rohitwaghchaure/pos_syncing_issue_and_enhancement
...
User can able to add multiple item group, customer group in the POS profile.
2016-11-21 15:27:41 +05:30
Rushabh Mehta
5a258cbc2d
[optimize] remove count(*) from queries
2016-11-21 14:57:36 +05:30
Nabin Hait
5f166c11fc
Merge pull request #6971 from ShraddhaRanjane/patch-2
...
Update naming-series.md
2016-11-21 14:52:22 +05:30
Nabin Hait
2d5b48c4f2
Update naming-series.md
2016-11-21 14:52:10 +05:30
Nabin Hait
b30e184f6b
Merge pull request #7003 from KanchanChauhan/workstation-fix
...
[Fix]Workstation holiday list
2016-11-21 14:51:24 +05:30
Nabin Hait
d7faefc739
Merge pull request #7004 from KanchanChauhan/bom-error-fix
...
[Fix] Better error message if default BOM not found
2016-11-21 14:51:03 +05:30
Nabin Hait
0900407c18
Merge pull request #7010 from rmehta/duplicate-icon-patch-fix
...
[patch] reload desktop icon #6826
2016-11-21 14:50:36 +05:30
Nabin Hait
c2f8dd71d7
Merge pull request #6965 from manassolanki/qa_redesign
...
[Fix] [Enhancement] Quality Inspection
2016-11-21 14:49:18 +05:30
Rushabh Mehta
e9fc31168d
[patch] reload desktop icon #6826
2016-11-21 14:29:31 +05:30
Rushabh Mehta
8042aa4b52
[minor] fixes to docs
2016-11-21 13:53:02 +05:30
Rushabh Mehta
557e7f787b
[minor] UX fixes for Daily Work Summary
2016-11-21 12:10:44 +05:30
Kanchan Chauhan
fdcfe180ad
[Fix] Better error message if default BOM not found
2016-11-21 11:29:18 +05:30
Kanchan Chauhan
d33c44e3a5
[Fix]Workstation holiday list
2016-11-21 11:23:01 +05:30
Rohit Waghchaure
a27c417e48
fix master data sync performance issue
2016-11-20 23:41:13 +05:30
Nabin Hait
cbd26e3b2c
Manual Depreciation Schedule for Asset
2016-11-18 17:19:45 +05:30
Rohit Waghchaure
2a81960e0b
test cases
2016-11-18 15:33:11 +05:30
Rohit Waghchaure
801029e055
Added item groups, customer groups in the POS profile.
2016-11-18 15:32:48 +05:30
Manas Solanki
60db98aaff
[Minor] Variable assignment before reference
...
Variable = 'inspection_required_fieldname'
2016-11-18 14:52:13 +05:30
Nabin Hait
5f453e7779
Merge pull request #6992 from rmehta/daily-work-summary
...
[Feature] Daily Work Summary
2016-11-18 14:00:08 +05:30
KanchanChauhan
49a50fef63
Group same item in SO print ( #6959 )
2016-11-18 13:57:53 +05:30
KanchanChauhan
dc2195c52a
[Documentation] Shopping Cart ( #6911 )
2016-11-18 13:56:06 +05:30
Nabin Hait
8704dd3134
Merge pull request #6970 from komsel2228/develop
...
fix bugs uom and conversion factor on stock entry
2016-11-18 12:56:41 +05:30
Manas Solanki
99dac07a56
[Fix] Minor fix for field rename
2016-11-18 12:52:34 +05:30
Nabin Hait
c29c5210f9
Merge pull request #6972 from RobertSchouten/bankstatement
...
[fix] update bank recon statement printing for payment entries
2016-11-18 12:50:40 +05:30
Nabin Hait
a3a59ea895
Merge pull request #6973 from RobertSchouten/bankrecon
...
[fix] layout for bank reconciliation
2016-11-18 12:49:16 +05:30
Nabin Hait
684d44385f
Merge pull request #6991 from rohitwaghchaure/delivery_note_issue
...
[Fix] Delivery note, show paking items in order, show serial no of the respective item in the dropdown of packing item
2016-11-18 12:45:31 +05:30
Nabin Hait
eae077e05d
Merge pull request #6989 from RobertSchouten/financialprint
...
[fix] financial printing and add to profitability
2016-11-18 12:44:50 +05:30
Rushabh Mehta
9dd58d42df
[fix] test cases and final wiring for daily work summary
2016-11-18 12:40:18 +05:30
Rushabh Mehta
c10d2a0025
[wip] daily work summary
2016-11-18 12:40:18 +05:30
Rushabh Mehta
fe816c3852
[fix] [wip] daily work summary
2016-11-18 12:40:18 +05:30
Rohit Waghchaure
e887e92dd4
Minor fix in delivery note, show paking items in order, show serial no of the respective item in the dropdown of packing item
2016-11-18 12:16:22 +05:30
robert schouten
0a1f3e4058
[fix] financial printing and add to profitability
2016-11-18 10:54:01 +08:00
Rohit Waghchaure
2ef7c7ae5c
[Fix] Onload pull pos profile data for IS POS invoice
2016-11-17 17:29:10 +05:30
Nabin Hait
52f101d776
Merge pull request #6981 from neilLasrado/develop
...
Added ability to mark attendance against a Student Batch
2016-11-17 17:10:05 +05:30
Nabin Hait
652743b26e
Merge branch 'master' into develop
2016-11-17 16:41:52 +05:30
Nabin Hait
f83302836c
bumped to version 7.1.15
2016-11-17 17:11:51 +06:00
Nabin Hait
bd99a7cb5d
Merge pull request #6980 from shreyasp/setup-wizard-domain
...
[Fix] Updated 'FR' translation to prevent setup wizard failure
2016-11-17 16:07:43 +05:30
Nabin Hait
46753de6d7
fixed merge conflict
2016-11-17 15:55:11 +05:30
Nabin Hait
f2b7ec919a
bumped to version 7.1.14
2016-11-17 16:24:07 +06:00
Nabin Hait
f76aab6021
Merge pull request #6976 from saurabh6790/advance_payment_entry_cancellation_fix
...
[fix] on advance payment entry cancellation delink invoice and pyamen…
2016-11-17 15:41:31 +05:30
Neil Trini Lasrado
d9bc5598b6
Added ability to mark attendance against a Student Batch
2016-11-17 15:36:14 +05:30
robert schouten
2b63e14089
dh drop guest from student attendance so disabling acedemic user disables all school doctypes ( #6974 )
2016-11-17 15:23:38 +05:30
Saurabh
1d210968de
[fix] on advance payment entry cancellation delink invoice and pyament entry references
2016-11-17 15:21:46 +05:30
Nabin Hait
d4e8b297cd
Merge pull request #6784 from RobertSchouten/calendar_fix
...
[fix] calendar range fixes
2016-11-17 14:45:59 +05:30
shreyas
0c93445be0
[Fix] Updated 'FR' translation to prevent setup wizard failure
2016-11-17 14:31:32 +05:30
Nabin Hait
7fc05d6432
Update update_missing_salary_component_type.py
2016-11-17 12:16:52 +05:30
robert schouten
a943535520
[fix] update bank recon statement printing for payment entries
2016-11-17 14:33:28 +08:00
robert schouten
60fb1b8643
[fix] layout for bank reconciliation
2016-11-17 14:30:47 +08:00
ShraddhaRanjane
045bfe641e
Update naming-series.md
2016-11-17 11:22:58 +05:30
Ignatius Cuknoris
6471057df4
fix bugs uom and conversion factor on stock entry
2016-11-17 10:31:19 +07:00
Nabin Hait
aa68058910
Updated modified_datetime in production planning tool
2016-11-16 17:41:08 +05:30
Nabin Hait
8dd859920f
Merge pull request #6960 from KanchanChauhan/thumbnail-in-shoppingcart
...
[Fix]Product thumbnail in Shopping Cart
2016-11-16 17:34:17 +05:30
Nabin Hait
7f6b99aca4
Merge pull request #6962 from KanchanChauhan/payroll-fixes
...
[Fix] Filters to get employee in Payroll
2016-11-16 17:34:00 +05:30
Nabin Hait
8af429da1f
Cleanup and fixes in quality inspection feature
2016-11-16 17:22:38 +05:30
Manas Solanki
55756d71b6
[Fix] Change of module of quality inspection
2016-11-16 17:22:38 +05:30
Manas Solanki
dbc2511a39
[Fix] Delivery Note fixed
2016-11-16 17:22:38 +05:30
Manas Solanki
34feab1b25
[Fix] Redesign of quality inspection doctype
2016-11-16 17:22:38 +05:30
Manas Solanki
a8d1bc7ff4
[Fix] Quality Inspection in Purchase Invoice fixed
2016-11-16 17:22:38 +05:30
Manas Solanki
c2cd3fd2c6
Function in parent transaction.js and call from corresponding files
2016-11-16 17:22:38 +05:30
Manas Solanki
cc90241fa5
Quality Inspection Issue
...
1. validate_inspection() function defination in stock_controller.py
2. function call in purchase_receipt.py, purchase_invoice.py and delivery_note.py
3. added functality in quality_inspection.py file for linking to purchase_receipt_no and delivery_note_no
2016-11-16 17:22:38 +05:30
mbauskar
e9747a8a6e
[minor] fixes in validate selling price
2016-11-16 17:19:47 +05:30
Kanchan Chauhan
7652b857c8
[Fix] Filters to get employee in Payroll
2016-11-16 15:29:01 +05:30
Kanchan Chauhan
98f499a43e
[Fix]Product thumbnail in Shopping Cart
2016-11-16 15:17:55 +05:30
Nabin Hait
535462fc20
Merge pull request #6947 from saurabh6790/delink_jv_from_advance
...
[fix] delink jv from advance table
2016-11-16 14:22:03 +05:30
Nabin Hait
e346a499c7
Merge pull request #6956 from rohitwaghchaure/payment_entry_issue
...
[Fix] Payment entry, exchange rate is not set properly
2016-11-16 14:15:52 +05:30
Saurabh
8adbfa8a09
[test-case] test cases for delinking advance payments
2016-11-16 13:43:01 +05:30
Saurabh
866c295989
[fix] on jv cancel remove linkings from advance table of Sales/Purchase Invoice
2016-11-16 13:43:01 +05:30
Nabin Hait
6d04afc19d
fixed merge conflict
2016-11-16 12:56:31 +05:30
Nabin Hait
38bfcaa203
bumped to version 7.1.13
2016-11-16 13:25:59 +06:00
Nabin Hait
00e841d744
update missing salary component abbr
2016-11-16 12:55:17 +05:30
Rohit Waghchaure
9b18ed4ffe
[Fix] Payment entry, exchange rate is not set properly
2016-11-16 12:24:40 +05:30
Rushabh Mehta
4bfa0748cd
[merge] master
2016-11-16 11:28:23 +05:30
Rushabh Mehta
a78bac61cc
bumped to version 7.1.12
2016-11-16 11:56:42 +06:00
rohitwaghchaure
48cb3d89b6
[Fix] Opening balance calculation issue for balance sheet ( #6945 )
2016-11-16 11:18:49 +05:30
Rushabh Mehta
8dfbe7c748
[fix] patch missing salary component type based on existing salary slips ( #6955 )
2016-11-16 11:18:20 +05:30
Shreyas Patil
99a3593a0d
[Fix] Make from_date and to_date for stock balance query report as mandatory fields ( #6948 )
2016-11-16 11:16:44 +05:30
rohitwaghchaure
7be942db54
[Fix] Status updater for sales order in purchase order ( #6944 )
2016-11-16 11:14:32 +05:30
Rushabh Mehta
24f658d633
[fix] [minor] accounts receivable not translated ( #6943 )
2016-11-16 11:13:46 +05:30
Rushabh Mehta
d51e1587d5
[fix] contact us page should create a opportunity by default ( #6939 )
2016-11-16 11:13:31 +05:30
rohitwaghchaure
b3ba7f01ef
[Fix] PO status not changed as material return created against them ( #6869 )
2016-11-16 11:10:10 +05:30
Rushabh Mehta
e0ab64d6cc
[minor] reload user for patch
2016-11-15 16:43:37 +05:30
Nabin Hait
952b1cb9a7
Merge pull request #6933 from rohitwaghchaure/remove_no_copy
...
disable no copy for po number, po date on sales order
2016-11-14 17:47:57 +05:30
Rohit Waghchaure
6f27f580e1
disable no copy for po number, po date on sales order
2016-11-14 16:08:18 +05:30
Rushabh Mehta
440650d4a2
[fix] view shopping cart dropdown ( #6928 )
2016-11-14 13:13:53 +05:30
Nabin Hait
95e6ccd419
Merge branch 'master' into develop
2016-11-14 12:42:26 +05:30
Nabin Hait
d209f21e76
bumped to version 7.1.11
2016-11-14 13:12:25 +06:00
Nabin Hait
a5a733630f
[fix] Opportunity loading issue
2016-11-14 12:32:16 +05:30
Nabin Hait
0075c7e659
Purchase Order and Receipt links in Purchase Invoice dashboard
2016-11-14 12:32:16 +05:30
Nabin Hait
7017dc029a
Editable grid columns for payment entry
2016-11-14 12:32:16 +05:30
Nabin Hait
f98835036b
Merge pull request #6900 from rohitwaghchaure/account_receivable_summary_report_issue
...
[Report] Company not found in the filter for making auto email report
2016-11-14 12:00:48 +05:30
Nabin Hait
47c8d5fd56
Merge pull request #6924 from nabinhait/hotfix
...
Fixed multiple minor issues
2016-11-14 11:59:46 +05:30
Nabin Hait
6209f2f75b
Merge pull request #6925 from rmehta/setup-wizard-fix
...
[fix] ignore duplicate names for program, academic term, academic year, course, instructor
2016-11-14 11:59:26 +05:30
Rushabh Mehta
463808ef9e
[fix] ignore duplicate names for program, academic term, academic year, course, instructor
2016-11-14 11:21:11 +05:30
Nabin Hait
256a3fef95
Fixed multiple minor issues
2016-11-14 11:10:50 +05:30
Rohit Waghchaure
387c2846aa
[Report] Company not found in the filter for making auto email report
2016-11-10 19:13:20 +05:30
shreyas
2cb294c8b4
[Docs] Updated docs for supplier quotation and purchase order
2016-11-10 18:14:33 +05:30
Nabin Hait
598a0c918d
[fix] fixed student dashboard issue ( #6897 )
2016-11-10 17:25:37 +05:30
Nabin Hait
fa220f93be
Merge branch 'master' into develop
2016-11-10 11:25:33 +05:30
Nabin Hait
27c1f85836
bumped to version 7.1.10
2016-11-10 11:55:33 +06:00
Nabin Hait
84ecaac27d
Update set_base_amount_in_invoice_payment_table.py
2016-11-10 11:24:22 +05:30
Saurabh
7fbc00c9d6
[fix] repost qty only for bin items
2016-11-09 16:10:42 +05:30
Nabin Hait
ceca1b97c3
Fixed merge conflict
2016-11-09 14:58:36 +05:30
Nabin Hait
549de70fa2
bumped to version 7.1.9
2016-11-09 15:25:29 +06:00
Rohit Waghchaure
2285f90b64
added debit and credit note status
2016-11-09 14:47:24 +05:30
Nabin Hait
bac447137a
Merge pull request #6833 from KanchanChauhan/jv-documentation
...
Credit Note, Debit Note, Excise Entry info added
2016-11-09 11:42:27 +05:30
Nabin Hait
5ccead5df0
Merge pull request #6850 from nabinhait/clear_jv_table
...
Clear rows from Journal Entry if no debit/credit
2016-11-09 11:40:42 +05:30
Nabin Hait
d4e59aa54f
Update journal_entry.py
2016-11-09 11:38:39 +05:30
Nabin Hait
a3daf58423
Merge pull request #6873 from saurabh6790/integration_broker_fix
...
[fix] added hook call to create payment gateway account record
2016-11-09 11:32:35 +05:30
Nabin Hait
82d1b23dcb
Merge pull request #6861 from rmehta/item-dashboard-enhancements
...
[minor] enhancements to item dashboard, filter by item group and show item name fixes #6459
2016-11-09 11:21:22 +05:30
Nabin Hait
a0a8cc58ae
Merge pull request #6865 from frappe/typo-fix
...
[fix] minor typo
2016-11-09 11:20:34 +05:30
Saurabh
94c666ae46
[fix] added hook call to create payment gateway account record
2016-11-08 20:35:50 +05:30
Rohit Waghchaure
2f1db57fe1
Added status field in sales invoice and purchase invoice
2016-11-08 18:49:58 +05:30
Nabin Hait
31f6436f75
[patch] Set base amount in Sales Invoice Payment table
2016-11-08 17:41:14 +05:30
Nabin Hait
a469e659c5
Fixed merge conflict
2016-11-08 15:26:27 +05:30
Nabin Hait
436d82e60b
bumped to version 7.1.8
2016-11-08 15:52:54 +06:00
Valmik
38cc16a806
[fix] minor typo
2016-11-08 14:11:12 +05:30
Nabin Hait
be06cde5f5
Update gl_entry.py
2016-11-08 13:13:57 +05:30
Rushabh Mehta
057db06216
[minor] enhancements to item dashboard, filter by item group and show item name fixes #6459
2016-11-08 12:40:10 +05:30
Nabin Hait
cdc895734f
Merge pull request #6819 from rohitwaghchaure/hotfix_issues
...
cleanup and fixes
2016-11-08 12:05:47 +05:30
Nabin Hait
d2cf4eb1d2
Merge pull request #6851 from rohitwaghchaure/pricing_rule_discount_issue
...
[POS] Pricing rule discount issue
2016-11-08 12:02:51 +05:30
strixaluco
c8bfc87b58
[typo] desription → description in zh-tw.csv
2016-11-08 10:57:45 +08:00
strixaluco
06e9de82a6
[typo] desription → description in es-PE.csv
2016-11-08 10:57:16 +08:00
strixaluco
2ef9232707
[typo] desription → description in bom.json
2016-11-08 10:56:36 +08:00
Kanchan Chauhan
b5574d3571
Credit Note, Debit Note, Excise Entry info added
2016-11-07 23:10:20 +05:30
Rohit Waghchaure
619c40b04a
[POS] Pricing rule discount issue
2016-11-07 19:41:10 +05:30
KanchanChauhan
6d5fcdec5a
Item Inspection before Delivery ( #6823 )
2016-11-07 17:49:37 +05:30
Rushabh Mehta
13fc52d713
[minor] added default standard filters ( #6854 )
2016-11-07 17:19:19 +05:30
pratu16x7
84228402e6
Update erpnext manual link ( #6853 )
...
* Update erpnext manual link
* Update README.md
* Update conf.js
2016-11-07 17:18:15 +05:30
robert schouten
8672f29c6f
[minor] add rate to stock entry detail grid ( #6843 )
2016-11-07 17:17:12 +05:30
robert schouten
d8bdaeffe3
[fix] include cancel time logs in convert and v6 to v7.1 fix ( #6840 )
2016-11-07 17:16:39 +05:30
Faris Ansari
5049296f8d
[ui] fix student image not visible ( #6825 )
2016-11-07 17:10:10 +05:30
Nagarajan
7b7b5bd340
Update getting-started-with-erpnext.md ( #6832 )
2016-11-07 17:09:41 +05:30
KanchanChauhan
dd01bcc485
Get employee details in Salary Slip ( #6837 )
2016-11-07 17:09:07 +05:30
robert schouten
27d45a244e
[fix]fix name definition in old patch ( #6841 )
2016-11-07 17:08:37 +05:30
Nabin Hait
43eeddfaf6
Clear rows from Journal Entry if no debit/credit
2016-11-07 15:25:40 +05:30
Manas Solanki
546ca31a4e
Notification Count Issue #5987
...
Add notification count for Payment Entry in Accounts module page
2016-11-05 11:47:24 +05:30
pratu16x7
a43639edb4
[fix] role fix for schools setup ( #6824 )
2016-11-05 10:09:53 +05:30
Rohit Waghchaure
0ecad33642
cleanup and fixes
2016-11-05 08:09:21 +05:30
Nabin Hait
f5d8dd3b18
Fixed merge conflict
2016-11-04 16:54:53 +05:30
Nabin Hait
a28c2d37f7
bumped to version 7.1.7
2016-11-04 17:23:17 +06:00
Nabin Hait
81f7a265bc
Merge pull request #6723 from rohitwaghchaure/enhancement_remember_last_selected_value
...
Remember last selected value for link field
2016-11-04 16:13:49 +05:30
Nabin Hait
bd2d4762d9
Merge pull request #6817 from nabinhait/hotfix
...
[fix] float division by zero
2016-11-04 16:06:27 +05:30
Nabin Hait
4c46c3e94a
Merge pull request #6774 from KanchanChauhan/salarystruct-process-payroll
...
[Fix] Error in pulling in Salary Structure fixed
2016-11-04 15:58:44 +05:30
Kanchan Chauhan
63dda84862
[Fix] Error in pulling in Salary Structure fixed
2016-11-04 12:58:05 +05:30
nagarajannxweb
a420c20bf9
Update salary-and-payroll.md
2016-11-04 12:30:14 +05:30
nagarajannxweb
4d100ac08b
Update salary-and-payroll.md
2016-11-04 12:17:21 +05:30
Nabin Hait
e593f170a3
[fix] Patch order changed
2016-11-04 11:43:58 +05:30
Nabin Hait
43d2fec78e
[fix] float division by zero
2016-11-04 10:58:30 +05:30
Rohit Waghchaure
0d2f7e62c0
set remember last selected value as true for company field
2016-11-03 16:19:34 +05:30
Nabin Hait
eab38cd4eb
Merge branch 'master' into develop
2016-11-03 15:17:39 +05:30
Nabin Hait
bb2ede8fab
bumped to version 7.1.6
2016-11-03 15:47:38 +06:00
Nabin Hait
a3f393918d
Merge pull request #6807 from nabinhait/hotfix
...
[fix] Get data in opportunity dashboard
2016-11-03 15:13:03 +05:30
Nabin Hait
9f5f534900
set item rate on first selection of item
2016-11-03 14:54:06 +05:30
Rohit Waghchaure
3844d2cc01
Remember last selected value for link field
2016-11-03 14:49:27 +05:30
Nabin Hait
1ac67b873c
[fix] Get data in opportunity dashboard
2016-11-03 11:00:09 +05:30
Nabin Hait
ceca7fbc87
Merge pull request #6780 from rohitwaghchaure/float_issue
...
Change fieldtype from float to currency
2016-11-03 10:49:05 +05:30
Nabin Hait
57f51f648e
Merge pull request #6795 from manassolanki/report
...
Report: Bin - Item Shortage Report -- Should have Item Name and descr…
2016-11-03 10:48:37 +05:30
Nabin Hait
4c5bd43ec0
Merge pull request #6794 from neilLasrado/hotfix
...
Documentation Cleanup
2016-11-03 10:41:23 +05:30
robert schouten
e32e2126f4
gantt fix
2016-11-03 08:10:30 +08:00
robert schouten
e8c1777c5f
gantt fix
2016-11-03 08:10:03 +08:00
Rushabh Mehta
f87b7b0c4e
[fix] typo
2016-11-02 10:53:53 +05:30
Rushabh Mehta
e855f53f08
[minor] fix ellipsis style
2016-11-02 07:34:17 +05:30
Rushabh Mehta
1aac956306
[minor] [fixes] can rename program and disable role on domainify
2016-11-02 07:33:18 +05:30
Rushabh Mehta
bdc8a88b4d
[minor] fix date comparisons
2016-11-02 07:32:09 +05:30
Neil Trini Lasrado
f905ee9f0f
Updated documentation for warehouse
2016-11-01 18:58:29 +05:30
Neil Trini Lasrado
8b99a06477
Projected qty image cleanup in documentation
2016-11-01 18:48:52 +05:30
Manas Solanki
5bc4784bad
Report: Bin - Item Shortage Report -- Should have Item Name and description #4946
...
New report is build including two new column Item name and item description
2016-11-01 18:07:12 +05:30
Rohit Waghchaure
c84072b16f
[Fix] jinja syntax issue
2016-11-01 17:58:10 +05:30
Nabin Hait
df01b5770b
Merge branch 'master' into develop
2016-11-01 17:44:43 +05:30
Nabin Hait
74874d5785
bumped to version 7.1.5
2016-11-01 18:14:43 +06:00
Nabin Hait
06fe0c7c9d
Merge pull request #6790 from neilLasrado/hotfix
...
Hotfixes for demo
2016-11-01 17:40:03 +05:30
Nabin Hait
8015d60e97
Merge pull request #6772 from frappe/bcornwellmott-patch-3
...
[fix] Change communication to Linked
2016-11-01 17:31:38 +05:30
Nabin Hait
c3b29f6a5b
Merge pull request #6738 from KanchanChauhan/name-on-check
...
Different name on Check
2016-11-01 17:29:04 +05:30
Nabin Hait
6dc30c97bc
Merge pull request #6788 from rohitwaghchaure/documentation
...
Article for adjust withhold amount using payment entry
2016-11-01 17:27:18 +05:30
Nabin Hait
dec9f2558e
Update purchase_receipt.py
2016-11-01 17:24:46 +05:30
Neil Trini Lasrado
6da2b08cea
Fixes for demo
2016-11-01 17:05:53 +05:30
Neil Trini Lasrado
9dde085144
Fixes to demo
2016-11-01 17:05:43 +05:30
Neil Trini Lasrado
1569cf8eb3
Fix user for demo
2016-11-01 17:05:35 +05:30
Rohit Waghchaure
60e5e4ac2d
change fieldtype from float to currency
2016-11-01 16:32:33 +05:30
Saurabh
0cf7f7aee0
[fix] set default value as empty frappe dict
2016-11-01 16:19:33 +05:30
Rohit Waghchaure
2647c9a6ea
article for adjust withhold amount using payment entry
2016-11-01 16:04:00 +05:30
Nabin Hait
2fa227314e
Merge pull request #6782 from KanchanChauhan/customerreport-from-crm
...
[Fix] Customer Addresses and Contacts report fixed for CRM module
2016-11-01 15:23:10 +05:30
Nabin Hait
f4068fd6f1
Fixed merge conflict
2016-11-01 15:06:55 +05:30
Nabin Hait
c538a55a5a
bumped to version 7.1.4
2016-11-01 15:35:53 +06:00
robert schouten
bb79fc5b0c
[fix] calendar range fixes
2016-11-01 17:14:51 +08:00
Kanchan Chauhan
283b8c98f8
[Fix] Customer Addresses and Contacts report fixed for CRM module
2016-11-01 14:38:06 +05:30
Rohit Waghchaure
53bb687009
hotfix issues
2016-11-01 13:21:43 +05:30
Nabin Hait
22161566ed
Update index.md
2016-11-01 12:36:03 +05:30
Nabin Hait
c61892501c
[fix] Report GLE for Purchase Invoice with Update Stock option
2016-11-01 11:45:32 +05:30
Nabin Hait
eb2a98faca
Merge pull request #6776 from shreyasp/coa-docs
...
[Documentation] Updated Chart of acccounts page to show new reports instead of financial analytics report
2016-11-01 11:07:39 +05:30
shreyas
9cffdba940
[Documentation] Updated Chart of acccounts page to show new reports instead of financial analytics report
2016-10-31 23:25:10 +05:30
bcornwellmott
3af67fb2c3
Fix syntax
2016-10-31 08:53:37 -07:00
bcornwellmott
8d083f0d10
[fix] Change communication to Linked
...
Currently, the Request for Quotation emails are not linked to the RFQ document. This resolves that issue.
https://discuss.erpnext.com/t/open-communications-for-rfq/17184
2016-10-31 06:54:01 -07:00
Kanchan Chauhan
6b162386ca
Different name on Check
2016-10-31 17:36:43 +05:30
Nabin Hait
0acfd518a8
Merge pull request #6770 from neilLasrado/develop
...
Fixes for demo
2016-10-31 17:29:01 +05:30
Neil Trini Lasrado
ebe0b6557c
Fixes for demo
2016-10-31 17:13:30 +05:30
Nabin Hait
b9f708663c
Update item.py
2016-10-31 16:52:17 +05:30
Nabin Hait
551360ae30
Fixed merge conflict
2016-10-31 16:38:09 +05:30
Nabin Hait
60aa3898c7
bumped to version 7.1.3
2016-10-31 17:07:29 +06:00
Nabin Hait
fd3aefd73d
Merge pull request #6763 from rohitwaghchaure/documentation
...
[Fix] Documentation
2016-10-31 16:35:54 +05:30
Nabin Hait
c851d24b2c
Merge pull request #6765 from KanchanChauhan/broken-creation-document-link
...
[Fix] Serial No report fixed for Creation No link
2016-10-31 16:26:41 +05:30
Nabin Hait
f5f3ef1bae
repost gle for Purchase Invoice with update stock
2016-10-31 16:17:10 +05:30
Kanchan Chauhan
9100322462
[Fix] Serial No report fixed for Creation No link
2016-10-31 16:01:09 +05:30
Rohit Waghchaure
4fe4f267f4
[Fix] Documentation
2016-10-31 15:40:59 +05:30
Nabin Hait
d9b994de91
Merge branch 'master' into develop
2016-10-31 15:04:31 +05:30
Nabin Hait
1e45ec9237
Merge branch 'hotfix'
2016-10-31 15:04:31 +05:30
Nabin Hait
9a8be357e6
bumped to version 7.1.2
2016-10-31 15:34:31 +06:00
Nabin Hait
d08ced14ca
Merge pull request #6751 from neilLasrado/develop
...
Fixes to demo
2016-10-31 13:15:36 +05:30
Nabin Hait
eb1a55bbba
Update purchase_receipt.py
2016-10-29 14:49:33 +05:30
Nabin Hait
952c9cccfc
Merge pull request #6734 from KanchanChauhan/default-warehouse-in-item
...
Default warehouse in Item master
2016-10-29 14:44:19 +05:30
Nabin Hait
5fc624b9ed
Update save_stock_settings.py
2016-10-29 14:43:58 +05:30
Nabin Hait
44281b7a01
Merge pull request #6719 from frappe/bcornwellmott-patch-1
...
Fix calendar view for Timesheet
2016-10-29 14:41:42 +05:30
Nabin Hait
7d3012d0b8
Merge pull request #6722 from mbauskar/develop
...
[minor] link formatter fixes for Item and Employee
2016-10-29 14:41:00 +05:30
Nabin Hait
358492fbde
Merge pull request #6745 from frappe/nabinhait-patch-2
...
Update ae_uae_chart_template_standard.json
2016-10-29 14:39:15 +05:30
Faris Ansari
8dbcbcf0f4
[documentation] Update Sales Invoice #6507 ( #6748 )
...
* [documentation] Update Sales Invoice
* add screenshot
* delete screenshot
* add correct screenshot
2016-10-29 14:38:03 +05:30
Neil Trini Lasrado
71e3746a05
Fixes to demo
2016-10-28 18:59:33 +05:30
Rohit Waghchaure
7488cf1ce1
[Fix] country wise tax, country name issue
2016-10-28 18:01:43 +05:30
Neil Trini Lasrado
29cae17e87
Fix user for demo
2016-10-28 16:39:45 +05:30
Nabin Hait
bb5e333c1a
Update ae_uae_chart_template_standard.json
2016-10-28 15:20:31 +05:30
Kanchan Chauhan
4c22825f01
Default warehouse in Item master
2016-10-27 23:56:04 +05:30
Nabin Hait
a330d330c8
Merge branch 'master' into develop
2016-10-27 19:14:55 +05:30
Nabin Hait
9dcb778f17
bumped to version 7.1.1
2016-10-27 19:44:54 +06:00
Nabin Hait
8042ba3be3
Merge pull request #6728 from neilLasrado/develop
...
Added naming series to Course Schedule
2016-10-27 15:37:59 +05:30
Neil Trini Lasrado
5f041e9665
Added naming series to Course Schedule
2016-10-27 15:37:03 +05:30
Saurabh
468e41f24f
[enhance] introduce ignore_fields param for _tree and get_query
2016-10-27 15:23:19 +05:30
Nabin Hait
622c05cc60
Merge pull request #6724 from rohitwaghchaure/bank_clearance_report_issue
...
[Fix] No permission to read report Bank Clearance Summary for account user
2016-10-27 13:48:19 +05:30
Rohit Waghchaure
53a28eb39d
[Fix] No permission to read report Bank Clearance Summary for account user
2016-10-27 11:46:10 +05:30
mbauskar
be81442c82
[minor] link formatter fixes for Item and Employee
2016-10-27 09:49:22 +05:30
bcornwellmott
7ef2c0fc34
Fix calendar view for Timesheet
...
All the calendar events for Timesheets show up on one date. This is because there was a change to the timesheet_calendar.js file when the Gantt chart was added, but the get_events for the calendar wasn't fixed at the same time. Just fixing the reference to the start and end times.
2016-10-26 11:02:48 -07:00
Nabin Hait
62616a03b3
bumped to version 7.1.0
2016-10-26 18:26:16 +06:00
Nabin Hait
6d1eda812d
Update __init__.py
2016-10-26 17:54:47 +05:30
Nabin Hait
72cee33b3a
[translations]
2016-10-26 17:45:06 +05:30
Nabin Hait
72a1943c8e
Fixed version conflict
2016-10-26 16:41:21 +05:30
Nabin Hait
f3882d2699
bumped to version 7.0.63
2016-10-26 17:10:44 +06:00
Nabin Hait
2e12a76d18
Merge pull request #6716 from nabinhait/develop
...
Change Logs for v7.1
2016-10-26 16:37:10 +05:30
Nabin Hait
7f19a24e5e
Merge pull request #6705 from KanchanChauhan/get-serial-no
...
Fetch serial no by default
2016-10-26 16:31:11 +05:30
Nabin Hait
c5cbde273f
Change Logs for v7.1
2016-10-26 16:28:54 +05:30
Kanchan Chauhan
0a3f2c818a
Fetch serial no by default
2016-10-26 14:59:43 +05:30
Nabin Hait
683c4798b5
Merge pull request #6714 from KanchanChauhan/balance-sheet-error
...
[Fix] Error in Balance Sheet Report
2016-10-26 14:27:33 +05:30
Nabin Hait
a3c24385cf
Merge pull request #6710 from frappe/bcornwellmott-patch-1
...
[Minor] Add details to MRs from PPT
2016-10-26 13:06:22 +05:30
Nabin Hait
e0aaea20af
Merge pull request #6701 from shreyasp/modify-submit-docs
...
[Fix] Make purchase order item reqd_date modifiable after submit
2016-10-26 13:05:11 +05:30
Kanchan Chauhan
dc3198a11c
[Fix] Error in Balance Sheet Report
2016-10-26 13:05:08 +05:30
Shreyas Patil
6c7d6e095b
Update purchase_order_item.json
2016-10-26 12:47:35 +05:30
shreyas
fd04d62c2e
[Minor] Added expected_delivery_date to purchase order item doctype
2016-10-26 12:38:31 +05:30