Kanchan Chauhan
4a888b4c91
[Fix] lwp issue fixed for salary slip without salary structure
2016-12-04 13:42:30 +05:30
Kanchan Chauhan
af0d6378f1
[Fix] Fetch Serial No by default for Delivery Note Item
2016-12-02 18:18:04 +05:30
Neil Trini Lasrado
6841b3198b
Added Roll Number to Student Batch Attendance Tool and Optimised code to mark attendance
2016-12-01 18:40:49 +05:30
Neil Trini Lasrado
305166b111
Fixes for Student Batch Wise attendance tool
2016-12-01 18:40:49 +05:30
Nabin Hait
14a4c729b3
Merge pull request #7038 from KanchanChauhan/pricing-rule-in-shopping-cart
...
Apply Pricing Rule in Shopping Cart
2016-12-01 18:09:34 +05:30
Nabin Hait
6c44d259ca
Merge pull request #7106 from pratu16x7/doc-fixes
...
CRM: Customer page fixes
2016-12-01 18:09:02 +05:30
Nabin Hait
1ab446a810
Merge pull request #7086 from frappe/netchampfaris-documentation
...
Update quotation.md
2016-12-01 18:08:36 +05:30
Nabin Hait
cd43d3aa20
Merge pull request #7088 from rohitwaghchaure/documentation_november
...
[fix] Documentation
2016-12-01 18:08:05 +05:30
Nabin Hait
ee9d1b4520
Merge pull request #7099 from ishanloya/patch-1
...
Update merging-documents.md
2016-12-01 18:07:49 +05:30
Nabin Hait
feec1abb6e
Merge pull request #7103 from bhupennewalkar1337/delivery-note-fix
...
[Fix] Disallow same items to be fetched multiple times in sales invoice
2016-12-01 18:07:28 +05:30
Nabin Hait
d97ec828b5
Merge pull request #7113 from rohitwaghchaure/edit_serial_no
...
Allow user to edit serial no for credit note, debit note
2016-12-01 18:06:58 +05:30
Neil Trini Lasrado
71aaeae91c
Fixes for Student Batch-Wise Attendance report and Absent Student Report
2016-12-01 16:48:27 +05:30
Nabin Hait
1f1ffd79e2
Merge pull request #7109 from RobertSchouten/project_wise
...
[fix] Project wise Stock Tracking is script report
2016-12-01 16:12:46 +05:30
Nabin Hait
c92e2f9044
Update project_wise_stock_tracking.json
2016-12-01 16:12:35 +05:30
Rohit Waghchaure
2e8a94458d
allow user to edit serial no for credit note, debit note
2016-12-01 16:04:41 +05:30
Neil Trini Lasrado
e6fb25cce8
Fixes for Student Batch-Wise Attendance report
2016-12-01 16:02:11 +05:30
Kanchan Chauhan
faa525e4f1
[Fix] Fixed condition and formula issue in Salary Slip
2016-12-01 15:31:38 +05:30
Neil Trini Lasrado
19e8bd2221
renamed 'active' in Student Batch to 'enabled'
2016-12-01 14:30:47 +05:30
Neil Trini Lasrado
c6e74680ee
Added Instructor as a Role
2016-12-01 13:00:14 +05:30
Neil Trini Lasrado
2607898cde
Added Student Batch-Wise Attendance report
2016-12-01 12:53:40 +05:30
robert schouten
81a5467c8f
[fix] Project wise Stock Tracking is script report
2016-12-01 09:02:17 +08:00
robert schouten
0beb5bdea6
calc timesheet dates on validate not just submit
2016-12-01 08:51:03 +08:00
pratu16x7
9dd34427ef
Change alt text and German page image link
2016-11-30 15:48:14 +05:30
pratu16x7
d849093dff
CRM: Customer page fixes
2016-11-30 15:41:30 +05:30
bhupen
3c7e70ffb3
[Fix] Disallow same items to be fetched multiple times in sales invoice
2016-11-30 14:32:11 +05:30
Ishan Loya
a40cefeaeb
Update merging-documents.md
...
Fixed some typos
2016-11-29 16:07:33 +05:30
Faris Ansari
a2ea2ca990
Update sales-order.md
2016-11-29 11:32:11 +05:30
Faris Ansari
8da43fe074
add selling-flow
2016-11-29 11:22:57 +05:30
Faris Ansari
d0654912c4
Update quotation.md
2016-11-29 11:21:40 +05:30
Neil Trini Lasrado
87edfef0bb
Added ability to mark student batch in-active
2016-11-28 18:09:50 +05:30
Neil Trini Lasrado
331361d03b
Added Absent Student Report
2016-11-28 16:57:30 +05:30
Neil Trini Lasrado
14b27c5b42
New Doctype - Student Leave Application
2016-11-28 16:57:30 +05:30
Neil Trini Lasrado
d3a410b0f3
Added Student Monthly Attendence Sheet Report
2016-11-28 16:57:30 +05:30
Rohit Waghchaure
59844a12aa
[fix] documentation
2016-11-28 15:51:05 +05:30
Nabin Hait
7f3da5dbb1
Fixed merge conflict
2016-11-28 14:23:51 +05:30
Nabin Hait
edfca16931
bumped to version 7.1.20
2016-11-28 14:52:54 +06:00
Faris Ansari
834a3c990e
fix image link
2016-11-28 13:16:57 +05:30
Faris Ansari
64d1c95afe
add taxes gif
2016-11-28 13:15:29 +05:30
Faris Ansari
a9b34edef0
Update quotation.md
2016-11-28 13:08:49 +05:30
Nabin Hait
ac3ad62164
Merge pull request #7052 from saurabh6790/integration_service_document
...
[documentaion] Documentaion for setting up Integration Service
2016-11-28 12:43:21 +05:30
Nabin Hait
50a240e758
Merge pull request #7061 from rohitwaghchaure/cost_center_issue
...
[Fix] Cost center group not showing data in the P&L report
2016-11-28 12:42:48 +05:30
Nabin Hait
b6c7420a34
Merge pull request #7068 from frappe/MaxMorais-patch-1
...
Bug due Translation support in Support Analytics
2016-11-28 12:41:52 +05:30
Nabin Hait
8020b5ceb7
Merge pull request #7063 from umairsy/conf
...
[Fixed] Documentation #6892
2016-11-28 12:40:55 +05:30
Nabin Hait
fe10780878
Merge pull request #7076 from yashodhank/manual-fixes
...
[Docs] Fixed type and renamed file
2016-11-28 12:39:57 +05:30
Nabin Hait
96be3dd4f4
Merge pull request #7082 from rohitwaghchaure/pos_qty_issues
...
[Fix] Wrong actual qty showing in POS
2016-11-28 12:39:09 +05:30
Nabin Hait
a78c463e97
Multiple minor fixes
2016-11-27 16:32:41 +05:30
Rohit Waghchaure
80f5bb6a6c
[Fix] Wrong actual qty showing in POS
2016-11-27 12:04:12 +05:30
Yashodhan K
7b090312d5
[Docs] Fixed type and renamed file
...
Fixed typo and renamed file to correct url link.
2016-11-26 20:08:02 +05:30
Kanchan Chauhan
50593317d9
Added account types to Add Child option of COA
2016-11-26 18:49:32 +05:30
Nabin Hait
d0839799c1
Update workstation.py
2016-11-26 09:54:00 +05:30
Rohit Waghchaure
bca0d73e1c
[Fix] Cost center group not showing data in the P&L report
2016-11-25 14:54:34 +05:30
Rohit Waghchaure
9a36083095
[fix] Barcode and special character issue in the search box of the POS
2016-11-25 11:17:48 +05:30
Nabin Hait
672ffc0ff4
Update patches.txt
2016-11-25 11:15:20 +05:30
Maxwell Morais
2f948530cb
Bug due Translation support in Support Analytics
...
I think no one that don't speak english use this!
But today talking about this report, I discovered that it dont work!
For my surprise, it don't work have 2 years, if you aren't a english speaker!
2016-11-24 20:36:40 -06:00
Umair Sayyed
829e00c2e6
[Fixed] Documentation #6892
2016-11-24 17:41:29 +05:30
Nabin Hait
3247db4827
Merge pull request #7050 from nabinhait/coa_based_on_existing_company
...
Create Chart of Accounts based on existing company
2016-11-24 13:28:11 +05:30
Nabin Hait
926d72424d
Merge pull request #6699 from rohitwaghchaure/bom_price_list_issue
...
[Enhancement] Currency added in the BOM
2016-11-24 13:27:17 +05:30
Nabin Hait
a8333be6ad
Merge pull request #7023 from frappe/revert-7012-remove-count-star
...
Revert "[optimize] remove count(*) from queries"
2016-11-24 13:26:38 +05:30
Saurabh
8cd1918a3c
[documentaion] Documentaion for setting up Integration Service
2016-11-23 19:09:43 +05:30
Rohit Waghchaure
8c4e45ab3d
cleanup timesheet
2016-11-23 17:54:47 +05:30
Nabin Hait
e0089184e6
Create Chart of Accounts based on existing company
2016-11-23 17:34:16 +05:30
bhupen
c097a4fe68
Changes in company doctype for chart of accounts
2016-11-23 17:34:16 +05:30
Nabin Hait
f89f17cdde
Merge branch 'master' into develop
2016-11-23 16:00:22 +05:30
Nabin Hait
580534a22a
bumped to version 7.1.19
2016-11-23 16:30:22 +06:00
Nabin Hait
297d74a997
Unlink payment entries on cancellation of invoice
2016-11-23 15:59:00 +05:30
Nabin Hait
d194cce35c
fixed merge conflict
2016-11-23 14:55:23 +05:30
Nabin Hait
7f540af7a6
bumped to version 7.1.18
2016-11-23 15:23:42 +06:00
Nabin Hait
b18ad55e2b
minor fixes
2016-11-23 14:51:30 +05:30
Nabin Hait
cf895c220c
Update account_tree.js
2016-11-23 14:44:07 +05:30
Saurabh
9342f650e0
[fix] remove root type selection while created new node and hooks call to initialize payment gateway
2016-11-23 14:06:14 +05:30
Nabin Hait
ae8df2b01c
Merge pull request #7033 from strixaluco/develop
...
[docs] URL fixes
2016-11-23 13:27:01 +05:30
Nabin Hait
4059fb3961
delivery note dashboard fix for quality inspection
2016-11-23 11:45:19 +05:30
robert schouten
085706bcbf
[fix] naming series only show non disabled role doctypes
2016-11-23 13:57:21 +08:00
Rushabh Mehta
5dd12cb4f0
Merge branch 'master' into develop
2016-11-22 23:18:29 +05:30
Rushabh Mehta
6557e37d5c
bumped to version 7.1.17
2016-11-22 23:48:28 +06:00
Rushabh Mehta
698c040d21
[hot] fix quotation ( #7039 )
2016-11-22 23:16:40 +05:30
Kanchan Chauhan
2c1f399479
Apply Pricing Rule in Shopping Cart
2016-11-22 22:23:31 +05:30
Rushabh Mehta
4e61564f73
[minor] fixes to daily work summary formatting
2016-11-22 21:59:20 +05:30
strixaluco
fc6a3aa42c
[docs] URL fixes
2016-11-22 16:25:20 +08:00
Rohit Waghchaure
334f032780
fix patch
2016-11-22 13:30:13 +05:30
Rohit Waghchaure
b1b328865e
[Enhancement] Currency added in the BOM
2016-11-22 12:52:20 +05:30
Nabin Hait
ee874a2a36
Update student_admission.py
2016-11-22 12:42:24 +05:30
Rushabh Mehta
9872d8cdb5
Revert "[optimize] remove count(*) from queries"
2016-11-21 21:04:47 +05:30
Nabin Hait
d3344ebcd1
Merge pull request #7021 from neilLasrado/develop
...
Added Instructors table to Student Batch
2016-11-21 19:36:11 +05:30
Nabin Hait
d855167b9b
Fixed merge conflict
2016-11-21 19:13:22 +05:30
Neil Trini Lasrado
fb35b484a5
Added Instructors table to Student Batch
2016-11-21 19:10:13 +05:30
Nabin Hait
d75d3a927d
bumped to version 7.1.16
2016-11-21 19:40:05 +06:00
Nabin Hait
4374ef5adc
Merge pull request #6995 from neilLasrado/develop
...
Added Student Batch Name & Batch Creation Tool in Schools Module.
2016-11-21 19:08:15 +05:30
Nabin Hait
651d8e996b
Merge pull request #7020 from nabinhait/balance_sheet_fix
...
Provisional Loss related fix in Balance Sheet. Fixed #6918
2016-11-21 19:06:42 +05:30
Nabin Hait
d01d74cafd
Merge pull request #7019 from nabinhait/fix_10014
...
Default warehouse is mandatory only for stock item in POS. Fixed #6893
2016-11-21 19:06:30 +05:30
Nabin Hait
9789b50ae5
Merge pull request #7018 from nabinhait/fix_10013
...
Set project from Sales Order while creating Material Request from PPT, fixed #6731
2016-11-21 19:06:14 +05:30
Nabin Hait
5224a04628
Merge pull request #7016 from nabinhait/fix_10012
...
Set WIP warehouse in Pro Order based on Manufacturing Settings. Fixed #6636
2016-11-21 19:05:50 +05:30
Nabin Hait
bdab3103e3
Merge pull request #7015 from nabinhait/fix_10011
...
Multiple fixes
2016-11-21 19:05:34 +05:30
Nabin Hait
09f7a7a977
Merge pull request #7013 from rmehta/remove-features-setup-docs
...
[fix] remove feature setup docs
2016-11-21 19:05:04 +05:30
Nabin Hait
376e8945f7
Merge pull request #7014 from rohitwaghchaure/rename_autoname_field
...
patch for rename autoname field
2016-11-21 19:04:44 +05:30
Nabin Hait
3d5ef804b2
Provisional Loss related fix in Balance Sheet. Fixed #6918
2016-11-21 18:53:05 +05:30
Rushabh Mehta
0d5d4aefe5
[docs] added style
2016-11-21 18:47:00 +05:30
Neil Trini Lasrado
f89ffdb57a
Fixes for student Attendance
2016-11-21 18:32:40 +05:30
Nabin Hait
977eff911f
Default warehouse is mandatory only for stock item in POS. Fixed #6893
2016-11-21 18:29:16 +05:30
Nabin Hait
9b797974b5
Set project from Sales Order while creating Material Request from PPT, fixed #6731
2016-11-21 18:15:50 +05:30
Nabin Hait
075e33245e
Set WIP warehouse in Pro Order based on Manufacturing Settings. Fixed #6636
2016-11-21 18:09:55 +05:30
Neil Trini Lasrado
b444d5d81b
Rename Scheduling Tool to Course scheduling Tool, Batch Name to Student Batch Name and Batch Creation tool to Student Batch Creation tool
2016-11-21 17:04:23 +05:30
Nabin Hait
fd23fa7c0b
Prifitability report link added to accounts module page
2016-11-21 16:59:03 +05:30
Nabin Hait
542bf8f7d4
Party filter and total row for opening and closing in trial balance for party report
2016-11-21 16:58:50 +05:30
Rohit Waghchaure
4810d1fa2d
patch for rename autoname field
2016-11-21 16:52:50 +05:30
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