Faris Ansari
b5608f9b14
[fix] Default Print Format for Sales Invoice ( #8419 )
...
- frappe/erpnext#8416
2017-04-12 15:31:01 +05:30
rohitwaghchaure
5adce495aa
Merge pull request #8417 from rohitwaghchaure/due_date_issue
...
[fix] POS, Due Date cannot be before Posting Date
2017-04-12 14:43:21 +05:30
Rushabh Mehta
66272a168d
[minor] README.md + encode query parameter in search
2017-04-12 14:32:07 +05:30
Rohit Waghchaure
2192c244c0
[fix] POS, Due Date cannot be before Posting Date
2017-04-12 13:19:05 +05:30
Makarand Bauskar
141c244ece
[minor] added order by args to get_*_list methods ( #8413 )
2017-04-12 13:02:28 +05:30
Nabin Hait
d1fda1ff2b
bumped to version 8.0.9
2017-04-11 19:44:12 +06:00
mbauskar
b9d0e7622a
[translation] translation updates for - erpnext on 2017-04-04
2017-04-11 18:57:48 +05:30
mbauskar
2f9703c20e
[minor] set company_currency as account_currency in general ledger if party type is employee
2017-04-11 18:56:41 +05:30
Khairil Zhafri
46b6d4ea47
Update student.json
...
Less binary gender option for Student
2017-04-11 18:55:31 +05:30
Khairil Zhafri
417145bec5
Update employee.json
...
Less binary gender options for Employee
2017-04-11 18:55:20 +05:30
Rohit Waghchaure
1ff1368280
[fix] Vehicle expense report not working
2017-04-11 18:54:32 +05:30
joezsweet
768a888bf2
[fix] validate supplier invoice
...
- modified to check for the selected supplier only
2017-04-11 18:52:46 +05:30
Julian Robbins
8037a0e3d5
Update assignment.md
...
A typo and improvement tom English
2017-04-11 18:51:34 +05:30
mbauskar
0b665ac791
[minor] don't throw error for buying transactions if price list is not selected
2017-04-11 18:51:12 +05:30
Rohit Waghchaure
87ad6d074a
[enhance] Stock qty added in purchase invoice
2017-04-11 18:29:52 +05:30
Kanchan Chauhan
95108ac80b
[Minor] Party validation for Employee
2017-04-11 18:29:27 +05:30
Dominik Ottenbreit
9b9777be3f
Fix mistranslation "Lieferantennauftrag" -> "Bestellung"
...
There is the strange term of "Lieferantenauftrag" that has been used for
"Purchase Order" which translates to "Supplier Order". This is not
standard at all and should be fixed to "Bestellung".
A Google search for "Bestellung" returns 97 million results, a search
for "Lieferantenauftrag" returns 972 results so it should be clear what
is standard.
2017-04-11 18:28:35 +05:30
Nabin Hait
075b299673
bom traversing: argument mutable issue
2017-04-11 18:27:34 +05:30
mbauskar
e0271a8331
[minor] ReferenceError:doc fixes for delivery note
2017-04-11 17:54:22 +05:30
mbauskar
236f7aac7f
[minor] track changes for transaction documents
2017-04-10 14:48:54 +05:30
Manas Solanki
29ee263093
Fix in student attendacne tool
2017-04-10 14:33:35 +05:30
Makarand Bauskar
4782e8b751
[minor] added safe_eval for status_updater and added getdate and nowdate ( #8365 )
2017-04-07 17:16:16 +05:30
Rushabh Mehta
b58979fd3e
[added] frappe.safe_eval
2017-04-06 18:58:39 +05:30
Rushabh Mehta
9365641777
[added] frappe.safe_eval
2017-04-06 18:24:34 +05:30
Nabin Hait
0d230afd22
bumped to version 8.0.8
2017-04-06 17:02:03 +06:00
Makis Etzoglou
a906b3f11c
add delivery date to print format Fix #8111
2017-04-06 15:47:52 +05:30
Kanchan Chauhan
aa6f00c403
Added default 'All' option to filters to differentiate all and empty filter
2017-04-06 15:22:18 +05:30
Nabin Hait
d681c88d79
validate returned qty only if there is reference qty
2017-04-06 15:20:45 +05:30
Javier Wong
fc11fce990
[enhancement] Changed Issue Description and Resolution to Text Editor ( #8346 )
2017-04-06 14:56:44 +05:30
Rohit Waghchaure
faf51d91b6
[fix] stock qty issue in purchase trends report
2017-04-05 14:53:26 +05:30
Rushabh Mehta
08a42e00ae
[fix] salary slip eval, remove access to globals, #8313
2017-04-05 14:52:22 +05:30
Nabin Hait
549a2827e5
Merge pull request #8300 from rohitwaghchaure/customer_edit_issue_v8
...
[fix] Customer edit issue in offline POS
2017-04-05 14:51:44 +05:30
Rushabh Mehta
9264313f0e
[fix] ordering for Edit Posting Time check
2017-04-05 12:49:01 +05:30
Nabin Hait
8013d1813a
Merge pull request #8320 from manassolanki/newsl
...
Route to newsletter listview
2017-04-05 12:33:14 +05:30
Rushabh Mehta
ffc807cd57
[minor] check below posting date in delivery note
2017-04-05 12:27:41 +05:30
Manas Solanki
ba6559c2e9
Route to newsletter listview
2017-04-05 11:52:23 +05:30
Nabin Hait
93a990f006
bumped to version 8.0.7
2017-04-04 12:16:47 +06:00
Rohit Waghchaure
2861955632
[fix] Customer edit issue in offline POS
2017-04-04 09:59:29 +05:30
Faris Ansari
0d114b4c31
Add image field to fetch in Customer List
2017-04-03 21:21:50 +05:30
Nabin Hait
fcf34dc570
Merge pull request #8295 from saurabh6790/demo_fix
...
[fix] demo script for setup data
2017-04-03 17:56:47 +05:30
Nabin Hait
6f038bc1f3
Validate total advance against grand total considering write off amount
2017-04-03 17:56:05 +05:30
Nabin Hait
9300013acc
Validate total advance against grand total considering write off amount
2017-04-03 17:35:58 +05:30
Nabin Hait
8d8cba7faa
Validate total advance against grand total considering write off amount
2017-04-03 17:26:32 +05:30
Nabin Hait
2d132e32aa
Function name changed in company
2017-04-03 17:26:32 +05:30
Saurabh
2e47654f43
[fix] demo script for setup data
2017-04-03 17:25:55 +05:30
Nabin Hait
17ddd8f389
bumped to version 8.0.6
2017-04-03 13:48:13 +06:00
Nabin Hait
c469f2c954
Get POS profile fix
2017-04-03 13:01:11 +05:30
Nabin Hait
731efe3a95
Minor fix in gross profit report
2017-04-03 12:11:36 +05:30
Nabin Hait
2c892c7e7f
Indentation fixed in gross profit report
2017-04-03 12:05:35 +05:30
Nabin Hait
31334328ed
bumped to version 8.0.5
2017-04-01 19:32:55 +06:00
Rushabh Mehta
0d6db6c42c
[fix] add user default role
2017-03-31 23:02:19 +05:30
Nabin Hait
d991c8666c
bumped to version 8.0.4
2017-03-31 18:49:57 +06:00
Nabin Hait
85d1c07519
Merge pull request #8269 from rohitwaghchaure/v8_documentation
...
[Documentation] Added for custom roles for page and report, fixed some broken images
2017-03-31 18:04:44 +05:30
Nabin Hait
04ab7dfd2f
Update role-permisison-for-page-and-report.md
2017-03-31 18:04:15 +05:30
Faris Ansari
eae30e5642
[fix] Show project title in kanban view ( #8268 )
...
- frappe/erpnext#8232
2017-03-31 17:46:12 +05:30
Nabin Hait
065302298f
Merge pull request #8261 from rohitwaghchaure/pull_project_from_bom_to_po
...
[enhance] Get project from bom on production order
2017-03-31 17:40:43 +05:30
Nabin Hait
b15d999147
Merge branch 'develop' into gross_profit_issue_v_8
2017-03-31 17:39:45 +05:30
Rushabh Mehta
4b0381c820
[fix] tests
2017-03-31 17:36:48 +05:30
Rushabh Mehta
f0b4562a95
[refactor] move purchase_common.js -> public/js/controllers/buying.js
2017-03-31 17:36:48 +05:30
Rushabh Mehta
cc8b2b2fdb
[fix] [refactor] demo for v8 and remove purchase common
2017-03-31 17:36:48 +05:30
Rohit Waghchaure
67a3e65f08
[Documentation] Added for custom roles for page and report, fixed some broken images
2017-03-31 17:22:58 +05:30
Rushabh Mehta
dc89916aa9
[fix] salary component fix for abbr
2017-03-31 17:20:57 +05:30
Rushabh Mehta
9d9cb8b7b1
Revert "Add link field Package Code ( fixes #8094 )"
2017-03-31 14:35:23 +05:30
Rohit Waghchaure
e7c0188732
[enhance] Get project from bom on production order
2017-03-31 13:40:06 +05:30
Rohit Waghchaure
34b1dba9aa
[fix] get_valuation_rate takes 4 arguments 3 given in gross profit report
2017-03-31 12:44:10 +05:30
Nabin Hait
c040015bb5
Used db_update in patch to bypass validate and on_update method
2017-03-31 11:58:19 +05:30
Rushabh Mehta
b66edd19ca
[minor] refactor transaction.js
2017-03-31 10:50:58 +05:30
Ricardo Johann
033e2fa8b6
changed accumulated header
2017-03-31 02:18:54 -03:00
Nabin Hait
79fddcfac1
bumped to version 8.0.3
2017-03-31 00:20:27 +06:00
Revant Nandgaonkar
3d5bdeb90d
[Fix] patch v7_2.contact_address_links
2017-03-30 23:14:58 +05:30
Revant Nandgaonkar
d07c041125
[Fix] Addresses linked back to Lead
2017-03-30 23:14:58 +05:30
Nabin Hait
b207a0542a
bumped to version 8.0.2
2017-03-30 20:22:42 +06:00
Nabin Hait
620bde7144
Updated modified date to reload sales uom
2017-03-30 19:50:45 +05:30
Nabin Hait
896fd1aca7
bumped to version 8.0.1
2017-03-30 20:05:51 +06:00
Nabin Hait
e503f68ec7
Merge pull request #8229 from rohitwaghchaure/pos_highlight_issue
...
[fix] POS cart item's highlighted issue
2017-03-30 19:26:33 +05:30
Rohit Waghchaure
a86bb69adf
[fix] POS cart item's highlighted issue
2017-03-30 19:16:38 +05:30
Nabin Hait
3b5b081ac4
bumped to version 8.0.0
2017-03-30 18:58:20 +06:00
Nabin Hait
d00218ece3
Merge pull request #8227 from manassolanki/contact_report
...
Addition of few more fields in student contact report
2017-03-30 17:43:33 +05:30
Nabin Hait
93c15383b8
[translations]
2017-03-30 16:57:19 +05:30
Nabin Hait
3c2be33adf
Merge pull request #8226 from mbauskar/item-varient-fix
...
[minor] make varient fixes in item.js
2017-03-30 16:05:34 +05:30
Manas Solanki
4be52d8a20
Addition of few more fields in student contact report
2017-03-30 16:04:26 +05:30
Nabin Hait
6bd791742f
Change log for version 8
2017-03-30 16:00:43 +05:30
mbauskar
90d82be966
[minor] make varient fixes in item.js
2017-03-30 15:36:46 +05:30
Nabin Hait
eb6fa5b70c
Update attendance.py
2017-03-30 14:11:47 +05:30
Nabin Hait
1f6bd0ad37
Fixed merge conflict
2017-03-30 13:15:22 +05:30
Nabin Hait
a9bef56a94
bumped to version 7.2.32
2017-03-30 13:44:34 +06:00
Nabin Hait
a24f8dbb8f
Merge branch 'develop' into update-disbursment-date
2017-03-30 13:06:28 +05:30
Kanchan Chauhan
37d8f643cc
Read permissions to Employee on Employee Loan and Loan Type
2017-03-30 13:05:49 +05:30
Kanchan Chauhan
400c6f5aef
Disbursement Date fetched from JV - Employee Loan
2017-03-30 13:04:05 +05:30
mbauskar
07e6bdd4f2
[minor] check employee date of joining before marking the employee attendance
2017-03-30 12:52:29 +05:30
Kanchan Chauhan
b87c174898
Employee Loan Dashboard
2017-03-30 12:51:46 +05:30
CH
99752e58ec
VAT rates update for France
2017-03-30 12:45:08 +05:30
Kanchan Chauhan
5ac740b3cb
[Fix] From Date and To Date not to be auto calculated for Timesheet Salary
2017-03-30 12:44:28 +05:30
Manas Solanki
3528d08178
[Fix] Fix in program enrollment tool and report
2017-03-30 12:21:49 +05:30
Nabin Hait
f912317fae
Stock Balance: Show records based on all child item groups if filters set based on group node
2017-03-29 18:08:10 +05:30
Nabin Hait
e2fef16d78
Made join_table query optional based on item group filter
2017-03-29 17:51:05 +05:30
Javier Wong
41bf1ba7b3
[enhancement] Stock Balance Report - Added Item Group Filter
2017-03-29 17:51:05 +05:30
Ricardo Johann
3d1434afe7
Export total labels
2017-03-29 17:44:17 +05:30
addymuliady
0dd00eb418
Update accounts-settings.md
2017-03-29 17:40:01 +05:30
Nabin Hait
64e9c4abf4
Changed label of hide_tax_id field
2017-03-29 17:39:08 +05:30
Makis Etzoglou
82e6bc45e4
tax_id add to Sales Order, Delivery Note, and Sales Invoice
2017-03-29 17:39:08 +05:30
Saurabh
a5ddeb44e7
[fix] remove integraton service reference from documentation
2017-03-29 17:32:04 +05:30
Kanchan Chauhan
35b12e2ea6
Company in Leave Control Panel
2017-03-29 17:30:56 +05:30
mbauskar
de98ff6bb9
[minor] hide the stock details section if update_stock is unchecked
2017-03-29 17:29:58 +05:30
rohitwaghchaure
afa93c624b
[fix] Reserved qty is not calculating properly in BIN for multi sales UOM ( #8203 )
2017-03-29 17:29:20 +05:30
Manas Solanki
8519b4bfe4
Changes in Program Enrollment and Report for Student Contact Details ( #8176 )
...
* Added the student house name in the program enrollment
* added report for the student contact details
* Enabled tag in Student master and fix in student enrollment tool
* [Fix] School House and Report
2017-03-29 16:07:31 +05:30
Nabin Hait
79731360ed
Merge pull request #8126 from kickapoo/issue8094
...
Add link field Package Code (fixes #8094 )
2017-03-28 20:48:39 +05:30
Nabin Hait
fede6d8fbe
Updated modified date for production order
2017-03-28 20:42:42 +05:30
Stavros Anastasiadis
b9bbb3c3db
Add link field Package Code ( fixes #8093 )
2017-03-28 16:09:52 +03:00
Neil Trini Lasrado
193c8919b9
Fixed issue with misleading error message on Stock Entry creation of Serialized Items
2017-03-28 17:43:23 +05:30
Nabin Hait
d1f6cc88f2
Required items table in Production order
2017-03-28 17:08:40 +05:30
Nabin Hait
dac525433c
Merge pull request #8178 from nabinhait/develop
...
Patch order changed for multiple uoms in sales cycle
2017-03-28 16:55:57 +05:30
Faris Ansari
49a3d6d8f6
Update POS screenshot
2017-03-28 16:17:30 +05:30
Nabin Hait
6c3eb36c35
Merge branch 'develop' into customs_tariff_number
2017-03-28 13:51:44 +05:30
Nabin Hait
da749f716b
Merge pull request #8172 from rohitwaghchaure/credit_note_serial_no_issue
...
[fix] During making credit note from sales invoice, system fetching new serial no instead of old serial no from the sales invoice
2017-03-28 13:49:32 +05:30
Nabin Hait
2cf5ca28f6
Merge pull request #8173 from nabinhait/hotfix
...
In gross profit report, if incoming rate not found from last sle, consider average valuation rate
2017-03-28 13:49:09 +05:30
Nabin Hait
621dcc3c84
Patch order changed for multiple uoms in sales cycle
2017-03-28 13:45:56 +05:30
Nabin Hait
77b2fef41e
Fixed test cases
2017-03-28 13:39:26 +05:30
Nabin Hait
d20f8585ae
Merge branch 'manufacturer_childtable' of https://github.com/dottenbr/erpnext into dottenbr-manufacturer_childtable
2017-03-28 13:31:28 +05:30
Rohit Waghchaure
d7908f8e3a
[fix] sales order with status closed fetching on production planning tool
2017-03-28 12:30:23 +05:30
Nabin Hait
77c970549b
In gross profit report, if incoming rate not found from last sle, consider average valuation rate
2017-03-28 12:20:31 +05:30
Rohit Waghchaure
5ecbaa408b
[fix] During making credit note from sales invoice, system fetching new serial no instead of old serial no from the sales invoice
2017-03-28 12:09:07 +05:30
Nabin Hait
0329c0ffab
Test case fixed for production order
2017-03-27 19:11:45 +05:30
Nabin Hait
5b60ef2dce
Fetch operations from all sub-assembly BOMs in Pro Order if multi-level BOM is checked
2017-03-27 16:29:51 +05:30
Nabin Hait
8bf58367b8
Fixed merge conflict
2017-03-27 12:30:01 +05:30
Nabin Hait
70c3f79d12
bumped to version 7.2.31
2017-03-27 12:57:38 +06:00
Nabin Hait
9c8159be8f
Merge pull request #8129 from rohitwaghchaure/pos_v8_enhance_and_issue
...
[fix] customer edit, numeric keypad visibility, on selection of item highlight the background issue in the pos
2017-03-27 12:25:18 +05:30
Nabin Hait
68fb20b811
Merge pull request #8131 from rohitwaghchaure/purchase_analytics_issue
...
[fix] Purchase analytics report not loading
2017-03-27 12:24:46 +05:30
Dominik Ottenbreit
fc9ed4da24
Add Customs Tariff Number
2017-03-24 15:53:03 +01:00
Dominik Ottenbreit
ea617da277
fix translations that have to do with term 'close' which was not well translated
2017-03-24 15:24:55 +01:00
Dominik Ottenbreit
6eb202ef3a
fix patch after test, fix variant based on manufacturer, add json for item_manufacturer
2017-03-24 14:49:52 +01:00
Dominik Ottenbreit
3938c61996
migrate from manufacturer to manufacturer childtable
2017-03-24 14:24:34 +01:00
Rohit Waghchaure
f74b02140c
[fix] Purchase analytics report not loading
2017-03-24 17:37:02 +05:30
Rohit Waghchaure
b719dc53fc
[fix] customer edit and numeric keypad visibility issue in the pos
2017-03-24 17:03:50 +05:30
Nabin Hait
00b04ed61e
Merge pull request #8076 from KanchanChauhan/qty-in-shopping-cart
...
Show qty in Shopping Cart
2017-03-24 13:14:03 +05:30
Nabin Hait
bf2a7efca4
Account name changed in standard chart of accounts
2017-03-24 13:01:35 +05:30
Nabin Hait
214ea8f2c8
Merge pull request #8119 from robulik/develop
...
[minor] fixes of translatable strings in web pages
2017-03-24 12:59:02 +05:30
Kanchan Chauhan
a844040781
Show qty in Shopping Cart
2017-03-23 18:22:02 +05:30
Robert Kirschner
b8f5148a44
[minor] fix: translatable title, h1, button on product_search page. Address row in web view has translatable address type
2017-03-23 13:43:26 +01:00
Nabin Hait
9ba1be60b7
Merge pull request #8039 from netchampfaris/pos-ui-fix
...
[pos] ui fix for small screens frappe/erpnext#8029
2017-03-23 17:14:39 +05:30
Nabin Hait
2aafdd622b
Merge pull request #8047 from KanchanChauhan/warehouse-for-dropship
...
[Fix] Warehouse not required for Dropship
2017-03-23 17:06:18 +05:30
Nabin Hait
b6b97f25d0
Merge pull request #8048 from KanchanChauhan/bom-based-on-project
...
Project filter in BOM selection in Production Order
2017-03-23 17:04:53 +05:30
Nabin Hait
4a8a62a202
Merge pull request #8053 from umairsy/video-pages
...
updated erpnext-learn pages
2017-03-23 17:02:34 +05:30
Nabin Hait
d25e314ccb
Merge pull request #8054 from rohitwaghchaure/purchase_return_issue_invoice
...
[fix] Quantity is not copying in the Received Qty during making of debit note from the purchase invoice
2017-03-23 17:01:58 +05:30
Nabin Hait
f44f04e33a
Merge pull request #8063 from khrlzhfr/patch-1
...
Update standard_chart_of_accounts.py
2017-03-23 17:01:34 +05:30
Robert Kirschner
db068ac6c4
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2017-03-23 12:29:43 +01:00
Nabin Hait
c7dc838306
Merge pull request #8068 from rohitwaghchaure/asset_depreciation_issue
...
[fix] Precision issue during making of depreciation schedule
2017-03-23 16:59:12 +05:30
Nabin Hait
5168286ea0
Merge pull request #8072 from lb-/patch-1
...
Update the-champion.md - grammar
2017-03-23 16:58:19 +05:30
Nabin Hait
8373b8e50d
Merge pull request #8075 from netchampfaris/asset-image-fix
...
[fix] asset image in image view
2017-03-23 16:58:05 +05:30
Nabin Hait
33f2b659e4
Merge pull request #8079 from robulik/develop
...
[fix] selecting new address in cart webpage unchecks previously checked
2017-03-23 16:52:39 +05:30
Nabin Hait
8de911b5b4
Merge pull request #8086 from KanchanChauhan/read-perm-to-guest
...
[Minor] Guest should have read permissions on Job Openings
2017-03-23 16:50:45 +05:30
Robert Kirschner
d162eb367c
[minor] fix translation strings in cart web view
2017-03-23 12:18:24 +01:00
Robert Kirschner
0af93a782d
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2017-03-23 12:10:46 +01:00
Nabin Hait
46bccb55c5
Merge pull request #8080 from rmehta/item-variants-by-mfg
...
[feature] ability to have variants based on manufacturer
2017-03-23 16:29:41 +05:30
Nabin Hait
422ef584fa
Merge pull request #8090 from KanchanChauhan/date-span-in-salary-slip
...
[Minor] From date, To date based on Payroll Frequency
2017-03-23 16:16:51 +05:30
Nabin Hait
b132428184
Merge pull request #8091 from mbauskar/cart-address-fixes
...
[minor] fixed shipping and billing address issue in cart
2017-03-23 16:16:11 +05:30
Rohit Waghchaure
57f35a25a1
[fix] UnpickleError, removed _ method from the argument of the function
2017-03-23 14:55:52 +05:30
Faris Ansari
3011006ff2
Merge pull request #8097 from frappe/netchampfaris-documentation-1
...
Add new screenshots for Workflows documentation
2017-03-22 17:50:17 +05:30
Faris Ansari
1e7f739c84
Add new screenshots for Workflows documentation
2017-03-22 17:48:51 +05:30
Faris Ansari
7fbc1c2161
Update Workflows
...
Add new images
2017-03-22 17:45:52 +05:30
mbauskar
67e3e32dd6
[minor] fixed shipping and billing address issue in cart
2017-03-22 16:14:43 +05:30
Kanchan Chauhan
076e9d6af8
[Minor] From date, To date based on Payroll Frequency
2017-03-22 16:07:03 +05:30
Robert Kirschner
c6b52a321e
update on cart.js pull request feedback
2017-03-22 08:10:30 +01:00
Kanchan Chauhan
730ad5a507
[Minor] Guest should have read permissions on Job Openings
2017-03-22 12:37:38 +05:30
Rushabh Mehta
43583d6497
Update item.js
2017-03-21 17:49:53 +01:00
Rushabh Mehta
a07c43fd68
[feature] ability to have variants based on manufacturer
2017-03-21 17:48:34 +01:00
Robert Kirschner
0a33d4ffc5
[fix] selecting new address in cart web page unchecks previously checked address
2017-03-21 14:52:59 +01:00
Rohit Waghchaure
6ee91ec9c6
on selection of row highlight the background in the cart
2017-03-21 15:55:09 +05:30
Faris Ansari
e1acb766ac
[fix] asset image in image view
2017-03-21 14:18:30 +05:30
LB (Ben Johnston)
71f4fbf467
Update the-champion.md - grammar
2017-03-21 12:50:17 +07:00
Rohit Waghchaure
b69d311268
[fix] precision issue during making of depreciation schedule
2017-03-20 16:30:34 +05:30
Khairil Zhafri
4d6d456a0d
Update standard_chart_of_accounts.py
...
Minor spelling edits
2017-03-20 00:15:34 +08:00
Rohit Waghchaure
414c0ab3bb
[fix] Quantity is not copying in the Received Qty during making of debit note
2017-03-17 17:19:17 +05:30
Umair Sayyed
024896d806
updated erpnext-learn pages
2017-03-17 12:55:01 +05:30
rohitwaghchaure
2b9c95a940
Merge pull request #8043 from rohitwaghchaure/pos_issue_v8
...
[fix] POS, amount not updating on change of price, on zero of discount rate has not reset, pricing rule not working for brand
2017-03-16 17:56:20 +05:30
Kanchan Chauhan
7cf1a1d84b
Project filter in BOM selection in Production Order
2017-03-16 17:09:37 +05:30
Kanchan Chauhan
6f7457a1b0
[Fix] Warehouse not required for Dropship
2017-03-16 16:03:41 +05:30
Rohit Waghchaure
75177c0e35
[fix] POS, amount not updating on change of price, on zero of discount rate has not reset, pricing rule not working for brand
2017-03-16 15:47:25 +05:30
Faris Ansari
d79f239001
[pos] ui fix for small screens frappe/erpnext#8029
2017-03-16 12:18:35 +05:30
mbauskar
27efc91db0
[minor] make item code mandatory if update_stock is selected
2017-03-15 18:57:18 +05:30
Manas Solanki
ad2dc2c747
[Fix] Enrolling the student
2017-03-15 18:22:57 +05:30
Rushabh Mehta
f340e19ea7
[minor] field re-arrangements in sales invoice, purchase invoice, stock reco
2017-03-15 15:12:43 +05:30
Nabin Hait
56f650f342
Merge branch 'master' into develop
2017-03-15 11:28:07 +05:30
Nabin Hait
1157ee365b
bumped to version 7.2.30
2017-03-15 11:58:06 +06:00
Nabin Hait
ee7b4f2882
Merge pull request #8016 from rmehta/posting-date-option
...
[feature] posting date, time is always current unless explicitly set
2017-03-15 11:22:04 +05:30
Nabin Hait
505ed25f10
Merge pull request #8017 from nabinhait/develop
...
Field order changed for 'Qty as per Stock UOM'
2017-03-14 22:39:36 +05:30
Nabin Hait
1ba71a0b3a
Merge pull request #8018 from mbauskar/develop
...
[minor] custom script to create issue, lead, opportunity from email
2017-03-14 22:39:26 +05:30
Nabin Hait
79bce2a71d
Merge pull request #8019 from rohitwaghchaure/pos_serial_no_issue
...
[fix] User sales one serial number multiple time from the POS
2017-03-14 22:38:28 +05:30
Rushabh Mehta
4f3da42b75
[fixes] for tests
2017-03-14 21:29:55 +05:30
Rushabh Mehta
131866a11a
[fixes] for tests
2017-03-14 21:06:15 +05:30
Rushabh Mehta
82c258948d
[fixes] for recurring and tests
2017-03-14 19:13:39 +05:30
Rohit Waghchaure
e259a9b068
[fix] User sales one serial number multiple time from the POS
2017-03-14 19:05:21 +05:30
mbauskar
f54b1047b8
[minor] custom script to create issue, lead, opportunity from email
2017-03-14 17:57:47 +05:30
Nabin Hait
3d731df7e3
Field order changed for 'Qty as per Stock UOM'
2017-03-14 17:24:57 +05:30
Rushabh Mehta
f6dee248ee
Update company.json
2017-03-14 17:10:01 +05:30
Rushabh Mehta
6d4a52562b
[fix] posting date, time is always current unless explicitly set
2017-03-14 17:06:51 +05:30
Rushabh Mehta
6b53792aea
[fix] posting date, time is always current unless explicitly set
2017-03-14 17:06:51 +05:30
Rohit Waghchaure
faedf8274c
[fix] gross profit permission issue
2017-03-14 14:56:24 +05:30
Nabin Hait
6a053a989e
Merge pull request #8014 from rohitwaghchaure/contact_issue_for_website_generator
...
[fix] Removed customer, supplier and added link_name from website_list_for_contact file
2017-03-14 14:46:48 +05:30
Saurabh
0d47d51407
[fix] modified payment request to cope with new payment structure ( #7957 )
...
* [fix] modified payment request to cope with new payment structure
* [fix] moved payment gateway doctype from accounts to core
2017-03-14 14:46:05 +05:30
Rohit Waghchaure
11fa7a9311
[fix] Removed customer, supplier and added link_name from website_list_for_contact file
2017-03-14 13:26:10 +05:30
Manas Solanki
2922660b34
[Fix] Student attendance tool- Handling double-click on button
2017-03-14 12:50:58 +05:30
rohitwaghchaure
27e86201fc
Merge pull request #8007 from rohitwaghchaure/pos_profile_issue
...
[fix] Value assignment issue for country field in pos profile
2017-03-14 00:22:23 +05:30
Rohit Waghchaure
cc034a8983
[fix] Value assignment issue for country in the pos profile
2017-03-13 22:44:48 +05:30
rohitwaghchaure
0216f6e6eb
Merge pull request #7995 from saurabh6790/restrict_negative_qty_in_pr
...
[fix] validate negative quantity while creating purchase receipt
2017-03-13 18:24:24 +05:30
Nabin Hait
26ed675240
Merge pull request #7996 from netchampfaris/ui-fixes
...
[ui] show assignees in gantt popup frappe/erpnext#6916
2017-03-13 17:22:56 +05:30
Saurabh
4f4d0a8369
[fix] validate negative quantity while creating purchase receipt
2017-03-13 15:37:47 +05:30
Faris Ansari
df65d21225
[ui] show assignees in gantt popup frappe/erpnext#6916
2017-03-13 14:52:56 +05:30
Nabin Hait
86cb0cc010
Merge pull request #7991 from mbauskar/develop
...
[minor] display campaign field only if source is Campaign
2017-03-13 11:19:59 +05:30
mbauskar
7f42e90832
[minor] display campaign field only if source is Campaign
2017-03-12 21:57:52 +05:30
Nabin Hait
1ed8bc4c36
Gross Profit report: Consider Sales team table only if grouped by sales person
2017-03-12 17:10:41 +05:30
Nabin Hait
b2a8482cc5
In Student Sibling table, the current student id should not appear as sibling.
2017-03-12 16:55:05 +05:30
Nabin Hait
fb4b8d926f
Company based on exising company fix
2017-03-12 16:55:05 +05:30
Nabin Hait
ae205f878a
Set default taxes and charges while creating quotation from opportunity
2017-03-12 16:55:05 +05:30
Nabin Hait
d0d22ff203
copy letter head from invoice to payment entry
2017-03-12 16:55:05 +05:30
Nabin Hait
6923397ef6
Show net total in salary slip log in Process Payroll. Fixed #7986
2017-03-12 16:55:05 +05:30
Nabin Hait
c5204f56e2
Merge pull request #7909 from KanchanChauhan/employee-loan-jv
...
JV on submitting Employee Loan
2017-03-12 16:50:48 +05:30
Nabin Hait
132193309c
Merge pull request #7952 from KanchanChauhan/multiple-salary-fixes
...
Multiple Salary Fixes
2017-03-12 16:48:11 +05:30
Nabin Hait
d402829d17
Merge pull request #7980 from rohitwaghchaure/target_bounty_redesign
...
[Enhancement] POS Redesign and new features
2017-03-12 16:47:26 +05:30
Nabin Hait
fd9b2467d6
Merge pull request #7966 from rohitwaghchaure/item_variant_issue_for_nuermic
...
[Fix] Item variants broken when using naming series for items and vriants of numeric value
2017-03-12 16:34:40 +05:30
mbauskar
124cf14429
[minor] ignore lead addresses delete query if address against lead not found
2017-03-11 16:02:20 +05:30
Rohit Waghchaure
0169341917
[Fix] Item variants broken when using naming series for items and vriants of numeric value
2017-03-10 19:40:08 +05:30
Rohit Waghchaure
87fa59a710
[Fix] Customer delete, customer edit functionality, added country field in the pos profile
2017-03-10 19:37:02 +05:30
Faris Ansari
1fe1518398
[pos] ui cleanup
2017-03-10 17:00:43 +05:30
Rohit Waghchaure
6068aecc2e
minor fix
2017-03-10 17:00:43 +05:30
Faris Ansari
07c9f35779
ui cleanup
2017-03-10 17:00:42 +05:30
Faris Ansari
45510109b6
[pos] cleanup
2017-03-10 17:00:42 +05:30
Rohit Waghchaure
017f5005e0
fixed pos numeric keypad functionality
2017-03-10 17:00:42 +05:30
Faris Ansari
339d9c954a
minor changes
2017-03-10 17:00:42 +05:30
Rohit Waghchaure
1312fe31a9
Provision to edit customer and address details
2017-03-10 17:00:42 +05:30
Faris Ansari
adcb3c62fa
wip
2017-03-10 17:00:42 +05:30
Rohit Waghchaure
3b5a412a9c
offline email for POS
2017-03-10 17:00:41 +05:30
Rohit Waghchaure
56a7974b58
added event on numeric keypad
2017-03-10 17:00:41 +05:30
Rohit Waghchaure
86ab6a93b4
[Enhancement] POS, numeric keypad
2017-03-10 17:00:41 +05:30
Faris Ansari
1f261a8695
UI changes
2017-03-10 17:00:41 +05:30
Rohit Waghchaure
b5097ec161
offline email for POS
2017-03-10 17:00:41 +05:30
Rohit Waghchaure
f0c7ba4b1f
added event on numeric keypad
2017-03-10 17:00:40 +05:30
Rohit Waghchaure
e30f83a8af
[Enhancement] POS, numeric keypad
2017-03-10 17:00:40 +05:30
Rushabh Mehta
83aa5ee3df
[messages] cleanup
2017-03-10 12:47:29 +05:30
Rushabh Mehta
db206f2d10
[minor] develop_version
2017-03-10 09:39:31 +05:30
Rushabh Mehta
868bb26e24
[sample] add help for sample tasks and make them into notifications
2017-03-09 18:11:11 +05:30
Kanchan Chauhan
37a57813fa
Multiple Salary Fixes
2017-03-09 13:00:35 +05:30
Rushabh Mehta
aea1c2a1e3
[minor] allow sales order delivery date before order date
2017-03-09 12:46:51 +05:30
Kanchan Chauhan
ffd1f112e6
JV on submitting Employee Loan
2017-03-09 12:21:37 +05:30
Nabin Hait
733855a4c3
Merge pull request #7956 from manassolanki/sibling
...
[Fixes] School
2017-03-09 11:04:38 +05:30
Nabin Hait
d22bb682a5
Merge pull request #7960 from rohitwaghchaure/material_request_issue_for_po
...
[Fix] Material Request to Production Order not working
2017-03-09 10:57:26 +05:30
Nabin Hait
f73a44aa8d
Update material_request.py
2017-03-09 10:57:00 +05:30
Rohit Waghchaure
02fb5880fe
[Fix] Material Request to Production Order not working
2017-03-08 18:38:12 +05:30
Kanchan Chauhan
a64f53801b
[Minor] Label change in Expense Claim
2017-03-08 16:59:49 +05:30
Manas Solanki
631fab012f
[Fix] Student attendance tool
2017-03-08 14:44:52 +05:30
Manas Solanki
d41836b386
[Fix] Student Sibling
2017-03-08 14:44:52 +05:30
Nabin Hait
52daaca885
Fixed merge conflict
2017-03-08 14:30:38 +05:30
Nabin Hait
27c4fdc2df
bumped to version 7.2.29
2017-03-08 15:00:12 +06:00
Nabin Hait
804c4fc4a7
Merge pull request #7951 from rohitwaghchaure/purchase_return_issue
...
[Fix] Purchase return issue
2017-03-08 14:28:55 +05:30
mbauskar
02198ec8b0
removed the test_clear_blank_rows test case from JE
2017-03-08 12:34:36 +05:30
Rushabh Mehta
b9cdb05934
[minor] renamed portal hook
2017-03-08 12:34:03 +05:30
Nabin Hait
33fb6ae323
Fixed merge conflict
2017-03-08 11:18:15 +05:30
Nabin Hait
f967206523
bumped to version 7.2.28
2017-03-08 11:46:00 +06:00
Rohit Waghchaure
d05a8737f9
[Fix] Purchase return issue
2017-03-08 10:30:23 +05:30
Nabin Hait
1af471a16f
Merge pull request #7938 from netchampfaris/task-list
...
[gantt] show task project in popup
2017-03-07 19:41:52 +05:30
Nabin Hait
f822b875ba
Merge pull request #7941 from nabinhait/v8_fixes
...
Set new name in warehouse_name on rename of warehosue
2017-03-07 17:16:44 +05:30
Nabin Hait
961bdc3743
Set new name in warehouse_name on rename of warehosue
2017-03-07 15:02:34 +05:30
Abdulla P I
cbe035b08a
Only enabled user to be fetched
2017-03-07 13:34:08 +05:30
Faris Ansari
0e4b924f59
[gantt] show task project in popup
2017-03-07 12:01:39 +05:30
mbauskar
c03f275e7a
[minor] allowed the credit and debit amount to be 0 in JE
2017-03-07 11:59:55 +05:30
Nabin Hait
f5a9c8ecf2
Merge pull request #7936 from rohitwaghchaure/financial_statement_issue
...
Minor fix
2017-03-07 00:27:53 +05:30
Rohit Waghchaure
9f4317e9b8
minor fix
2017-03-06 23:42:45 +05:30
Rohit Waghchaure
0bb434af3f
minor fix in patch
2017-03-06 18:52:34 +05:30
Nabin Hait
b3ffd6b282
Merge pull request #7828 from rohitwaghchaure/update_user_roles_to_roles
...
Changed userrole to has role, commonify role editor of the user
2017-03-06 18:44:53 +05:30
Nabin Hait
fe876c0805
Test case fixed for multiple uom in selling
2017-03-06 16:41:13 +05:30
Nabin Hait
e68f32cf19
UOM Conversion in selling
2017-03-06 16:41:13 +05:30
Kanchan Chauhan
5a980ac87a
UOM Conversion in Selling
2017-03-06 16:41:12 +05:30
Nabin Hait
0697d62603
Merge pull request #7931 from KanchanChauhan/job-applicant-fix
...
[Fix] Candidate can apply to multiple jobs
2017-03-06 16:38:00 +05:30
Rohit Waghchaure
611a70a12a
changes in the report roles
2017-03-06 16:36:46 +05:30
Kanchan Chauhan
8411be7720
[Fix] Candidate can apply to multiple jobs
2017-03-06 14:40:43 +05:30
Rohit Waghchaure
e7485150a1
added roles in the report
2017-03-06 14:26:09 +05:30
Rohit Waghchaure
312498060f
changed doctype name userrole to has role
2017-03-06 14:24:39 +05:30
Rohit Waghchaure
d59f8b32cd
changed user_roles to roles
2017-03-06 14:24:39 +05:30
S. Vigneux
ff2d5d8ad9
Update batch.md
...
The practice=> The practice
2017-03-05 12:44:03 -05:00
Nabin Hait
a07c3193cf
Merge pull request #7889 from rohitwaghchaure/sales_return_issue_for_pos
...
[Fix] Sales Return Invoice (Is POS) doesn't show correct payment data
2017-03-04 18:32:40 +05:30
Rohit Waghchaure
a31ffbc745
[Fix] Sales Return Invoice (Is POS) doesn't show correct payment data
2017-03-03 16:28:49 +05:30
Rohit Waghchaure
f8aa6ed46b
removed fiscal year and month from the print
2017-03-02 17:51:15 +05:30
mbauskar
91c6ffde86
[minor] fixes contact field set query for opportunity
2017-03-02 17:29:16 +05:30
Nabin Hait
78a650062c
Update company.json
2017-03-02 14:48:49 +05:30
Nabin Hait
57a47a83a0
Merge pull request #7887 from rohitwaghchaure/capacity_planning
...
[Fix] Pull operation on production order, when making from sales order
2017-03-02 14:17:09 +05:30
Nabin Hait
a0fb3e5128
Merge pull request #7888 from KanchanChauhan/payroll-fix
...
[Fix] JV entry for Employee Loan only if Loan exists
2017-03-02 14:15:59 +05:30
Nabin Hait
42bc399f2a
Merge pull request #7890 from KanchanChauhan/hr-page
...
[Minor] Employee Loan Management moved up in HR Page
2017-03-02 14:14:04 +05:30
Nabin Hait
bc10ea897d
Merge pull request #7893 from pratu16x7/crm-docs
...
CRM docs update
2017-03-02 14:13:19 +05:30
Kanchan Chauhan
cfb0adff98
[Minor] Removed Paid status from Salary Slip
2017-03-02 12:59:35 +05:30
Nabin Hait
834d616c60
Merge branch 'master' into develop
2017-03-02 12:38:15 +05:30
Nabin Hait
1cc7024cb4
bumped to version 7.2.27
2017-03-02 13:08:14 +06:00
Rushabh Mehta
7067ff026a
[minor] add progress in desktop help message
2017-03-02 11:14:09 +05:30
Rushabh Mehta
e7900b24a0
[minor] add progress in desktop help message
2017-03-02 11:13:18 +05:30
Saurabh
b3134d34fa
[fix] add from date field to salary structure in setup demo data
2017-03-02 08:43:08 +05:30
Nabin Hait
258c8199fb
Merge pull request #7842 from superlack/develop
...
Add Sales Orders to Project costing and billing section
2017-03-01 17:20:23 +05:30
pratu16x7
4e71337f3d
fix lead, customer, opportunity pages
2017-03-01 04:02:50 +05:30
Nabin Hait
18b7364a81
Merge branch 'master' into develop
2017-02-28 18:56:26 +05:30
Nabin Hait
db2aefa3a6
bumped to version 7.2.26
2017-02-28 19:26:25 +06:00
Rushabh Mehta
f8b19e07cf
[minor] activation messages only for non activated users
2017-02-28 18:54:07 +05:30
Kanchan Chauhan
639eebdae5
[Minor] Employee Loan Management moved up in HR Page
2017-02-28 18:01:07 +05:30
Kanchan Chauhan
e6254b96c4
[Fix] JV entry for Loan only if Loan exists
2017-02-28 17:42:09 +05:30
Rohit Waghchaure
2c2ce8c557
[Fix] Pull operation on production order, when making from sales order
2017-02-28 17:12:18 +05:30
Nabin Hait
6bbf141d57
Merge branch 'develop' into link_mrs
2017-02-28 15:55:35 +05:30
Nabin Hait
38c7ad2c69
Update supplier_quotation.json
2017-02-28 15:53:10 +05:30
Nabin Hait
491d2ad140
Update request_for_quotation.json
2017-02-28 15:52:43 +05:30
Nabin Hait
365ed5dea9
Update purchase_order.json
2017-02-28 15:51:00 +05:30
Nabin Hait
fd37395995
Merge pull request #7878 from netchampfaris/lead-fix
...
fix date compare in contact_date
2017-02-28 15:37:42 +05:30
Faris Ansari
0ded707397
fix date compare in contact_date
2017-02-27 21:51:46 +05:30
superlack
62d7ba0afd
Update project.py
2017-02-27 07:00:30 -08:00
Nabin Hait
cda28ceeec
[translations]
2017-02-27 17:46:47 +05:30
Nabin Hait
409062b8a4
Merge pull request #7869 from KanchanChauhan/dependent-tasks
...
Dependent task dates gets updated with parent dates
2017-02-27 17:34:09 +05:30
Nabin Hait
631ecad985
Merge pull request #7875 from KanchanChauhan/employee-loan-fixes
...
[Fix] Multiple fixes in Employee Loan
2017-02-27 17:28:20 +05:30
Nabin Hait
3ddc26060a
Merge pull request #7876 from KanchanChauhan/salary-slip-fix
...
[Fix] Update totals on salary component deletion
2017-02-27 17:26:39 +05:30
Kanchan Chauhan
c02745c826
[Fix] Update totals on salary component deletion
2017-02-27 17:21:41 +05:30
Kanchan Chauhan
a13adc0e6b
[Fix] Multiple fixes in Employee Loan
2017-02-27 16:56:00 +05:30
Nabin Hait
b9741b6ed5
Merge branch 'master' into develop
2017-02-27 15:41:44 +05:30
Nabin Hait
b99a38d6ae
bumped to version 7.2.25
2017-02-27 16:11:43 +06:00
Nabin Hait
a2afc4e11c
Update activation.py
2017-02-27 15:39:29 +05:30
Kanchan Chauhan
e76685d925
Dependent task dates gets updated with parent dates
2017-02-27 14:55:03 +05:30
Nabin Hait
c642f76a4d
Fixed merge conflict
2017-02-27 14:40:53 +05:30
Nabin Hait
e0d661f433
Merge branch 'hotfix'
2017-02-27 14:31:10 +05:30
Nabin Hait
79c5ee0a65
bumped to version 7.2.24
2017-02-27 15:01:10 +06:00
Nabin Hait
704b6a3e1f
Merge pull request #7756 from mlisb0n/master
...
[Translation] Revised and updated all translations to meet european portuguese business/accounting terminology
2017-02-27 14:10:51 +05:30
Rohit Waghchaure
2087e574aa
[Fix] Serial nos not pulling on the delivery note, for language spanish add serial no button was not working
2017-02-27 13:43:04 +05:30
Nabin Hait
c238016aff
Merge pull request #7871 from KanchanChauhan/add-serial-no
...
[Fix] Add Serial No fix for other langauges
2017-02-27 13:14:57 +05:30
Kanchan Chauhan
6981870a40
[Fix] Add Serial No fix for other langauges
2017-02-27 12:54:13 +05:30
robert schouten
4766562ff0
fix typo on get product bundle
2017-02-27 13:30:18 +08:00
Ben Cornwell-Mott
08c1e86b1c
Moved link button. Creates new row for unlinked quantities
2017-02-25 23:16:54 -08:00
Nabin Hait
72c7e73ce0
Merge pull request #7852 from rohitwaghchaure/production_order_issue
...
[Fix] Production order operations scheduling issue
2017-02-25 11:03:43 +05:30
superlack
c95ebdb4e4
Update sales_order.py
2017-02-24 12:35:10 -08:00
superlack
f800892ec3
Update project.py
2017-02-24 12:33:59 -08:00
Rohit Waghchaure
94c30d81b1
[Fix] Production order operations scheduling issue
2017-02-24 19:21:40 +05:30
Nabin Hait
697150f339
Leave application overlap validation for half day and test cases
2017-02-24 18:53:34 +05:30
Manas Solanki
d77fac113f
Make All Assessment Group parent in assessment group tree
2017-02-24 15:30:22 +05:30
Nabin Hait
da73e1b806
Merge pull request #7851 from rohitwaghchaure/account_paid_to_payment_entry
...
[Fix] Payment entry account Paid To Show receivable accounts for supplier
2017-02-24 15:18:50 +05:30
Kanchan Chauhan
26b79f108a
Leave Application Enchancement
2017-02-24 15:13:06 +05:30
Rohit Waghchaure
b983f26b98
[Fix] Payment entry account Paid To Show receivable accounts for supplier
2017-02-24 15:07:54 +05:30
Neil Trini Lasrado
c15b5db030
Added 'All Assessment Group' to fixtures
2017-02-24 13:16:46 +05:30
Neil Trini Lasrado
e4903b77b6
Added New Doctype - Assessment Code
2017-02-24 13:16:46 +05:30
Neil Trini Lasrado
15944b9ecf
Added Academic Term to Assessment Group
2017-02-24 13:16:46 +05:30
Nabin Hait
2bcacec5c6
Merge pull request #7576 from RobertSchouten/compact_dev
...
[fix] compact print format not longer ignores format builder
2017-02-24 13:09:18 +05:30
Nabin Hait
ff5bd680c2
Merge pull request #7840 from rmehta/new-buttons
...
[enhance] connect new buttons on dashboard to custom make buttons and fix text for payment request
2017-02-24 12:57:13 +05:30
Nabin Hait
d9afd7e4aa
Merge pull request #7822 from rmehta/desktop-messages
...
[enhance] desktop messages
2017-02-24 12:55:34 +05:30
Nabin Hait
9f0d64b679
Merge pull request #7841 from mbauskar/hotfix
...
[minor] fixed assessment module icon
2017-02-24 12:50:16 +05:30
Manas Solanki
230df2c9d3
Link the sibling child table with the student doctype
2017-02-24 12:09:55 +05:30
Manas Solanki
53259fb91f
Change in student master should reflect in every linked doctype and child doctype
2017-02-24 11:25:04 +05:30
superlack
868ef7738f
Update project.json
2017-02-23 17:46:07 -08:00
superlack
23e5d40374
Update sales_order.py
2017-02-23 17:43:50 -08:00
superlack
c4587d2945
Update project.py
2017-02-23 17:39:05 -08:00
mbauskar
cea7d32b31
[minor] fixed assessment module icon
2017-02-23 20:28:47 +05:30
Rushabh Mehta
509543752c
[enhance] connect new buttons on dashboard to custom make buttons and fix text for payment request
2017-02-23 17:03:46 +05:30
Nabin Hait
5278da8901
Merge pull request #7830 from mbauskar/develop
...
[minor] eval conditions for recurring sections and lead fields
2017-02-23 16:54:20 +05:30
Nabin Hait
8ec1b565f5
Merge pull request #7823 from KanchanChauhan/payroll-currency
...
[Minor] Company default currency in Salary Slip and Structure
2017-02-23 16:52:23 +05:30
Nabin Hait
89f7767b51
Merge pull request #7818 from KanchanChauhan/product-bundle-fix
...
[Fix] Disappearing Dropdown fixed
2017-02-23 16:49:49 +05:30
Kanchan Chauhan
52a5cb9ae3
[Fix] Holiday Calendar Fix
2017-02-23 16:15:12 +05:30
Nabin Hait
60db08fd7f
Merge pull request #7817 from KanchanChauhan/loan-management-fix
...
[Minor] Field label rename
2017-02-23 16:09:11 +05:30
Kanchan Chauhan
951e31667b
[Minor] Company default currency in Salary Slip and Structure
2017-02-23 11:16:53 +05:30
Nabin Hait
97b3be6f9d
Update salary_structure_employee.json
2017-02-23 11:10:05 +05:30
KanchanChauhan
90b42c4fa2
Merge pull request #7826 from KanchanChauhan/landed-cost-voucher-test
...
[Minor] Landed Cost Voucher test case fixed
2017-02-23 09:58:40 +05:30
Kanchan Chauhan
1d45a4312e
[Minor] Landed Cost Voucher test case fixed
2017-02-23 08:44:02 +05:30
mbauskar
ddb9f0bf78
[minor] lead hide/unhide campain_name, customer field depending on source
2017-02-22 18:54:47 +05:30
mbauskar
d6e409ea92
[minor] hide recurring section if document is in __local state
2017-02-22 18:22:14 +05:30
Kanchan Chauhan
fe61c314b7
[Minor] Landed Cost Voucher test case fixed
2017-02-22 17:25:26 +05:30
nick9822
089c5caea5
Sales analytics error after upgrade
...
Hi Team,
We were getting errors in sales analytics report after the upgrade.
https://discuss.erpnext.com/t/sales-analytics-report-hangs-on-erpnext-v7/17951/6
With the efforts of @Tropicalrambler into the report we made it work by putting checkpoint for item.
Please see whether its good or there is better solution for it.
Thanks,
Nick
2017-02-22 17:09:29 +05:30
Manas Solanki
7a61f12572
Fixes for attendance reports
2017-02-22 16:19:57 +05:30
Rushabh Mehta
05ce7ec7bb
[enhance] desktop messages
2017-02-22 16:15:43 +05:30
Kanchan Chauhan
b249a6e6f7
[Fix] Disappearing Dropdown fixed
2017-02-22 15:39:07 +05:30
Nabin Hait
5079c9ef47
Fixed merge conflict
2017-02-22 15:31:31 +05:30
Nabin Hait
633698affc
bumped to version 7.2.23
2017-02-22 15:35:27 +06:00
Kanchan Chauhan
6af7140763
[Minor] Field label rename
2017-02-22 14:58:34 +05:30
mbauskar
a8fa10d2a9
[minor] minor fixes for journal entry get_exchange_rate trigger
2017-02-22 14:51:09 +05:30
Nabin Hait
08847bd06a
minor fix
2017-02-22 13:05:46 +05:30
Nabin Hait
1e3a0b4632
Merge branch 'shishu' of https://github.com/manassolanki/erpnext into manassolanki-shishu
2017-02-22 12:12:58 +05:30
Nabin Hait
753c8dedde
Update api.py
2017-02-22 11:53:13 +05:30
Nabin Hait
2d8047837c
Merge pull request #7802 from KanchanChauhan/multiple-items-purchase
...
[Fix] Throw error if item is added multiple time
2017-02-22 11:43:17 +05:30
Nabin Hait
1bdb6a57f2
Merge pull request #7809 from rohitwaghchaure/financial_statement_company_issue
...
[Fix] Company fiscal year issue in financial statement
2017-02-22 11:41:16 +05:30
Kanchan Chauhan
f2803ac427
[Fix] Throw error if item is added multiple time
2017-02-22 10:40:38 +05:30
Manas Solanki
47aba953e2
Added student language doctype
2017-02-21 18:49:00 +05:30
Manas Solanki
f869a679ae
Fixed Student Attendence
2017-02-21 18:49:00 +05:30
Nabin Hait
0142fdc0d7
Update rename_att_date_attendance.py
2017-02-21 16:01:21 +05:30
Rohit Waghchaure
49523d7f80
[Fix] Company fiscal year issue in financial statement
2017-02-21 14:20:26 +05:30
Kanchan Chauhan
42f55cf4b1
[Patch] Attendance Date rename field
2017-02-21 13:44:01 +05:30
Nabin Hait
6e1a2b16a5
Company, Currency, Conversion Rate fields are mandatory in BOM
2017-02-21 13:11:02 +05:30
Nabin Hait
d5442b5544
Merge pull request #7791 from nabinhait/pro_order_stock_qty
...
Build Qty considering quantity for which bom is created
2017-02-21 09:58:13 +05:30
Nabin Hait
7056ce54d7
Update salary_structure.py
2017-02-20 23:28:47 +05:30
Nabin Hait
391eca18c7
Fixed merge conflict
2017-02-20 19:38:22 +05:30
Nabin Hait
6fd8cca135
Merge pull request #7587 from noussh/develop
...
updated missing navigation links in Docs - Accounts
2017-02-20 19:33:55 +05:30
Nabin Hait
6a85752ead
Merge branch 'hotfix' into remove-joining-datep-validation
2017-02-20 19:31:38 +05:30
Nabin Hait
e17519accb
Update salary_structure.py
2017-02-20 19:30:44 +05:30
Nabin Hait
0d66579e83
Merge branch 'develop' into develop
2017-02-20 19:22:03 +05:30
Nabin Hait
aa968cd12e
Merge pull request #7751 from nick9822/patch-3
...
Next Depreciation Date is entered as past date
2017-02-20 19:11:31 +05:30
Nabin Hait
cd837ecbac
Merge branch 'develop' into develop
2017-02-20 19:09:20 +05:30
Nabin Hait
8bb69ff8bf
Fixed merge conflict
2017-02-20 19:01:04 +05:30
Nabin Hait
e49d901907
Update process_payroll.py
2017-02-20 18:36:12 +05:30
Nabin Hait
afd8df8a20
Build Qty considering quantity for which bom is created
2017-02-20 18:06:50 +05:30
Nabin Hait
6ffd77660b
Changed module for Production Analytics
2017-02-20 17:41:44 +05:30
Nabin Hait
3cdb65f782
Merge branch 'prod_ana' of https://github.com/bcornwellmott/erpnext into bcornwellmott-prod_ana
2017-02-20 17:25:01 +05:30
Nabin Hait
589f4656ad
Merge branch 'develop' into in_global_search
2017-02-20 15:04:52 +05:30
Nabin Hait
9f4cb0c097
Fixed merge conflict
2017-02-20 15:00:04 +05:30
Nabin Hait
66b373033a
bumped to version 7.2.22
2017-02-20 15:22:01 +06:00
Nabin Hait
e6a5d5dc64
Merge pull request #7784 from mbauskar/minor-fixes
...
[minor] minor fixes for contact us page
2017-02-20 14:43:24 +05:30
Nabin Hait
da098222d7
Merge pull request #7780 from rohitwaghchaure/minor_fix_payment_entry
...
[Fix] Removed employee party type from the payment entry
2017-02-20 14:43:14 +05:30
Nabin Hait
fd3ec066ce
Added fields in global search
2017-02-20 13:38:31 +05:30
Makarand Bauskar
98f9427ba1
[minor] minor fixes for contact us page
2017-02-20 12:41:48 +05:30
bcornwellmott
97ab1d2eb3
Merge pull request #7691 from bcornwellmott/stock_reports
...
Stock reports
2017-02-19 14:36:35 -08:00
bcornwellmott
568dac3aad
Fixed Link Option for Warehouse
2017-02-19 14:04:20 -08:00
Rohit Waghchaure
f73d459c80
[Fix] Removed employee party type from the payment entry
2017-02-19 17:46:05 +05:30
Nabin Hait
02d987ed13
Minor fix for common tree view
2017-02-17 15:50:53 +05:30
Nabin Hait
64e222697c
Merge pull request #7769 from nabinhait/setup_fy_dates
...
Set fiscal year start and end date based on country
2017-02-17 15:18:28 +05:30
Nabin Hait
e285258374
Merge pull request #7762 from mbauskar/hotfix
...
[minor] timestamp fixes for heatmap
2017-02-17 15:18:01 +05:30
Rushabh Mehta
0c5375d0fa
[minor] item name not mandatory and item price with quick edit
2017-02-17 14:57:31 +05:30
mbauskar
90818080b1
[minor] Configured Auto Close days for Opportunity and Issue
2017-02-17 14:56:00 +05:30
mbauskar
e1e25a0c9d
[minor] auto close opportunity after 7 days
2017-02-17 14:54:50 +05:30
Rohit Waghchaure
a020e4eba4
Payment entry fields issue, added total billed hours in timesheet
2017-02-17 14:51:57 +05:30
Nabin Hait
6af7dd4e1b
Set fiscal year start and end date based on country
2017-02-17 14:47:33 +05:30
Nabin Hait
801fa80b39
Merge pull request #7764 from rohitwaghchaure/clean_supplied_items
...
[Fix] Cleanup supplied items if supply raw material is set as No
2017-02-17 12:36:05 +05:30
Nabin Hait
9e5b3dad29
Minor fix in assesment
2017-02-17 11:03:44 +05:30
Rohit Waghchaure
4b9d2f2733
[Fix] Cleanup supplied items if supply raw material is set as No
2017-02-16 18:53:23 +05:30
Kanchan Chauhan
1b204c8e4e
Accrual Payroll System
2017-02-16 16:30:51 +05:30
nick9822
23e174c270
Validation for purchase_date
...
Separate validation for purchase date.
2017-02-16 16:26:38 +05:30
mbauskar
e7b87ad071
[minor] timestamp fixes for heatmap
2017-02-16 16:05:46 +05:30
Nabin Hait
de45b0eddc
Merge branch 'master' into develop
2017-02-16 15:59:59 +05:30
Nabin Hait
a7d6b68bc0
bumped to version 7.2.21
2017-02-16 16:29:58 +06:00
Nabin Hait
d13d198dc8
Merge pull request #7747 from KanchanChauhan/item-name-asset
...
[Minor] Item Name in Asset
2017-02-16 15:15:23 +05:30
Rushabh Mehta
6dd461fec4
[add] site activation level
2017-02-16 14:53:21 +05:30
Nabin Hait
92c52f4623
Merge pull request #7732 from neilLasrado/student-left
...
Added ability to send newsletter to Student batch Guardians and Student Group Guardians
2017-02-16 14:40:14 +05:30
Nabin Hait
ea1cb68fe7
Merge branch 'master' into develop
2017-02-16 14:37:50 +05:30
Nabin Hait
7677b56f7c
bumped to version 7.2.20
2017-02-16 15:07:48 +06:00
Nabin Hait
b280398626
Merge pull request #7739 from rohitwaghchaure/payment_entry_currency_symbol_issue
...
[Fix] Payment Entry currency symbol issue
2017-02-16 14:21:24 +05:30
Nabin Hait
99c6c79834
Update payment_entry.js
2017-02-16 14:21:04 +05:30
Nabin Hait
507e6fa46e
Merge pull request #7749 from KanchanChauhan/leave-application-cleanup
...
Rejected leave application can be submitted
2017-02-16 14:19:11 +05:30
Neil Trini Lasrado
fa2023d3da
Added ability to send newsletter to Student batch Guardians and Student Group Guardians
2017-02-16 13:33:09 +05:30
Nabin Hait
3437a9a123
minor fix
2017-02-16 12:14:30 +05:30
pratu16x7
86415f394d
[minor] duration bar
2017-02-16 09:27:53 +05:30
mlisb0n
835a615af8
Add files via upload
2017-02-15 15:45:52 +01:00
Kanchan Chauhan
11f159193e
Rejected leave application can be submitted
2017-02-15 19:09:21 +05:30
Nabin Hait
2f7697d1bd
Merge pull request #7746 from pratu16x7/minor-search-presets
...
Preset doctypes fields to Search
2017-02-15 18:46:03 +05:30
Nabin Hait
d9068497cb
Merge pull request #7736 from KanchanChauhan/serial-no-status-report
...
[Fix] Serial No Status
2017-02-15 17:56:50 +05:30
Nabin Hait
b8624efe3a
Merge pull request #7750 from KanchanChauhan/territory-filter-opportunity
...
[Minor] Is group filter removed from Territory in Opportunity
2017-02-15 17:41:31 +05:30
Nabin Hait
afef62c887
Merge pull request #7737 from KanchanChauhan/project-percentage
...
[Fix] Project % Completed set to 0 if no tasks
2017-02-15 17:28:53 +05:30
Nabin Hait
e827104a52
Merge pull request #7738 from KanchanChauhan/appraisal-fix
...
[Fix] Empty row in Goals of Appraisal fixed
2017-02-15 17:26:40 +05:30
nick9822
e5cb3e34fe
nowdate changed to purchase_date
...
next depreciation date should be compared with purchase_date instead of nowdate.
2017-02-15 15:32:50 +05:30
Kanchan Chauhan
7118b5a2bd
[Minor] Is group filter removed from Territory in Opportunity
2017-02-15 14:46:08 +05:30
Kanchan Chauhan
2307f57f19
[Minor] Item Name in Asset
2017-02-15 11:52:29 +05:30
Rohit Waghchaure
ff41c82c2b
[Fix] Payment Entry currency symbol issue
2017-02-15 11:44:15 +05:30
pratu16x7
349ed568ed
Add task and item
2017-02-15 09:23:26 +05:30
pratu16x7
ca56ad0bfc
[minor] fix test
2017-02-14 18:49:26 +05:30
pratu16x7
462e89e452
[minor] margin fix
2017-02-14 17:18:10 +05:30
pratu16x7
0e94b4bec4
Mobile view fixes
2017-02-14 17:18:09 +05:30
pratu16x7
60fe77cc90
Website data from existing child tables, layout, images
2017-02-14 17:18:09 +05:30
pratu16x7
dee36e10ae
Add operations and items to website
2017-02-14 17:18:09 +05:30
pratu16x7
aad8257e20
Add template
2017-02-14 17:18:09 +05:30
Kanchan Chauhan
ecdcac1fdf
[Fix] Empty row in Goals of Appraisal fixed
2017-02-14 15:32:06 +05:30
KanchanChauhan
993358d5d7
Update install.md
2017-02-14 15:12:07 +05:30
Kanchan Chauhan
bab6c9c006
[Fix] Project perecentage set 0 if no tasks
2017-02-14 14:30:00 +05:30
Kanchan Chauhan
79cd59303a
[Fix] Serial No Status
2017-02-14 12:49:36 +05:30
mbauskar
2ecfd9be5d
[minor] fetched tickets to closed using sql instead of get_all
2017-02-14 08:41:09 +05:30
Nabin Hait
99dfa3060a
Check existing SO, PO and MR for disabling 'Is Stock Item' checkbox
2017-02-13 16:06:02 +05:30
Kanchan Chauhan
779c581a92
[Minor] List of Contacts
2017-02-13 16:01:52 +05:30
Nabin Hait
89b6c47b2e
Merge pull request #7712 from rohitwaghchaure/minor_fix_item_valuation_method
...
[Fix] Valuation method changing issue in the item
2017-02-13 15:42:22 +05:30
Neil Trini Lasrado
1ab8554d15
Removed Nationality in Student Applicant as a link feild to Country
2017-02-12 01:29:24 +05:30
Neil Trini Lasrado
c1bf70dc75
Added Exit Section to Student master
2017-02-12 01:17:52 +05:30
suyashphadtare
34ab136b46
[fix] Remove un-necessary Whitespace
2017-02-10 19:14:43 +05:30
suyashphadtare
750a067688
[minor][fix] Show all warehouses with item actual qty in warehouse set query
2017-02-10 19:14:43 +05:30
suyashphadtare
049a88cc40
[minor] Show item quantity in warehouse set query
2017-02-10 19:14:43 +05:30
Kanchan Chauhan
1cd5e583ba
[Fix] Apply Now button redirect fixed for Job Opening
2017-02-10 17:58:41 +05:30
KanchanChauhan
cc2c7649a8
[Minor] Stock Entry Fix ( #7715 )
2017-02-10 17:47:49 +05:30
Nabin Hait
bdd470a6d1
Update item.py
2017-02-10 17:12:48 +05:30
Rohit Waghchaure
2f09dc0e62
[Fix] Valuation method changing issue in the item
2017-02-10 15:29:45 +05:30
Nabin Hait
29dfb9479b
Merge pull request #7710 from joolsr/patch-1
...
Update customer.md
2017-02-10 13:23:06 +05:30
Ben Cornwell-Mott
67a13972fb
Added warehouse to BOM Stock Report, fixed bugs with buildable qty
2017-02-09 23:21:52 -08:00
Nabin Hait
5a69f24dfe
Merge pull request #7705 from rmehta/stock-entry-fix
...
[minor] added make material request from Stock Entry and removed cur_frm
2017-02-10 12:51:09 +05:30
Nabin Hait
b41b10976f
Merge pull request #7644 from mbauskar/develop
...
[docs] Feedback triggers
2017-02-10 12:13:31 +05:30
mbauskar
edaa43d9b8
[docs] manual feedback request and minor fixes
2017-02-10 11:28:45 +05:30
bcornwellmott
630882787a
Added buildable qty
...
The field indicates how many can be built.
2017-02-09 20:41:12 -08:00
bcornwellmott
fc41bb6afd
Fixed code issues
...
Also changed qty to Quantity left to build
2017-02-09 20:37:11 -08:00
joolsr
f9fdbe2853
Update customer.md
2017-02-09 23:10:39 +00:00
Rushabh Mehta
cf99dc0e77
[fix] for setup wizard tests and demo;
2017-02-09 18:06:11 +05:30
Rushabh Mehta
e6aa3b435a
[minor] added make material request from Stock Entry and removed cur_frm
2017-02-09 17:47:22 +05:30
mbauskar
d487bf77e1
[minor] payment entry company trigger
2017-02-09 12:57:25 +05:30
Nabin Hait
2b5fa7647a
Merge pull request #7662 from nick9822/patch-2
...
Sales analytics error after upgrade
2017-02-09 11:45:30 +05:30
Nabin Hait
e27a0d25bc
Merge pull request #7654 from rohitwaghchaure/lead_tax_issue
...
[Fix] Set default tax on quotation when it's making from the lead
2017-02-09 11:43:22 +05:30
khatrijitendra
d262eb1a1c
issue in type and rate
...
1. there is not such field, "type" it is "margin_type"
2. there is not such field, "rate" it is "margin_rate_or_amount"
2017-02-08 14:59:59 +05:30
Nabin Hait
6ff0caa87a
Fixed merge conflict
2017-02-08 11:33:33 +05:30
Nabin Hait
57e97c06e6
bumped to version 7.2.19
2017-02-08 12:02:47 +06:00
Nabin Hait
6f93cd5bd0
Merge pull request #7692 from rohitwaghchaure/minor_fixes_v_7_2
...
Minor fixes
2017-02-08 11:21:54 +05:30
Nabin Hait
533d22e88b
Merge pull request #7606 from rohitwaghchaure/data_import_tool_for_cost_center
...
[Fix] Allow data import tool for cost center
2017-02-08 11:21:25 +05:30
Rohit Waghchaure
b3489548a9
minor fix
2017-02-08 11:20:04 +05:30
Ben Cornwell-Mott
05dca985e6
Fixed stock query and corrected with suggestions from rohit
2017-02-07 09:15:33 -08:00
mbauskar
1df0b9bfed
[minor] minor fixes in feedback index.md
2017-02-07 15:20:08 +05:30
mbauskar
298acd3d1a
[docs] Feedback triggers
2017-02-07 15:20:08 +05:30
Nabin Hait
70fd8546ce
Merge pull request #7677 from KanchanChauhan/serial-no-in-return
...
[Fix] Serial No if is_return
2017-02-07 13:28:30 +05:30
Nabin Hait
555279b6e6
Merge pull request #7680 from bcornwellmott/patch-7
...
Duplicate "title" field
2017-02-07 13:27:46 +05:30
Nabin Hait
ddcb514b65
Merge pull request #7685 from KanchanChauhan/employee-details-in-salary-preview
...
[Fix] Employee Details in Salary Slip preview
2017-02-07 13:27:24 +05:30
Nabin Hait
0a6aaf4257
Get standard/historical valuation rate where missing: some minor fixes
2017-02-07 12:50:22 +05:30
mbauskar
9c0bf73d25
[minor] auto close issue using ORM (document save method)
2017-02-07 12:50:05 +05:30
Kanchan Chauhan
842ad55235
[Fix] Employee Details in Salary Slip preview
2017-02-07 12:07:55 +05:30
Kanchan Chauhan
4f3b0aa249
[Fix]Serial No if is_return
2017-02-07 11:28:34 +05:30
Ben Cornwell-Mott
02c02bc572
Fixed counting to correctly reflect all status at each month
2017-02-06 20:58:25 -08:00
Nabin Hait
ea8fab52c6
Get standard/historical valuation rate where missing, if item is not a sample item
2017-02-07 01:24:32 +05:30
bcornwellmott
92b6ceec41
Duplicate "title" field
...
The title field was duplicated - removed first one.
2017-02-06 10:51:02 -08:00
Neil Trini Lasrado
2160638f36
Merge pull request #7679 from neilLasrado/stud-group
...
Added validation to check if Student in a student group exists in the…
2017-02-07 00:17:24 +05:30
Neil Trini Lasrado
c28598ae8b
Merge pull request #7678 from neilLasrado/stud-att
...
Added validations to Student Attendance
2017-02-07 00:17:14 +05:30
Neil Trini Lasrado
3ade874f9e
Added validations to Student Attendance
2017-02-06 20:07:02 +05:30
Neil Trini Lasrado
05dec9a880
Added validation to check if Studnet in a student group exists in the student batch specified
2017-02-06 20:05:16 +05:30
mbauskar
c874a82559
[minor] index out of range fixes for JE
2017-02-06 15:41:34 +05:30
Kanchan Chauhan
5f5457085e
Joining date validation removed from Salary Structure
2017-02-06 14:50:39 +05:30
Rushabh Mehta
50862039dc
[minor] fixes to schools
2017-02-06 14:28:52 +05:30
Rohit Waghchaure
ade06f940c
[Fix] Set default tax on quotation when it's making from the lead
2017-02-06 12:14:09 +05:30
Nabin Hait
259489572d
Merge pull request #7657 from rmehta/po-from-so
...
[enhance] production order from sales order
2017-02-06 11:41:56 +05:30
Nabin Hait
101aaed643
Merge pull request #7614 from KanchanChauhan/account-filters-payroll
...
[Fix] Account filter in Process Payroll and Salary Component
2017-02-06 11:36:48 +05:30
Nabin Hait
20d2d7548a
Update salary_component.js
2017-02-06 11:36:38 +05:30
Ben Cornwell-Mott
28945438f2
Created button to link buying items to material requests
2017-02-05 18:55:57 -08:00
Ben Cornwell-Mott
36d04fda37
Fixed filter dates and date comparisons
2017-02-05 14:00:46 -08:00
Ben Cornwell-Mott
b4a2c2f047
Got proper cumulative data working
2017-02-05 13:39:39 -08:00
Ben Cornwell-Mott
943124275d
Production Analytics
2017-02-04 14:25:53 -08:00
rohitwaghchaure
ac65e956e8
Merge pull request #7659 from saurabh6790/demo_user_perm_fix
...
[minor][fix] demo user perm fix
2017-02-03 16:51:33 +05:30
Rushabh Mehta
e92a740b53
[minor] school patch fix
2017-02-03 16:05:53 +05:30
nick9822
acb5e9a11b
Sales analytics error after upgrade
...
Hi Team,
We were getting errors in sales analytics report after the upgrade.
https://discuss.erpnext.com/t/sales-analytics-report-hangs-on-erpnext-v7/17951/6
With the efforts of @Tropicalrambler into the report we made it work by putting checkpoint for item.
Please see whether its good or there is better solution for it.
Thanks,
Nick
2017-02-03 12:31:54 +05:30
Saurabh
9ca3f2847a
a[minor][fix] demo user perm fix
2017-02-02 19:22:36 +05:30
Rushabh Mehta
6ede4a3809
[enhance] production order from sales order
2017-02-02 17:42:01 +05:30
Neil Trini Lasrado
f37d329cf5
Merge branch 'develop' into eval-group
2017-02-02 17:30:10 +05:30
rohitwaghchaure
3f10c7f4fc
Merge pull request #7609 from rmehta/remove-party-status
...
Remove Party Status
2017-02-02 16:10:26 +05:30
KanchanChauhan
6575a0a7e2
[Minor]ROI fix in Employee Loan ( #7643 )
2017-02-02 16:01:43 +05:30
Rushabh Mehta
a3d0bea375
Merge branch 'develop' into remove-party-status
2017-02-02 15:42:04 +05:30
Kanchan Chauhan
3e2ecc3423
[Fix] Account filter in Process Payroll and Salary Component
2017-02-02 14:41:48 +05:30
Nabin Hait
6b9902627d
Merge pull request #7638 from rohitwaghchaure/gross_profit_report_issue
...
[Fix] Buying rate in gross profit report
2017-02-02 13:41:32 +05:30
Nabin Hait
c62362f064
Merge pull request #7649 from KanchanChauhan/salary-struct-fix
...
[Fix] Employee name fixes in Salary Structure
2017-02-02 13:30:05 +05:30
Kanchan Chauhan
a0314f19ca
[Fix] Employee name fixes in Salary Structure
2017-02-02 12:56:56 +05:30
Neil Trini Lasrado
4aabe61197
Patch for renaming evaluation criteria
2017-02-01 19:32:28 +05:30
Rohit Waghchaure
69060a8177
Minor fix
2017-02-01 19:14:53 +05:30
Neil Trini Lasrado
749516c22d
Renamed Evaluation Criteria to Assessment Criteria
2017-02-01 18:47:36 +05:30
Rushabh Mehta
3714626dd0
[minor] enhance BOM view
2017-02-01 18:35:53 +05:30
KanchanChauhan
b499fe91fa
Revert "[Fix] Rate of Interest Fix"
2017-02-01 18:16:35 +05:30
rohitwaghchaure
c13dbd408f
[Enhancement] POS Redesign ( #7639 )
...
* item group, discount
* POS Redesign
* offline customer
* removed offline records from modal view
2017-02-01 18:07:22 +05:30
KanchanChauhan
929c3890a4
Merge pull request #7641 from KanchanChauhan/employee-loan-fix
...
[Fix] Rate of Interest Fix
2017-02-01 18:06:32 +05:30
KanchanChauhan
0e995adc44
Salary Structure Employee custom field can be used in Formula and Condition ( #7615 )
2017-02-01 18:05:57 +05:30
Kanchan Chauhan
f01c1c2a9d
[Fix] Rate of Interest Fix
2017-02-01 18:05:26 +05:30
KanchanChauhan
3dc96cf71e
Merge pull request #7640 from KanchanChauhan/remove-date-validation-salary-structure
...
[Minor] From Date validation removed from Salary Structure
2017-02-01 17:42:18 +05:30
Kanchan Chauhan
e67e2e6fee
[Minor] From Date validation removed from Salary Structure
2017-02-01 17:41:36 +05:30
Rohit Waghchaure
38f808cfae
[Fix] Buying rate in gross profit report
2017-02-01 13:34:06 +05:30
rohitwaghchaure
ea092a7b24
[Enhancement] Booking of an employee's expense claim ( #7267 )
...
* [Enhancement] Auto book of an employee's expense claim
* test cases
* documentation
* fixes and changes
* removed payable from employee and added into the company
* Added party in account, patch to update party type for customer and supplier accounts
* added party type in erpnext, fix patch
* fixed travis
2017-02-01 12:02:08 +05:30
Rushabh Mehta
587dd90182
[minor] removed customer status
2017-02-01 12:01:24 +05:30
Rushabh Mehta
99ce531beb
[minor] css for team updates
2017-02-01 11:46:47 +05:30
Neil Trini Lasrado
d408553b93
Merge pull request #7623 from neilLasrado/guardian
...
Added Student table in Guardian (Only rendered for display purpose)
2017-01-31 18:18:50 +05:30
Neil Trini Lasrado
ebfb7ff027
Merge pull request #7625 from neilLasrado/student-batch
...
Added Mark Assessment Result Button in assessment plan
2017-01-31 18:18:32 +05:30
Neil Trini Lasrado
879a2d84dc
Added Evaluation Criteria Group
2017-01-31 17:03:37 +05:30
Neil Trini Lasrado
477c88450f
UI fixes for Guardian Doctype
2017-01-31 16:49:39 +05:30
Neil Trini Lasrado
9071bcbfa8
Added Student table in Guardian (Only rendered for display purpose)
2017-01-31 16:36:29 +05:30
Rushabh Mehta
7ec4b717ed
[feature] added team updates page
2017-01-31 11:42:58 +05:30
Rohit Waghchaure
d9a265fab1
Merge branch 'develop' of github.com:frappe/erpnext into develop
2017-01-31 11:34:07 +05:30
Neil Trini Lasrado
1947aca2a8
Added Mark Assessment Result Button in assessment plan
2017-01-30 18:34:25 +05:30
Neil Trini Lasrado
ba96ce7dd5
Merge pull request #7616 from neilLasrado/assessment-validations
...
Patch fix for Update Assessment Module Patch
2017-01-30 17:50:37 +05:30
Neil Trini Lasrado
fd1767d2ea
Patch fix for Update Assessment Module Patch
2017-01-30 17:50:05 +05:30
Rushabh Mehta
4500f7b4d6
[cleanup] remove unused LMS ( #7612 )
2017-01-30 17:04:38 +05:30
Neil Trini Lasrado
ab1ee1e6fc
Patch fix for Update Assessment Module Patch
2017-01-30 16:40:14 +05:30
Neil Trini Lasrado
80ca65c166
Added validation to ensure that the Sum of Scores of evaluation Criteras is equal to the max assessment score.
2017-01-30 15:28:41 +05:30
KanchanChauhan
fbaa6197f9
Employee Loan Management ( #7126 )
...
* [WIP] Employee Loan Management
* EMI calculation
* Fixing PR
2017-01-30 15:15:58 +05:30
Rushabh Mehta
364f48aad2
[minor] fix patch
2017-01-30 13:23:09 +05:30
Rushabh Mehta
87037bdd56
[minor] remove party status as it leads to duplicate notifications fixes #7346 , also fix for #7568
2017-01-30 13:22:51 +05:30
Makarand Bauskar
d893efd0a9
[minor] replace object values in translations ( #7602 )
2017-01-30 12:35:34 +05:30
rohitwaghchaure
3b40098738
Merge pull request #7571 from RicardoJohann/projectfilter
...
added project filter to gl and carry project filter from P&L
2017-01-30 12:24:36 +05:30
Rohit Waghchaure
b327429db7
[Fix] Allow data import tool for cost center
2017-01-30 11:34:29 +05:30
mbauskar
16ce3623bc
[fixes] set lead to Null on delete company transaction & other minor fixes
2017-01-30 10:45:28 +05:30
mbauskar
51b1d6de48
[minor] moved the address_and_contact utils to frappe
2017-01-30 10:45:28 +05:30
mbauskar
7fa039f15c
[fixes] delete company transaction and other minor fixes
2017-01-30 10:45:28 +05:30
mbauskar
83f4780f74
[Fixes] Address and Contact fixes
2017-01-30 10:45:28 +05:30
mbauskar
8271b4c564
[minor] fixes in address filters
2017-01-30 10:45:28 +05:30
mbauskar
cbc49e2989
[WIP] Address and Contact Fixes
2017-01-30 10:45:28 +05:30
rohitwaghchaure
531b49f6c7
Merge pull request #7590 from KanchanChauhan/rename-task
...
[Minor]Task rename now possible
2017-01-30 09:29:10 +05:30
KanchanChauhan
2dfb90a922
Merge pull request #7565 from KanchanChauhan/leave-balance-report-fix
...
[Fix] Permissions to view Leave Balance Report
2017-01-29 21:07:02 +05:30
Rohit Waghchaure
92c9ad8c72
Merge branch 'master' into develop
2017-01-28 14:14:33 +05:30
Rohit Waghchaure
ce4a0b20ab
bumped to version 7.2.18
2017-01-28 14:44:32 +06:00
Kanchan Chauhan
b77eaf7053
[URGENT][FIX]Stock Controller fix
2017-01-28 13:26:46 +05:30
Neil Trini Lasrado
6d0da98a78
Fixes to update student guardian name patch
2017-01-27 17:44:28 +05:30
Neil Trini Lasrado
7ff5682193
Merge branch 'develop' into guarding-name
2017-01-27 16:54:50 +05:30
Neil Trini Lasrado
f36ff488c0
Added Guardian Name to Student Master
2017-01-27 16:53:55 +05:30
Rushabh Mehta
e239d4dfe9
Merge branch 'master' into develop
2017-01-27 16:18:26 +05:30
Rushabh Mehta
098bd34f00
bumped to version 7.2.17
2017-01-27 16:48:25 +06:00
Rushabh Mehta
063e86a1bf
[fix] remove on_update in Item
2017-01-27 16:16:08 +05:30
Rushabh Mehta
b5eaf324b3
Merge branch 'master' into develop
2017-01-27 16:03:30 +05:30
Rushabh Mehta
5f0027a2d0
bumped to version 7.2.16
2017-01-27 16:33:29 +06:00
Rushabh Mehta
fd82f4b0d4
[minor] fix for item_group.py
2017-01-27 16:00:47 +05:30
Rushabh Mehta
710dc5392f
[merge]
2017-01-27 15:48:31 +05:30
Rushabh Mehta
149c033c8f
bumped to version 7.2.15
2017-01-27 16:16:07 +06:00
Neil Trini Lasrado
7326217ab5
Added 'Active' checkbox in list view for Student Batch and Student Group
2017-01-27 14:50:48 +05:30
Neil Trini Lasrado
8c3fb43d8a
Fix- Student batch strength in Batch Wise attendance report
2017-01-27 14:13:25 +05:30
Kanchan Chauhan
3dd85a0e9e
Task rename now possible
2017-01-27 12:34:06 +05:30
Kanchan Chauhan
e877ecfb7b
[Fix] Permissions to view Leave Balance Report
2017-01-27 11:53:56 +05:30
noussh
425d7adcdd
Update recurring-orders-and-invoices.md
2017-01-26 15:38:57 +04:00
noussh
0350db6a4e
added next link
2017-01-26 15:35:01 +04:00
noussh
1e86546e2c
added the link
2017-01-26 12:53:45 +04:00
noussh
6396c90956
Update multi-currency-accounting.md
2017-01-26 12:52:29 +04:00
noussh
47fbc7efa5
adde the next page link
2017-01-26 12:50:34 +04:00
noussh
8b62626cec
Wrong path updated
2017-01-25 19:44:32 +04:00
Nabin Hait
355b4110c9
Merge pull request #7583 from rohitwaghchaure/valuation_rate_issue
...
[Fix] Get valuation rate from item master and update stock value difference
2017-01-25 19:21:04 +05:30
Nabin Hait
cb19f52985
Update stock_controller.py
2017-01-25 19:20:35 +05:30
Rohit Waghchaure
3899d74f15
[Fix] Get valuation rate from item master and update stock value difference
2017-01-25 18:47:53 +05:30
Nabin Hait
57e4ab70be
Merge pull request #7580 from KanchanChauhan/calendar-manual-screenshots
...
New screenshots for Calendar user manual
2017-01-25 17:35:01 +05:30
Nabin Hait
d288909310
Merge pull request #7561 from KanchanChauhan/salary-slip-fix-abbr
...
Patch to update Salary Detail where Salary Component Abbr is null
2017-01-25 17:23:43 +05:30
Kanchan Chauhan
ce116417e1
New screenshots for Calendar user manual
2017-01-25 15:38:35 +05:30
robert schouten
67eff49516
[fix] compact print format not longer ignores format builder
2017-01-25 08:20:43 +08:00
Ricardo Johann
34354237fd
added project filter to gl and carry project filter from P&L
2017-01-24 06:46:07 -03:00
vrms
1f1f56225c
Update warehouse.md ( #7544 )
...
added some detail about link between Warehouse & Warehouse account & machanics of sub-warehousese (Warehouse >Room >Row > Shelf >box
2017-01-24 11:29:27 +05:30
KanchanChauhan
4333ce0fd8
Merge pull request #7569 from neilLasrado/assessment
...
Fix for update assessment modules patch
2017-01-24 10:52:50 +05:30
Neil Trini Lasrado
15c5ae0918
Fix for update assessment modules patch
2017-01-24 10:28:49 +05:30
Kanchan Chauhan
679cc23abb
[Fix] Naming series issue fix
2017-01-23 17:20:55 +05:30
Kanchan Chauhan
c948a4fc92
Patch to update Salary Detail where Salary Component Abbr is null
2017-01-23 16:12:45 +05:30
rohitwaghchaure
ab65f6d8b1
Merge pull request #7547 from mnatalia/develop
...
Added translations to the web page and item dashboard.
2017-01-23 15:57:33 +05:30
Neil Trini Lasrado
d471ad2c45
Fix for update assessment modules patch
2017-01-23 14:59:19 +05:30
Makarand Bauskar
01eefafad5
[minor] minor fixes in opportunity form ( #7549 )
2017-01-23 12:15:36 +05:30
Rushabh Mehta
397e508fc0
[fix] sales_partner.js, fixes #7553
2017-01-21 16:58:57 +05:30
Nabin Hait
1f9d1bb877
Merge branch 'develop' into assessment
2017-01-20 20:09:44 +05:30
Neil Trini Lasrado
16d40cf0a3
Added ability to disable a student in student group/studnet batch
2017-01-20 19:33:09 +05:30
Nabin Hait
349d520ae2
Fixed merge conflict
2017-01-20 15:44:35 +05:30
Nabin Hait
a1d3d84415
bumped to version 7.2.14
2017-01-20 16:10:35 +06:00
Nabin Hait
c1cc7b68c4
Merge pull request #7522 from nabinhait/hotfix
...
Get valuation rate from Item while not found based on SLE
2017-01-20 15:39:24 +05:30
mnatalia
e09407571c
Added translations to the web page and item dashboard.
2017-01-20 12:00:25 +02:00
Nabin Hait
4c952f48f8
Some minor fixes
2017-01-20 15:15:31 +05:30
Nabin Hait
bd1a628c55
Merge pull request #7545 from rohitwaghchaure/minor_issue
...
[Fix] Account user not able to access the report Payment Period Based On Invoice Date
2017-01-20 14:36:48 +05:30
Rohit Waghchaure
93c001455f
[Fix] Account user not able to access the report
2017-01-20 14:18:17 +05:30
Nabin Hait
548cf183ea
Merge pull request #7543 from RobertSchouten/leave_allocation_fix
...
[fix] remove invalid parameter from leave allocation
2017-01-20 12:54:55 +05:30
Nabin Hait
153156e31a
Merge pull request #7529 from rohitwaghchaure/budget_issue
...
[Fix] Budget not working properly
2017-01-20 12:54:29 +05:30
Nabin Hait
a0b967f2cd
Get valuation rate from Item while not found based on SLE
2017-01-20 12:50:40 +05:30
Nabin Hait
f356e539bb
Update set_null_value_to_fields.py
2017-01-20 12:35:22 +05:30
Rohit Waghchaure
84b827efcd
[Fix] Budget not working properly
2017-01-20 12:33:50 +05:30
robert schouten
e14e042f2f
[fix] remove invalid parameter from leave allocation
2017-01-20 15:02:00 +08:00
Nabin Hait
bfcacbf2ca
Merge pull request #7535 from rohitwaghchaure/landed_cost_voucher_issue
...
[Fix] Minor issue in landed cost voucher
2017-01-20 12:12:17 +05:30
Rohit Waghchaure
a3a977d02a
[Fix] Minor issue in landed cost voucher
2017-01-19 18:38:53 +05:30
Kanchan Chauhan
03dc695c77
[Minor] Set website warehouse as default warehouse
2017-01-19 14:57:05 +05:30
Rushabh Mehta
c81621d3ce
[minor] add progress bar in patch
2017-01-19 14:32:36 +05:30
Rushabh Mehta
00d3cd6d64
[fix] contact address link patch
2017-01-19 14:27:02 +05:30
Rushabh Mehta
818af75575
[patch] add patch for contact_address_update
2017-01-19 13:08:46 +05:30
Rushabh Mehta
d69fd1b8c0
[fix] update_salary_slip.py
2017-01-19 12:51:37 +05:30
Rushabh Mehta
683d98fd54
[fix] update_salary_slip.py
2017-01-19 12:48:03 +05:30
Rushabh Mehta
35e4d8b152
[fix] update_salary_slip.py
2017-01-19 12:47:27 +05:30
Rushabh Mehta
60908f4a08
[fix] update_salary_slip.py
2017-01-19 12:46:11 +05:30
Rushabh Mehta
26fdb113a8
[fix] update_salary_slip.py
2017-01-19 12:44:54 +05:30
Kanchan Chauhan
45c14ed41c
[Minor] Date fix in Production Order
2017-01-19 12:22:04 +05:30
Nabin Hait
eb80fdef82
Merge pull request #7520 from RobertSchouten/heatmap_limit_dev
...
[fix] accounts heatmaps now covering 366 days not 20
2017-01-19 09:15:20 +05:30
Nabin Hait
6b3670848e
Merge pull request #7477 from rmehta/custom-perms
...
[minor] fix for custom perms
2017-01-18 17:03:58 +05:30
Rohit Waghchaure
56cc542eb7
[Fix] sales return discount issue
2017-01-18 14:50:24 +05:30
Rushabh Mehta
a0c41b70c4
[fix] tax rule test
2017-01-18 14:14:20 +05:30
Rohit Waghchaure
2b97cee32c
[Fix] POS print issue
2017-01-18 13:21:27 +05:30
robert schouten
c0888637cc
[fix] accounts heatmaps now covering 366 days not 20
2017-01-18 15:25:58 +08:00
Rushabh Mehta
8f55d6bf3a
[fix] test_shopping_cart.py
2017-01-17 22:15:17 +05:30
Rushabh Mehta
d14a6c058a
[fix] stop recursion while adding role
2017-01-17 18:46:37 +05:30
Rushabh Mehta
982be9f11b
[tests] fixed for shopping cart
2017-01-17 17:57:38 +05:30
Rushabh Mehta
7385b73449
[fix] test
2017-01-17 17:57:38 +05:30
Nabin Hait
dd839055e3
Fixed merge conflict
2017-01-17 15:52:56 +05:30
Nabin Hait
aff2b9479d
bumped to version 7.2.13
2017-01-17 16:22:25 +06:00
Nabin Hait
f8676b2058
Create Material Requests considering projected qty of items
2017-01-17 14:11:43 +05:30
Ben Cornwell-Mott
5597f6a830
Fixes counting of in stock parent assemblies and formatting of csv
2017-01-17 14:11:43 +05:30
Kanchan Chauhan
653303180a
[Minor] Payroll Fix
2017-01-17 13:54:55 +05:30
Nabin Hait
1c91dc4589
Merge pull request #7475 from RobertSchouten/profitability_order
...
[fix] profiability analasyis orderby name
2017-01-17 12:39:24 +05:30
Nabin Hait
d9e216878f
Merge pull request #7513 from rohitwaghchaure/paid_amount_copy_issue
...
[Fix] Calculate paid amount when is pos is enabled
2017-01-17 12:38:09 +05:30
Nabin Hait
9e294ee454
Merge branch 'rfq_supplier_pull' into develop
2017-01-17 12:26:09 +05:30
Nabin Hait
2ad62c2892
In RFQ, get items from material requests based on possible supplier
2017-01-17 12:25:33 +05:30
Rohit Waghchaure
f58cad6b13
[Fix] Calculate paid amount when is pos is enabled
2017-01-17 12:11:57 +05:30
Rushabh Mehta
592104ef68
[fix] tests
2017-01-17 12:06:53 +05:30
Nabin Hait
7c7b3c0ab4
Merge pull request #7465 from KanchanChauhan/attendance-enhancement
...
[Enhancement] Attendance Module
2017-01-17 11:47:02 +05:30
Nabin Hait
0681c77f6a
Merge pull request #7506 from mntechnique/hotfix
...
[Fix] Project: Enabled autocomplete for project users
2017-01-17 11:27:37 +05:30
Nabin Hait
2dab8809e7
Merge pull request #7509 from kickapoo/develop
...
Add Full Name as option in HR Setting Employee creation option
2017-01-17 11:26:25 +05:30
Dhaifallah Alwadani
9eb830ac4f
fix string translation
2017-01-17 11:13:57 +05:30
Nabin Hait
bf01958b85
Merge pull request #7510 from dalwadani/develop
...
fix string translation
2017-01-17 11:12:15 +05:30
Nabin Hait
b064cf39c2
Merge branch 'develop' into fleet-moved-to-hr
2017-01-17 11:05:39 +05:30
Nabin Hait
03f82240fa
Merge pull request #7222 from neilLasrado/assessment
...
Redesign Assessment Module
2017-01-17 11:04:02 +05:30
Dhaifallah Alwadani
9375d1dfeb
fix string translation
2017-01-16 04:05:40 -08:00
Stavros Anastasiadis
241e478dc0
Add Full Name as option in HR Setting Employee creation option
2017-01-16 14:02:28 +02:00
Rushabh Mehta
ffd80a6061
[fix] warehouse test cases
2017-01-16 17:23:20 +05:30
Rushabh Mehta
6695830f3f
[fix] warehouse test cases
2017-01-16 16:57:53 +05:30
Gaurav Naik
d9b4c52046
[Fix] Project: Enabled autocomplete for project users
2017-01-16 16:01:25 +05:30
Kanchan Chauhan
f80c2b9606
Fleet management moved to HR
2017-01-16 14:38:24 +05:30
Rushabh Mehta
8d39fd9790
[fix] address queries + tests
2017-01-16 13:06:15 +05:30
Nabin Hait
120461efef
Merge branch 'master' into develop
2017-01-16 13:04:54 +05:30
Nabin Hait
71a730a36f
bumped to version 7.2.12
2017-01-16 13:34:53 +06:00
KanchanChauhan
b89be1e193
[Minor] Demo fixes ( #7499 )
2017-01-16 12:57:14 +05:30
Neil Trini Lasrado
38bd62d82d
Merge branch 'develop' into assessment
2017-01-16 12:23:51 +05:30
Rushabh Mehta
4ad121e1a4
[minor] fixes for Contact
2017-01-16 12:19:21 +05:30
ci2014
820abd3ba4
Fix missing comma ( #7495 )
...
Fixed missing comma after method set_contact_link
2017-01-16 11:57:34 +05:30
Nabin Hait
47bdf8b659
Merge pull request #7490 from rohitwaghchaure/pos_discount_issue
...
[Fix] Discount not working in the POS
2017-01-16 11:44:50 +05:30
Rohit Waghchaure
685f89f2b7
[Fix] Discount not working in the POS
2017-01-14 20:47:56 +05:30
Rushabh Mehta
95439db53f
[fixes] address and contact
2017-01-14 00:25:22 +05:30
Rushabh Mehta
c0bfb0ba56
[fix] contact and address for demo
2017-01-13 23:05:56 +05:30
Rushabh Mehta
b92087cb2d
[cleanup] move contact, address to frappe 💥
2017-01-13 18:54:47 +05:30
Nabin Hait
448acf6f46
Merge branch 'master' into develop
2017-01-13 17:30:46 +05:30
Nabin Hait
3d26ddd790
bumped to version 7.2.11
2017-01-13 18:00:45 +06:00
Nabin Hait
e7cb911634
Salary Slip Patch Fixed
2017-01-13 17:30:06 +05:30
Nabin Hait
26ac85be5b
Merge branch 'master' into develop
2017-01-13 17:10:52 +05:30
Nabin Hait
fd7f3240b4
bumped to version 7.2.10
2017-01-13 17:40:51 +06:00
Nabin Hait
b166caa9fb
Patch fixed
2017-01-13 17:09:57 +05:30
robert schouten
7a3d418aa5
Email inbox based off of frappe email inbox pr ( #7308 )
...
* email inbox
* inbox fixes
* separate email-inbox to pass tests
* separate email-inbox to pass tests
* fix import
* add more info to contact and address
2017-01-13 14:51:09 +05:30
Rushabh Mehta
af077dc616
[minor] fix for custom perms
2017-01-13 14:47:37 +05:30
Nabin Hait
b251cd4ccb
Fixed merge conflict
2017-01-13 14:34:54 +05:30
Nabin Hait
45cad45420
bumped to version 7.2.9
2017-01-13 15:03:56 +06:00
Nabin Hait
e43a94de4b
Merge branch 'hotfix' into draft_status_issue_after_amend
2017-01-13 13:14:32 +05:30
Nabin Hait
9698f1b923
Merge pull request #7473 from KanchanChauhan/salary-slip-before-june
...
Patch to add Start and End Date in Salary Slips
2017-01-13 12:53:15 +05:30
Rohit Waghchaure
29458836e4
[Fix] After amend the status become cancelled even if docstatus is zero
2017-01-13 12:51:19 +05:30
robert schouten
1a92d54dcb
[fix] profiability analasyis orderby cost center name
2017-01-13 14:52:11 +08:00
Kanchan Chauhan
b6114e672f
Patch to add Start and End Date in Salary Slips
2017-01-13 12:05:03 +05:30
Nabin Hait
4bd42146ba
Merge pull request #7462 from rohitwaghchaure/minor_pos_issue
...
[Fix] POS issues
2017-01-13 11:55:52 +05:30
Nabin Hait
ba2a76cfb7
Merge pull request #7453 from KanchanChauhan/salary-register-report
...
Changes to Salary Register
2017-01-13 11:51:48 +05:30
Nabin Hait
8f0c060578
Merge pull request #7447 from saurabh6790/tree_param_fix
...
[fix] provision to handle custom mandatory params while creating node
2017-01-13 11:50:18 +05:30
Nabin Hait
17cd36b7d5
Merge pull request #7451 from saurabh6790/chequeprint_date_fix
...
[minor][fix] show date in user format
2017-01-13 11:36:12 +05:30
Nabin Hait
90de12fea3
Merge pull request #7446 from KanchanChauhan/fieldtype-edit-desc
...
[Minor] Field type of Description field changed to Text Editor
2017-01-13 11:34:51 +05:30
Nabin Hait
007c87ea63
Merge pull request #7440 from nabinhait/gle_repost_optimization
...
Optimization to reduce GLE reposting time for future stock transactions
2017-01-13 11:33:42 +05:30
robert schouten
d56627f2b7
[fix] profiability analasyis orderby project name
2017-01-13 11:53:43 +08:00
Felipe Orellana
ac81440a81
[FIX] Contact form breaks on existing lead
...
When an email address from the contacts form is from a existing lead utils.py tries to set new_lead(an undefined var) as the lead reference if a lead is found.
2017-01-12 12:08:20 -05:00
Kanchan Chauhan
7933eb685c
[Enhancement] Attendance Module
2017-01-12 17:24:53 +05:30
Rohit Waghchaure
8afe267813
[Fix] POS issues
2017-01-12 15:22:02 +05:30
Kanchan Chauhan
2f3ae914a6
Changes to Salary Register
2017-01-11 19:45:01 +05:30
Ben Cornwell-Mott
1cd7e54822
Adds button to find MRs linked to Supplier
2017-01-11 03:05:49 -08:00
Saurabh
056276c60e
[minor][fix] show date in user format
2017-01-11 15:50:09 +05:30
RicardoJohann
7182de7684
allowed rename salary structure
2017-01-11 06:28:59 -02:00
Saurabh
2f02101d7d
[fix] provision to handle custom mandatory params while creating node
2017-01-11 12:41:01 +05:30
Kanchan Chauhan
595cfb9f17
[Minor] Field type of Description field changed to Text Editor
2017-01-11 12:03:15 +05:30
Nabin Hait
0287d31c0f
Fetch bin details after setting warehouse based on POS Profile
2017-01-11 10:31:45 +05:30
Nabin Hait
c0eab41ec5
Fix for Budget against Project
2017-01-11 10:16:19 +05:30
Ben Cornwell-Mott
3d491f90cc
Created 2 reports for stock details
2017-01-10 14:14:18 -08:00
Neil Trini Lasrado
2a9e0f6fd8
Added assessment result tool
2017-01-10 17:32:02 +05:30
Nabin Hait
9e08ccdf39
Merge pull request #7425 from KanchanChauhan/sync-projecttask-task
...
Sync Project Task and Task
2017-01-10 17:26:51 +05:30
Nabin Hait
1612fa1253
Merge pull request #7426 from nabinhait/hotfix
...
Show values based on precision and filter out zero value rows
2017-01-10 17:26:27 +05:30
Nabin Hait
20aba32318
Merge pull request #7427 from KanchanChauhan/projects-manager-role
...
[Minor] Added Projects Manager role
2017-01-10 17:25:16 +05:30
Kanchan Chauhan
c4aceaad7f
[Minor] Added Projects Manager role
2017-01-10 16:35:54 +05:30
Nabin Hait
5dd988207f
Show values based on precision and filter out zero value rows
2017-01-10 16:10:40 +05:30
Kanchan Chauhan
4a15fa4c86
Sync Project Task and Task
2017-01-10 16:01:38 +05:30
Rushabh Mehta
d40e661ebd
[style] better demo start page
2017-01-10 14:46:54 +05:30
Nabin Hait
51d45d8bce
Fixed merge conflict
2017-01-10 12:32:01 +05:30
Nabin Hait
4180a37773
bumped to version 7.2.8
2017-01-10 13:00:09 +06:00
Nabin Hait
a7f616564e
Merge pull request #7417 from KanchanChauhan/quick-entry-for-item
...
[Minor] Valuation rate in Quick entry for Item
2017-01-10 12:23:36 +05:30
Nabin Hait
01baceb74e
Revert "proposed usage of daterange picker"
2017-01-10 12:19:48 +05:30
Kanchan Chauhan
43e07aed2c
[Minor]Valuation rate in Quick entry for Item
2017-01-10 12:06:51 +05:30
Nabin Hait
9215581345
Merge pull request #7414 from KanchanChauhan/timesheet-payroll-frequency-toggle
...
[Fix] Payroll Frequency toggle fix
2017-01-10 11:58:36 +05:30
Kanchan Chauhan
2b41f9d548
[Fix] Payroll Frequency toggle fix
2017-01-09 18:43:52 +05:30
Neil Trini Lasrado
5a30467ae5
Added test case
2017-01-09 18:26:03 +05:30
Neil Trini Lasrado
a56224c03a
Rename Assessment to Assessment Plan
2017-01-09 18:26:03 +05:30
Neil Trini Lasrado
233ecfdd9c
Renamed min_score to threshold in Grading Scale
2017-01-09 18:26:03 +05:30
Neil Trini Lasrado
577cfd559f
Removed LMS code in Course master
2017-01-09 18:26:03 +05:30
Neil Trini Lasrado
5c87455918
Patch for assessment module redesign
2017-01-09 18:26:03 +05:30
Neil Trini Lasrado
06ed74dc7c
Redesign Assessment Module
2017-01-09 18:26:02 +05:30
Nabin Hait
ec793b4846
Merge branch 'hotfix' of git://github.com/frappe/erpnext into hotfix
2017-01-09 17:24:10 +05:30
Nabin Hait
6e9d2a3c1f
fixed conflict
2017-01-09 17:21:34 +05:30
Nabin Hait
a2fae844b6
Merge pull request #7410 from RobertSchouten/timesheet_overlap_validation
...
[fix] timesheet overlap validation not including modified timesheet
2017-01-09 17:15:40 +05:30
Nabin Hait
2bb9093b9a
bumped to version 7.2.7
2017-01-09 17:27:10 +06:00
Nabin Hait
f0c41b5709
Merge pull request #7412 from nabinhait/hotfix
...
Allow fetching same items multiple times from source doc if all qty not processed
2017-01-09 16:00:08 +05:30
Nabin Hait
23b836dcdb
Merge pull request #7386 from arvindstutzen/patch-1
...
Update step-8-customer-names.md
2017-01-09 15:55:38 +05:30
Nabin Hait
297ae85c31
Merge pull request #7409 from RobertSchouten/daterangecontrol
...
proposed usage of daterange picker
2017-01-09 15:55:17 +05:30
Nabin Hait
1839fcca11
Merge pull request #7406 from saurabh6790/terms_and_cond_fix
...
[fix] if terms exists then only call render_template
2017-01-09 15:49:56 +05:30
Nabin Hait
d1eb237909
Merge pull request #7400 from rohitwaghchaure/minor_issue
...
Get item default warehouse
2017-01-09 15:49:14 +05:30
Nabin Hait
a9b9edd9bc
Merge pull request #7392 from frappe/bcornwellmott-patch-2
...
Fix number of digits on report
2017-01-09 15:48:04 +05:30
Nabin Hait
802b4359b5
Fetch same items multiple times from source doc if all qty not processed
2017-01-09 15:32:20 +05:30
nick9822
6f48d4be1c
whitelisted erpnext.stock.utils.get_stock_balance ( #7402 )
...
whitelisted erpnext.stock.utils.get_stock_balance with respect to
https://github.com/frappe/erpnext/issues/7364
2017-01-09 12:12:36 +05:30
robert schouten
138c2f6b29
[fix] timesheet overlap validation not including modified timesheet
2017-01-09 12:50:35 +08:00
robert schouten
81130e848e
proposed usage of daterange picker
2017-01-09 08:38:27 +08:00
Saurabh
f65e8de5a5
[fix] if terms exists then only call render_template
2017-01-07 08:18:10 +05:30
bcornwellmott
34e34ed1e8
Trigger Restart of build checks
2017-01-06 17:21:16 -08:00
Rushabh Mehta
8b133ac087
[minor] [tests] fix, tests will fail on the 5th of a month!
2017-01-06 17:21:04 +05:30
Rohit Waghchaure
6734c4ad5c
Get item default warehouse
2017-01-06 14:39:40 +05:30
Nabin Hait
91621639e8
Reload in_standard_filter property
2017-01-06 12:54:16 +05:30
bcornwellmott
a3e7c38734
Fix number of digits on report
...
Currently the cells can show many digits.
2017-01-05 09:44:18 -08:00
Nabin Hait
59a67c3586
Update supplier_quotation.py
2017-01-05 14:58:30 +05:30
Arvind Subramanian
efc9372f46
Update step-8-customer-names.md
2017-01-05 08:34:58 +05:30
bhupen
107099aac9
you can make quotation from supplier quotation
2017-01-04 17:04:12 +05:30
Nabin Hait
d08c248642
Merge pull request #7354 from Scheercuzy/enlarge-item-image-website
...
Hyperlink on item image on website
2017-01-04 15:58:44 +05:30
britlog
35cefb1275
fix success_list if http status == 200 + utf-8 support + optional success message
2017-01-04 15:53:26 +05:30
Nabin Hait
8281b36a26
Merge pull request #7380 from KanchanChauhan/emailid-to-emailaddress
...
Email ID renamed to Email Address
2017-01-04 15:46:48 +05:30
Nabin Hait
f45851c245
Merge pull request #7379 from KanchanChauhan/accounts-reports
...
[Enhancement] Summary link on Accounts Payable and Accounts Receivable
2017-01-04 15:45:39 +05:30
Nabin Hait
0dab40f4a1
Merge pull request #7377 from KanchanChauhan/naming-series
...
[Fix] Naming series issue
2017-01-04 15:44:00 +05:30
Nabin Hait
96562e3eb7
Merge pull request #7362 from rmehta/minor-fixes
...
[minor] dont get warehouse in opening entry #7353
2017-01-04 15:42:23 +05:30
Nabin Hait
202bcc09d5
Merge pull request #7336 from rohitwaghchaure/pos_enhancement_and_issues
...
[Enhancement] POS features
2017-01-04 15:15:32 +05:30
Nabin Hait
3051a3dd97
Fixed test case for margin
2017-01-04 15:11:58 +05:30
Kanchan Chauhan
b7cc393eb8
Email ID renamed to Email Address
2017-01-03 16:45:38 +05:30
Kanchan Chauhan
f4832cf2b9
[Enhancement] Summary link on Accounts Payable and Accounts Receivable
2017-01-03 16:29:41 +05:30
Scheercuzy
7c161cfff2
Merge remote-tracking branch 'frappe/develop' into enlarge-item-image-website
2017-01-03 16:03:43 +06:30
Kanchan Chauhan
0e8361d1de
[Fix] Naming series issue
2017-01-03 14:29:17 +05:30
Nabin Hait
1d88c65be4
Merge pull request #7374 from rohitwaghchaure/billed_report_enhancement
...
[Enhancement] Consolidated billed report, changed the report type from query to script
2017-01-02 17:40:51 +05:30
Nabin Hait
ab42fc006f
Merge branch 'master' into develop
2017-01-02 17:26:55 +05:30
Nabin Hait
1ecf613c3c
bumped to version 7.2.6
2017-01-02 17:56:54 +06:00
Nabin Hait
ceea71bcfc
Merge pull request #7365 from rohitwaghchaure/terms_and_condition
...
minor fix
2017-01-02 17:24:42 +05:30
Nabin Hait
b0e329b803
Merge pull request #7367 from saurabh6790/sms_log_fix
...
[fix] status check fix
2017-01-02 17:24:25 +05:30
Nabin Hait
506120936a
Merge pull request #7373 from KanchanChauhan/leave-for-absent
...
[Fix] Attendance validation in Leave Application
2017-01-02 17:23:45 +05:30
Nabin Hait
7fc18f359c
Currency symbol for budget amount based on company
2017-01-02 17:21:34 +05:30
Nabin Hait
92254d3930
Set serial nos in DN based on FIFO based on Stock Settings
2017-01-02 17:01:27 +05:30
Rohit Waghchaure
5a383e5cdd
[Enhancement] Consolidated billed report, changed type from query to script
2017-01-02 16:20:43 +05:30
Nabin Hait
06966e8e1d
minor fix
2017-01-02 15:10:01 +05:30
Kanchan Chauhan
5594050104
[Fix] Attendance validation in Leave Application
2017-01-02 11:14:44 +05:30
Rohit Waghchaure
cdbacf5398
minor fix
2016-12-30 17:06:01 +05:30
Saurabh
6bbed0297b
[fix] status check fix
2016-12-30 17:05:40 +05:30
KanchanChauhan
4601fdd98d
Better Salary Slip logs in Process Payroll ( #7322 )
2016-12-30 16:26:55 +05:30
Nabin Hait
9784d27317
Optimization to reduce GLE reposting time for future stock transactions
2016-12-30 16:21:35 +05:30
Nabin Hait
ce5f942678
Merge branch 'master' into develop
2016-12-30 15:54:32 +05:30
Nabin Hait
edb99f8750
bumped to version 7.2.5
2016-12-30 16:24:31 +06:00
Nabin Hait
4de4b56c60
Merge pull request #7363 from rohitwaghchaure/terms_and_conditions_for_company
...
set default terms and condition if tc_name is available on the form
2016-12-30 15:46:57 +05:30
Rohit Waghchaure
585448b225
set default terms and condition if tc_name is available on the form
2016-12-30 15:41:55 +05:30
Rushabh Mehta
985cb8226d
[minor] dont get warehouse in opening entry #7353
2016-12-30 15:06:54 +05:30
Nabin Hait
e97d40806f
Merge branch 'master' into develop
2016-12-30 14:56:20 +05:30
Nabin Hait
5105b1e789
bumped to version 7.2.4
2016-12-30 15:26:19 +06:00
Nabin Hait
dc0a277085
Merge pull request #7355 from manassolanki/hotfix
...
Fetching the item details from the reference doctype in QI
2016-12-30 14:10:21 +05:30
Nabin Hait
fa2feae314
Merge pull request #7359 from nabinhait/hotfix
...
[fix] Make Journal Entry against SO
2016-12-30 12:38:56 +05:30
Kanchan Chauhan
7b29dc7208
[Fix] Monthly Salary Register Fix
2016-12-30 12:36:00 +05:30
Nabin Hait
9646be1d5d
[fix] Make Journal Entry against SO
2016-12-30 11:14:41 +05:30
Rushabh Mehta
a8326de4d0
[fix] on_update in item.py
2016-12-30 06:17:45 +05:30
Rushabh Mehta
2097ccfaea
[fix] item_group.py #7358
2016-12-30 06:09:41 +05:30
Manas Solanki
5c82e9ef8b
Fetching the item details from the reference doctype in quality inspection
...
Error Report [2016-12-29]
2016-12-29 18:01:25 +05:30
Scheercuzy
f483582957
Hyperlink Item Image
...
added hyperlink on item image
2016-12-29 18:56:44 +06:30
Nabin Hait
f327a58b7f
Merge branch 'master' into develop
2016-12-29 11:04:05 +05:30
Nabin Hait
3d98d23e22
bumped to version 7.2.3
2016-12-29 11:34:05 +06:00
Nabin Hait
11bde0ba14
Patch fixed
2016-12-29 10:58:05 +05:30
Nabin Hait
2469f247df
Merge pull request #7341 from StrellaGroup/develop
...
Fixed spelling errors on Production Planning Tool and manual.
2016-12-28 17:12:01 +05:30
Neil Trini Lasrado
986927ca98
Added Guardian to school module
2016-12-28 16:15:35 +05:30
Muhammad Huzaifah Bin Ismail
465da8ce09
Fixed spelling errors on Production Planning Tool and manual.
2016-12-28 18:15:45 +08:00
Rohit Waghchaure
bef185c404
restrict user to edit the rate in the POS
2016-12-28 15:16:49 +05:30
Neil Trini Lasrado
0152516ba4
[Fix] Student Monthly Attendance Sheet
2016-12-28 13:01:14 +05:30
Rushabh Mehta
94c4d7014d
[fix] item_name in stock reco
2016-12-28 06:56:09 +05:30
Rohit Waghchaure
249bc6167f
fix company issue
2016-12-28 00:20:08 +05:30
Rohit Waghchaure
aa9b8603b9
added paid amount in print format
2016-12-27 17:43:23 +05:30
Rohit Waghchaure
fe7a5b305f
create customer from POS
2016-12-27 17:31:32 +05:30
Rohit Waghchaure
8c9c9cfc5f
When a new company is made, cash account should be automatically set for Mode of Payment
2016-12-27 17:31:32 +05:30
Rushabh Mehta
5cb1b6bf3f
[minor] translation fix
2016-12-27 16:30:20 +05:30
Nabin Hait
3bcf9b5e70
Fixed merge conflict
2016-12-27 14:30:17 +05:30
Nabin Hait
89c8b4d6ae
bumped to version 7.2.2
2016-12-27 14:57:19 +06:00
Rushabh Mehta
174c3478a1
[fix] item variants not directly shown in website due to route clash
2016-12-27 12:30:30 +05:30
Rushabh Mehta
512b85e040
[minor] replace autocomplete with awesomplete
2016-12-27 12:14:37 +05:30
Rushabh Mehta
e60c2c7b7a
[minor] dashboard cleanups
2016-12-27 12:14:37 +05:30
Neil Trini Lasrado
22239ac610
Improved Student Dashboard
2016-12-26 17:14:16 +05:30
Nabin Hait
88817b40df
Merge pull request #7284 from mntechnique/develop
...
Report : Batch Item Expiry Status
2016-12-26 16:10:46 +05:30
Nabin Hait
4573029a5e
Merge pull request #7292 from frappe/bcornwellmott-patch-1
...
Add hours to calendar labels
2016-12-26 16:09:11 +05:30
Nabin Hait
0631d516ce
Merge pull request #7290 from netchampfaris/pos-item-area-scroll
...
pos item area scrollable
2016-12-26 16:07:38 +05:30
Nabin Hait
c2690425e3
Merge pull request #7310 from bhupennewalkar1337/hotfix
...
Fix #7202 unchecking pos will reflect automatically
2016-12-26 16:07:19 +05:30
Nabin Hait
488ad54bbc
Merge pull request #7280 from neilLasrado/leave
...
Added mark as present to student leave application
2016-12-26 16:06:44 +05:30
Neil Trini Lasrado
df4b9ab630
Optimised code for Student Monthly Attendance Report
2016-12-26 15:40:01 +05:30
Nabin Hait
7b2177a544
[test] Fixed test cases for LCV
2016-12-26 15:31:05 +05:30
Neil Trini Lasrado
94f42ea145
Added from date and to date to student leave application
2016-12-26 12:09:27 +05:30
Neil Trini Lasrado
9a7cb6ce92
Added mark as present to student leave application
2016-12-26 12:09:27 +05:30
Nabin Hait
61a190dd69
Merge branch 'master' into develop
2016-12-24 11:01:26 +05:30
Nabin Hait
8b3e39ed27
bumped to version 7.2.1
2016-12-24 11:31:25 +06:00
Nabin Hait
1d90b41aea
[fix] Fetch serial nos on change of Warehouse
2016-12-24 10:42:23 +05:30
bhupen
bcf63a2a8f
unchecking pos will reflect automatically
2016-12-23 18:00:18 +05:30
Nabin Hait
ba95fc4fa0
Fixed version conflict
2016-12-23 17:44:05 +05:30
Nabin Hait
58291c77e9
Fixed version conflict
2016-12-23 17:43:42 +05:30
Nabin Hait
90c57e5ffd
bumped to version 7.2.0
2016-12-23 18:13:13 +06:00
Nabin Hait
aad8527ff3
Update __init__.py
2016-12-23 17:00:17 +05:30
Nabin Hait
c2d66bdfb2
Merge branch 'master' into develop
2016-12-23 16:45:09 +05:30
Nabin Hait
11c5da1d8c
bumped to version 7.1.29
2016-12-23 17:15:07 +06:00
Nabin Hait
aa2d949f61
Merge pull request #7295 from bhupennewalkar1337/lcv
...
Fix#3717 entering amount in lcv is enabled
2016-12-23 15:49:07 +05:30
Nabin Hait
1e1e28b0ae
Update landed_cost_voucher.js
2016-12-23 15:48:57 +05:30
Nabin Hait
06c6628481
Merge pull request #7279 from KanchanChauhan/automate-user-creation
...
Create User button in Employee if no User ID selected
2016-12-23 15:31:55 +05:30
Nabin Hait
0177c02c0f
Merge pull request #7286 from rohitwaghchaure/pos_letter_head_issue
...
minor fix
2016-12-23 15:19:32 +05:30
Nabin Hait
0e9f16f59d
Merge pull request #7289 from rohitwaghchaure/enhancement_timesheet_v7_2
...
[Enhancement] Setting to maintain the work hours and bill hours same on the timesheet
2016-12-23 15:18:28 +05:30
Nabin Hait
6104fdc579
Update repost_stock_for_deleted_bins_for_merging_items.py
2016-12-22 17:49:46 +05:30
bhupen
a83de5eac1
applicabe charges field is now editable
2016-12-22 16:24:14 +05:30
bhupen
914ae77a22
Limit instead of Allowance in stock settings
2016-12-22 16:24:14 +05:30
bhupen
5bb85e7a95
partially orderd status will be shown in material request
2016-12-22 16:24:14 +05:30
bcornwellmott
e549984a42
Grabs title from SQL
...
Gets a concatenated title label for the Calendar event that includes the number of hours
2016-12-21 12:36:45 -08:00
bcornwellmott
3385bd4921
Add hours to label in calendar view
...
Adds a label for the number of hours to each calendar event
2016-12-21 12:33:32 -08:00
Rohit Waghchaure
1af1a43616
[Enhancement] Setting to maintain the work hours and bill hours same on the timesheet
2016-12-21 19:19:16 +05:30
Faris Ansari
0822e41f96
pos item area scrollable
2016-12-21 18:17:00 +05:30
Revant Nandgaonkar
1c00b1fb21
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2016-12-21 18:01:35 +05:30
Rohit Waghchaure
dd58d537d5
[Fix] POS issue for serialized items
2016-12-21 17:55:40 +05:30
Rushabh Mehta
0632ee3da9
Merge branch 'v7.2.0-beta' into develop
2016-12-21 17:31:09 +05:30
Rushabh Mehta
c6bd7ade2f
[fix] inclusive tax + total bug and cleanup in stock entry get_uom, fixes #7253
2016-12-21 17:30:29 +05:30
Kanchan Chauhan
58ed0c6efa
Create User button in Employee if no User ID selected
2016-12-21 16:18:59 +05:30
Revant Nandgaonkar
00e65cb70b
Report - Batch Item Expiry Status
...
Changed column name `Expiry Status` to `Expiry (In Days)`
Changed column type from Data to Int
2016-12-21 14:21:53 +05:30
Rohit Waghchaure
9df946e96c
[Fix] Warehouse is mandatory for packing materials on the sales invoice
2016-12-21 13:27:54 +05:30
Rohit Waghchaure
d567e57f82
minor fix
2016-12-21 13:18:36 +05:30
Revant Nandgaonkar
c30ae28422
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2016-12-21 12:52:23 +05:30
Revant Nandgaonkar
0766d3e67e
Report : Batch Item Expiry Status
...
Select From Date and To Date
Lists Items about to expire or already expired
Expiry Status column shows number of days in which item/batch will expire
2016-12-21 12:32:12 +05:30
Nabin Hait
e7939fd87b
Merge branch 'master' into develop
2016-12-21 12:18:38 +05:30
Nabin Hait
399e414909
bumped to version 7.1.28
2016-12-21 12:48:37 +06:00
Nabin Hait
b3943cb53a
Update repost_stock_for_deleted_bins_for_merging_items.py
2016-12-21 12:04:39 +05:30
Nabin Hait
2b8aafb08d
Merge pull request #7276 from neilLasrado/develop
...
Allow Data Import for Student Guardian
2016-12-21 11:17:13 +05:30
rohitwaghchaure
34e820d02d
[Enhancement] Added letter head for the report ( #7250 )
2016-12-20 16:54:24 +05:30
Rushabh Mehta
17d05b4fd7
Merge branch 'v7.2.0-beta' into develop
2016-12-20 12:59:29 +05:30
Rushabh Mehta
5a3f421453
[fix] expand all for treeview, fixes https://github.com/frappe/frappe/issues/2474
2016-12-20 12:59:09 +05:30
Rushabh Mehta
89af62a680
Merge branch 'v7.2.0-beta' into develop
2016-12-20 12:21:03 +05:30
Rushabh Mehta
2a86c32267
[minor] [patch] remove icon if present, fixes #6949
2016-12-20 12:20:39 +05:30
Neil Trini Lasrado
8979e1c7a5
Allow Data Import for Student Guardian
2016-12-20 11:53:52 +05:30
Nabin Hait
f573d43b90
fixed version conflict
2016-12-20 11:40:15 +05:30
Nabin Hait
1cc2d7403b
bumped to version 7.1.27
2016-12-20 12:09:46 +06:00
Nabin Hait
778c1a022d
Merge pull request #7236 from rohitwaghchaure/item_variant_issue
...
[Fix] Timeout error in item attribute validation
2016-12-20 11:31:50 +05:30
Rushabh Mehta
f944fb9e46
Merge branch 'v7.2.0-beta' into develop
2016-12-19 17:06:56 +05:30
Rushabh Mehta
827588adf2
[minor] fixes to job opening
2016-12-19 17:06:26 +05:30
Rushabh Mehta
4c210527b2
[fix] https for SMS gateway, now using requests fixes #5404
2016-12-19 16:22:34 +05:30
Rushabh Mehta
688f2284af
[minor] [patch]
2016-12-19 13:15:52 +05:30
Rushabh Mehta
c3d8479443
[minor] allow website user to be selected as employee
2016-12-19 12:32:11 +05:30
Rushabh Mehta
99c814b360
[fix] paging for products (support)
2016-12-19 11:55:10 +05:30
Rushabh Mehta
43d81063f8
Delete zh-tw.csv
2016-12-19 11:52:09 +05:30
Nabin Hait
7feef1f158
test case fixed
2016-12-16 16:50:03 +05:30
Nabin Hait
4d76d27dd2
translations
2016-12-16 16:18:45 +05:30
Nabin Hait
3fe99559ef
Fixed negative stock validation message for translation and fixed test cases
2016-12-16 15:30:43 +05:30
Rohit Waghchaure
6500ef404d
[Fix] Timeout error in item attribute validation
2016-12-16 13:35:50 +05:30
Rushabh Mehta
9277f3250d
[minor] partiall ordered in material request #6858
2016-12-16 12:36:50 +05:30
Rohit Waghchaure
61fb496be6
[Fix] Test case
2016-12-16 12:19:56 +05:30
Nabin Hait
43594b245c
changed version to beta
2016-12-15 19:37:53 +05:30
Nabin Hait
d25db23fdb
[translations]
2016-12-15 18:33:39 +05:30
Nabin Hait
565844cfac
Change log for v7.2.0
2016-12-15 17:49:31 +05:30
Nabin Hait
6eda07e445
Fixed merge conflict
2016-12-15 16:35:58 +05:30
Nabin Hait
8a321406b2
bumped to version 7.1.26
2016-12-15 17:05:32 +06:00
Nabin Hait
f89c96c7a3
Merge branch 'standard_filters' into develop
2016-12-15 14:57:41 +05:30
Nabin Hait
f02f1bb0c7
Added standard filters
2016-12-15 14:57:20 +05:30
Nabin Hait
8c61f343b3
Validate negative stock on delivery while missing valuation rate for booking expenses
2016-12-15 13:46:03 +05:30
Nabin Hait
0c9c6c9608
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2016-12-15 11:52:59 +05:30
Nabin Hait
f49bbe1142
Cleanup of lead and opportunity status updating logic
2016-12-15 11:51:54 +05:30
Rushabh Mehta
01fab2ae1c
[minor] fix salary slip test
2016-12-15 11:43:29 +05:30
Nabin Hait
6a1c0665bc
Merge pull request #7227 from nabinhait/country_coa
...
Chart of accounts for few countries, added test cases for each country
2016-12-15 11:31:07 +05:30
Nabin Hait
a107302224
Merge pull request #7221 from bhupennewalkar1337/production
...
Fix#7085 Issue Items Against Production Order
2016-12-15 11:30:31 +05:30
Rushabh Mehta
e9d9b8e6f0
[fix] demo and process payroll for demo ( #7224 )
...
* [fix] demo and process payroll for demo
* [fix] set payroll dates
2016-12-15 11:27:35 +05:30
Nabin Hait
1ae8e2c8fa
Revert "Revert "email cc test fixes for frappe/frappe#2441"" ( #7232 )
2016-12-15 11:27:02 +05:30
Nabin Hait
e3edfe2b12
Removed quick entry for tax rule
2016-12-14 18:44:27 +05:30
Nabin Hait
a756d64fca
Chart of accounts for some countries, added test cases for each country
2016-12-14 18:40:29 +05:30
Rushabh Mehta
9b049ee154
Revert "[Fixes]Payroll Fixes" ( #7225 )
2016-12-14 18:25:11 +05:30
bhupen
9e146669d3
Issue Items Against Production Order
2016-12-14 17:40:32 +05:30
Nabin Hait
42b6e37d15
Merge pull request #7216 from KanchanChauhan/salary-fixes
...
[Fixes]Payroll Fixes
2016-12-14 16:20:08 +05:30
Kanchan Chauhan
c292dd7213
[Fixes]Payroll Fixes
2016-12-14 15:50:54 +05:30
Nabin Hait
a9ecc0b700
Merge branch 'master' into develop
2016-12-14 14:33:06 +05:30
Nabin Hait
673d43cc8e
bumped to version 7.1.25
2016-12-14 15:03:06 +06:00
Rohit Waghchaure
39712b5e1d
[Fix] Pricing rule issue
2016-12-14 14:12:20 +05:30
Nabin Hait
cdb38de6af
Merge pull request #7209 from bhupennewalkar1337/mendatory
...
[Fix] No exception will be thrown when working hours field is kept blank in workstation #5166
2016-12-14 13:03:17 +05:30
Nabin Hait
db4cfeed0e
Merge pull request #7211 from frappe/shachiTakalkar-patch-1
...
Update adding-margin.md
2016-12-14 12:54:58 +05:30
Nabin Hait
a933713f9d
Merge pull request #7208 from OluyomiKay/cashacct_bankreconciliation_dev
...
erpnext Include CashAccountType (eg. PettyCash) in BankReconciliation
2016-12-14 12:54:04 +05:30
Nabin Hait
aba470f1e6
Merge pull request #7206 from strixaluco/develop
...
[docs] mention UID in LDAP instruction
2016-12-14 12:53:33 +05:30
Nabin Hait
3a8ea2a3bb
Merge pull request #7170 from rohitwaghchaure/pos_enhancement_v7_2
...
[POS] Provision to delete the offline records
2016-12-14 12:52:28 +05:30
Nabin Hait
36f5471bab
Merge pull request #6855 from neilLasrado/training
...
[new Feature] Added Training Module
2016-12-14 12:51:51 +05:30
Nabin Hait
44cdbbe346
Merge pull request #7203 from KanchanChauhan/employee-permissions
...
[Minor] Read permissions to Employee on Activity Type and Appraisal Template
2016-12-14 12:50:54 +05:30
Shachi Takalkar
41d4e33682
Update adding-margin.md
2016-12-14 12:41:07 +05:30
Neil Trini Lasrado
6a2fa29b4a
Fixes for training Module
2016-12-14 12:08:28 +05:30
bhupen
52b3924006
mendatory hours field
2016-12-14 11:32:23 +05:30
OluyomiKay
8f8fd39855
erpnext Include Cash Account Type (eg. Petty Cash) in Bank Reconciliation
2016-12-14 13:25:58 +08:00
Neil Trini Lasrado
fef568ecfa
Documentation for Training Module
2016-12-13 16:48:50 +05:30
Neil Trini Lasrado
984ee372e8
[new Feature] Added Training Module
2016-12-13 15:42:12 +05:30
bhupen
b42dc5a899
mendatory hours field
2016-12-13 15:25:53 +05:30
strixaluco
757d127844
[docs] mention UID in LDAP instruction
2016-12-13 17:54:41 +08:00
Nabin Hait
80cea9795e
Address naming if multiple address for same type
2016-12-13 14:50:35 +05:30
Nabin Hait
201af80706
Fixed merge conflict
2016-12-13 14:30:32 +05:30
Nabin Hait
9d56d598bf
bumped to version 7.1.24
2016-12-13 14:52:15 +06:00
Kanchan Chauhan
b79aa1d091
[Minor] Read permissions to Employee on Activity Type and Appraisal Template
2016-12-13 14:16:57 +05:30
Nabin Hait
8ecc14b7bd
Revert "email cc test fixes for frappe/frappe#2441"
2016-12-13 14:11:49 +05:30
Nabin Hait
23165ce0b4
Merge pull request #7185 from KanchanChauhan/salary-test-cases
...
[Fix] Salary Slip test cases fix
2016-12-13 12:40:19 +05:30
Kanchan Chauhan
d917b66a31
[Fix] Salary Slip test cases fix
2016-12-13 12:12:49 +05:30
Nabin Hait
ee877fd631
Merge pull request #7199 from RobertSchouten/email_cc_dev
...
email cc test fixes for frappe/frappe#2441
2016-12-13 11:31:06 +05:30
Nabin Hait
784f6cc31a
Merge pull request #7181 from KanchanChauhan/sales-person-status
...
Added "Enabled" to Sales Person
2016-12-13 11:28:36 +05:30
Nabin Hait
346a6a5d84
Update set_sales_person_status.py
2016-12-13 11:27:46 +05:30
Nabin Hait
82ce67d49a
Merge pull request #7190 from KanchanChauhan/jinja-in-tc
...
Jinja template in Terms and Conditions
2016-12-13 11:25:07 +05:30
Nabin Hait
18d6dc0459
Merge pull request #7193 from KanchanChauhan/get-project-task
...
Show only Project tasks in depends on tasks
2016-12-13 11:24:11 +05:30
Nabin Hait
c5869a00df
Merge pull request #7194 from rohitwaghchaure/pricing_rule_issue_v7_1
...
[Fix] Ignore pricing rule not removed the discount percentage
2016-12-13 11:22:49 +05:30
Nabin Hait
9a1a4cd0ac
Fixed test cases for item / warehouse renaming
2016-12-13 10:46:50 +05:30
Rohit Waghchaure
2976e56d23
[Fix] Ignore pricing rule not removed the discount percentage
2016-12-13 10:28:27 +05:30
robert schouten
3d22eb1d59
email cc test fixes for frappe/frappe#2441
2016-12-13 11:32:09 +08:00
Kanchan Chauhan
f0b0db444d
Added Is Active to Sales Person
2016-12-12 19:12:41 +05:30
Kanchan Chauhan
a72841e5e5
Show only Project tasks in depends on tasks
2016-12-12 18:33:46 +05:30
Nabin Hait
da3a9e255d
Changed fieldtype of opening stock from Int to Float
2016-12-12 18:22:15 +05:30
Kanchan Chauhan
b642625ed2
Jinja template in Terms and Conditions
2016-12-12 17:34:30 +05:30
Nabin Hait
f67799197d
Merge pull request #7189 from nabinhait/fix_10111
...
Rename and merging of Item and Warehouse
2016-12-12 17:27:38 +05:30
Nabin Hait
f09c6679c7
Merge pull request #7187 from rohitwaghchaure/budget_report_issue
...
[Fix] Budget variance report based on cost center/project
2016-12-12 17:25:44 +05:30
Nabin Hait
37104b6bb1
Merge pull request #7184 from rohitwaghchaure/dropship_po_issue
...
[Fix] Unable to purchase item in the company warehouse if dropship has enabled
2016-12-12 17:24:48 +05:30
Rohit Waghchaure
9f2cc382a8
[POS] Provision to delete the offline records
2016-12-12 17:15:47 +05:30
Nabin Hait
fb1fb83b8c
[tests] Test cases for Item and Warehouse renaming and merging
2016-12-12 17:01:24 +05:30
Rohit Waghchaure
f4074c2029
[Fix] Budget variance report
2016-12-12 16:48:14 +05:30
Nabin Hait
3ef63bef02
Rename and merging of Item and Warehouse and patch to fix deleted bins
2016-12-12 15:37:52 +05:30
Nabin Hait
142aab79bf
Fieldtype of payment url should be Small Text
2016-12-12 15:37:52 +05:30
Nabin Hait
0fa0af18cc
Merge pull request #7175 from neilLasrado/develop
...
Student Attendance Tool
2016-12-12 15:03:59 +05:30
Rohit Waghchaure
c858d52ce7
[Fix] Unable to purchase item in the company warehouse if dropship has enabled
2016-12-12 13:06:06 +05:30
Rohit Waghchaure
5664f8553e
[Fix] Item group missing in the POS profile
2016-12-12 12:28:07 +05:30
Neil Trini Lasrado
eccbf43235
Renamed Student Batch Attendance Tool to Student Attendance Tool
...
Merged code for Student Attendance against Course Schedule and Student Batch
Student Attendance Tool now shows marked student attendance as well.
Fixed validation login in Student Attendance for duplicate Student Attendance Record validation"
2016-12-09 17:41:09 +05:30
Saurabh
940084ed59
[minor][fix] show tax rate if account type is tax
2016-12-09 17:38:36 +05:30
Rushabh Mehta
81af229466
[minor] google analytics id in docs and minor fixes to web forms
2016-12-09 17:29:36 +05:30
Nabin Hait
58667ab123
Fixed merge conflict
2016-12-09 15:49:24 +05:30
Nabin Hait
10de98c0be
bumped to version 7.1.23
2016-12-09 16:15:45 +06:00
Nabin Hait
00ae31bd1c
Merge pull request #7172 from nabinhait/hotfix
...
Issue fixed in Quality Inspection, P&L period and purchase register
2016-12-09 15:44:05 +05:30
Nabin Hait
6bfdd63ec8
Merge pull request #7171 from rohitwaghchaure/payment_entry_issue
...
[Fix] Payment entry showing wrong invoice amount
2016-12-09 15:11:38 +05:30
Nabin Hait
b00df641e0
Fixed period end date if year starts in the middle of the month
2016-12-09 15:09:11 +05:30
Nabin Hait
76a8508d2b
Unlink Quality Inspection from PR while cancelling QI
2016-12-09 15:09:11 +05:30
Nabin Hait
43df804176
Fixed renamed fieldname
2016-12-09 15:09:11 +05:30
Rohit Waghchaure
e505067887
[Fix] Payment entry showing wrong invoice amount
2016-12-09 12:55:29 +05:30
Nabin Hait
abd5a92bcc
Merge pull request #7162 from nabinhait/manqala-exchange_rate_modifications1
...
Exchange rate base on date
2016-12-09 12:34:15 +05:30
Nabin Hait
a0fc404eb8
Merge pull request #7164 from KanchanChauhan/quoted-item-comparison-report-fix
...
[Fix] Quoted Item Comparison
2016-12-09 12:18:06 +05:30
Nabin Hait
8e885163a3
Update quoted_item_comparison.py
2016-12-09 12:17:45 +05:30
Nabin Hait
ad4f1c7fd1
date is optional in get_exchange_rate
2016-12-09 12:14:47 +05:30
Nabin Hait
d249c76ce0
Merge pull request #7165 from KanchanChauhan/salary-component-type-in-new-signups
...
[Minor]Added type to Salary Components
2016-12-09 11:50:43 +05:30
Viet Pham
ddb856377c
Fix patch update_status_of_po_so.py caused error: Column 'per_billed' cannot be null
2016-12-08 20:02:39 +07:00
Kanchan Chauhan
13f19993c5
[Minor]Added type to Salary Components
2016-12-08 17:50:15 +05:30
Kanchan Chauhan
5c031a3512
[Fix] Quoted Item Comparison
2016-12-08 17:29:04 +05:30
Kanchan Chauhan
0ece9e0e2e
[Fix] Salary Slip Test cases fix
2016-12-08 17:02:36 +05:30
Nabin Hait
352d95344e
Set exchange rate on change of date for Journal/Payment Entry
2016-12-08 16:06:47 +05:30
Nabin Hait
aa0d174d3d
Replaced spaces with tabs
2016-12-08 15:44:16 +05:30
Nabin Hait
3113f00c46
Replaced spaces with tabs
2016-12-08 15:42:44 +05:30
Nabin Hait
288a18e0cc
Fixes and patch for Currency Exchange based on date
2016-12-08 15:36:23 +05:30
Nabin Hait
b267a6c90e
Merge branch 'develop' of https://github.com/frappe/erpnext into manqala-exchange_rate_modifications1
2016-12-08 14:45:12 +05:30
Nabin Hait
87d70279c6
get exchange rate on change of date
2016-12-08 14:43:11 +05:30
Nabin Hait
32e5b7af20
Update set_budget_against_as_cost_center.py
2016-12-08 14:42:04 +05:30
Nabin Hait
1cc55fbbcb
Fixed merge conflict
2016-12-08 14:09:23 +05:30
Nabin Hait
72c5aec68b
Merge pull request #7094 from manassolanki/budget
...
[Enhancement] Budget Against Project #7036
2016-12-08 13:52:33 +05:30
Nabin Hait
f5460e9e6f
Merge pull request #6846 from KanchanChauhan/payroll-updates
...
Weekly, Fortnightly, Bimonthly and Monthly payroll frequency
2016-12-08 13:51:55 +05:30
Nabin Hait
ded059b253
[fix][tests] Fetching serial nos via get item details
2016-12-08 13:20:43 +05:30
Nabin Hait
1b9caf90dd
Merge branch 'master' into develop
2016-12-08 12:33:54 +05:30
Nabin Hait
7b513891e3
bumped to version 7.1.22
2016-12-08 13:03:53 +06:00
Kanchan Chauhan
f7b25cbb6b
[WIP] Payroll Updates
2016-12-08 12:20:20 +05:30
Manas Solanki
482fa672c2
[Fix] Patch for budget_against
2016-12-08 12:16:29 +05:30
Rohit Waghchaure
86ed030b5c
minor issue
2016-12-07 19:17:01 +05:30
Rohit Waghchaure
0327b35b5e
[fix] timesheet datetime issue
2016-12-07 18:32:36 +05:30
Manas Solanki
2e0fbdeebe
[Fix] Test Case
...
- Previous test case fixed
- Additional test case for project against budget
2016-12-07 18:17:26 +05:30
Manas Solanki
17faa794bf
[Fix] More optimized code
2016-12-07 18:17:26 +05:30
Manas Solanki
5bd4d8a932
[Fix] Budget against Projects
...
- Test case fixed
- Either cost center or project is mandatory
2016-12-07 18:17:26 +05:30
Manas Solanki
1fa1fd7482
[Enhancement] Budget against Project
2016-12-07 18:17:26 +05:30
Rushabh Mehta
b78fc37ce9
[minor] Add button to add help article from Issue #7132 ( #7154 )
2016-12-07 14:41:23 +05:30
James Robertson
e4b9473f83
Fixes erpnext issue 6891 ( #7128 )
...
* Fixes erpnext issue 6891
Updated all 4 items listed on the issue. Removed old out of date image
files and created new ones. Fixed broken links.
* Update to Pull Request #7128
Changes to images to comply with guidelines.
2016-12-07 12:14:51 +05:30
Rushabh Mehta
2167ff589c
[minor] update font awesome icons
2016-12-07 11:09:02 +05:30
Nabin Hait
5c18bd9b61
Fixed merge conflict
2016-12-06 16:16:58 +05:30
Nabin Hait
bc2deafcf9
bumped to version 7.1.21
2016-12-06 16:44:44 +06:00
Nabin Hait
45fda8a257
Merge pull request #7149 from KanchanChauhan/salary-slip-validation-in-leave
...
[Minor] Validation fixes in Leave Application and Monthly Salary Register Fix for other laguages
2016-12-06 16:01:38 +05:30
Nabin Hait
67d226f491
Merge pull request #7127 from KanchanChauhan/salary-slip-fix
...
[Fix] lwp issue fixed for salary slip without salary structure
2016-12-06 15:48:47 +05:30
Nabin Hait
cb3f44716a
Merge pull request #7139 from rohitwaghchaure/customer_billing_amount_issue
...
[Fix] Currecny symbol for customer's total annual billing, total unpaid amount
2016-12-06 15:42:37 +05:30
Nabin Hait
9313a7408c
Merge pull request #7144 from rohitwaghchaure/report_builder_total_row_issue
...
[Enhancement] Total row added for report builder
2016-12-06 15:42:19 +05:30
Nabin Hait
e644ca8992
Merge pull request #7146 from RobertSchouten/digest_cache_dev
...
[fix] email digest cache by frequency
2016-12-06 15:41:33 +05:30
Nabin Hait
cacfb6839f
Merge pull request #7138 from rohitwaghchaure/so_po_status_issue
...
[Fix] Status of sales order and purchase order
2016-12-06 15:40:57 +05:30
Kanchan Chauhan
dc80b35104
[Minor] Apply Salary Slip validation only if it is submitted
2016-12-06 15:37:24 +05:30
robert schouten
7f72cd0f97
[fix] email digest cache by frequency
2016-12-06 08:51:40 +08:00
Rohit Waghchaure
6f6a533d66
[fix] salary slip working days
2016-12-05 23:33:02 +05:30
Rohit Waghchaure
36a01d3464
[Enhancement] Total row added for report builder
2016-12-05 18:59:59 +05:30
Rohit Waghchaure
bcc6ea450a
[fix] test cases for customer credit
2016-12-05 18:32:57 +05:30
Neil Trini Lasrado
f5c2cf4b5c
Updated schools.py in Config
2016-12-05 17:53:41 +05:30
Rohit Waghchaure
c857f37f3a
[fix] currecny symbol for customer's total annual billing, total unpaid amount
2016-12-05 17:44:06 +05:30
Neil Trini Lasrado
9e7ad6a630
Updated schools.py in Config
2016-12-05 17:28:07 +05:30
Nabin Hait
3f1c50a483
Merge pull request #6920 from KanchanChauhan/delivery-note-serial-no-fifo
...
[Fix] Fetch Serial No by default for Delivery Note Item
2016-12-05 16:51:42 +05:30
Nabin Hait
4306cc80d0
removed print
2016-12-05 16:51:30 +05:30
Rohit Waghchaure
82fa27c36f
[Fix] Status of sales order and purchase order
2016-12-05 16:32:23 +05:30
Rushabh Mehta
86f8ab95f6
[minor] font-awesome fixes
2016-12-05 15:02:24 +05:30
Nabin Hait
12a396ef25
Merge pull request #7107 from RobertSchouten/timesheetdates
...
calc timesheet dates on validate not just submit
2016-12-05 14:23:21 +05:30
Rushabh Mehta
323c06ebbf
[minor] rename icons as per FontAwesome 4 ( #7136 )
2016-12-05 14:17:26 +05:30
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
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
c9b6a07732
[fix] Remove recurring id on amendment only if it is same as amended_from
2016-11-16 18:43:44 +05:30
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
Nabin Hait
821331b3c0
Merge pull request #6712 from neilLasrado/develop
...
Allow rename of student doctype
2016-10-26 12:32:20 +05:30
Neil Trini Lasrado
a3f2a47020
Allow rename of student doctype
2016-10-26 12:24:27 +05:30
Revant Nandgaonkar
0bb92ab7a0
[docs] Email and Phone validation on Custom Fields ( #6703 )
2016-10-26 11:05:12 +05:30
bcornwellmott
30df3cd3dc
Add description, stock UOM and Min Order Qty to MRs
...
The material requests currently do not include descriptions, stock UOM and Min Order Quantities. This fix adds them. This is especially critical in the CSV export, which currently is missing all this info.
2016-10-25 14:21:26 -07:00
shreyas
99e063f831
[Fix] Make purchase order item reqd_date modifiable after submit
2016-10-25 12:44:27 +05:30
Nabin Hait
ffd2fc5101
[fix] Validate if warehouse is not linked to any account
2016-10-24 18:54:07 +05:30
Nabin Hait
d662502f3c
[fix] Validate if warehouse is not linked to any account
2016-10-24 18:17:57 +05:30
Nabin Hait
c00b17a6e0
Update project.json
2016-10-24 17:53:06 +05:30
Nabin Hait
fe86debf5d
[fix] Duplicate salary components
2016-10-24 17:47:18 +05:30
Nabin Hait
0f9d60099d
Merge pull request #6692 from neilLasrado/develop
...
Typo fix
2016-10-24 16:46:27 +05:30
Nabin Hait
a02fb1541a
Merge pull request #6553 from saurabh6790/scrap_management
...
Scrap management
2016-10-24 16:46:13 +05:30
Nabin Hait
1f3771cdf1
Merge pull request #6687 from KanchanChauhan/lead-changes
...
Contact by and contact date validations
2016-10-24 16:44:08 +05:30
Rohit Waghchaure
43b508089e
[Fix] Pricing rule discount issue
2016-10-24 16:16:24 +05:30
Neil Trini Lasrado
5ddd7acdbd
Typo fix
2016-10-24 15:25:47 +05:30
Saurabh
8c3764a6ef
test case for scrap item
2016-10-24 13:55:36 +05:30
Saurabh
4ae4eb0eb9
added get_scrap_items param to get_bom_items_as_dict
2016-10-24 13:55:36 +05:30
Saurabh
5a2fa8aac7
[enhance] scrap management
2016-10-24 13:55:36 +05:30
Saurabh
464c27e189
[feature] scrap management
2016-10-24 13:55:36 +05:30
Kanchan Chauhan
a1cedbc7b2
Contact by and contact date validations
2016-10-24 13:51:13 +05:30
Umair Sayed
a56775ce9a
Update domainify.py
2016-10-24 13:00:17 +05:30
Nabin Hait
f430d73daf
Merge pull request #6662 from PawanMeh/fixes_6363
...
[fix] #6363
2016-10-24 11:56:43 +05:30
Nabin Hait
00b3443b61
Merge pull request #6653 from shreyasp/cust-credit-limit
...
[Minor] Do not allow change in credit limit
2016-10-24 11:55:24 +05:30
Nabin Hait
a221f7ec5d
Update test_customer.py
2016-10-24 11:27:56 +05:30
Pawan Mehta
297e725727
Update project.json
2016-10-24 11:24:38 +05:30
Nabin Hait
df366a6e9c
Merge pull request #6683 from KanchanChauhan/multiple-active-salary-slio
...
Warning if there are mutliple active salary structures
2016-10-24 11:23:57 +05:30
Mainul Islam
a964db7821
Add multiple emoloyee in salary structure ( #6621 )
...
* Add multiple emoloyee in salary structure
* Added in Menu
* Remove Default Value from Company field
* Change Section Label
* Added Button in Salary Structure and set route_options
* Remove Single Doctype
* Add Dialog for Employee Add
* View Employee and Check or Uncheck
* Complete Multiple Employee Add in Employee Table and Neve Entry in Duplicate in Employees
* Employees View Section in Dialog Added Employe Name and set Employee Id as Title
* Delete SIngle Doctype
* Chagne to
* Remove checkbox
* Remove add button and set primary button
2016-10-24 11:22:00 +05:30
Nabin Hait
1db35ce79a
Merge pull request #6651 from shreyasp/del-company-txn
...
Delete Communications while Deleting Company Transactions
2016-10-24 11:20:29 +05:30
Nabin Hait
6ef8ede280
Merge pull request #6675 from KanchanChauhan/holiday-in-lwp-salaryslip
...
include_holiday being taken into consideration while calculating lwp
2016-10-24 11:19:43 +05:30
Nabin Hait
5ced4dfe34
Merge pull request #6673 from KanchanChauhan/max-leave-days-in-leave-application-hotfix
...
[Fix] leave application days should be less than max days leave allowed
2016-10-24 11:18:44 +05:30
pawan
03a77b1b65
[fix] 6363
2016-10-24 11:18:29 +05:30
pawan
46ead70be8
[fix] fixes_6363
2016-10-24 11:18:29 +05:30
pawan
9a43a2a97b
[fix] #6363
2016-10-24 11:18:29 +05:30
pawan
28ad58905d
[fix] #6363
2016-10-24 11:18:29 +05:30
pawan
8d187def12
[fix] #6363
2016-10-24 11:18:29 +05:30
Nabin Hait
8918dcf54e
Merge pull request #6678 from KanchanChauhan/total-leave-days-updated
...
Total leave days gets updated on date change
2016-10-24 11:13:31 +05:30
Nabin Hait
988f850fe2
Merge pull request #6682 from KanchanChauhan/makebankentry-button-fix
...
[Fix] Make Bank Entry button depends_on fixed
2016-10-24 11:12:17 +05:30
shreyas
f09929ea92
[Fix] Updated test cases to handle negative or zero outstanding amount against customer
2016-10-24 10:35:30 +05:30
shreyas
17f43da2a6
[Test] Added test cases to evaluate customer credit limit
2016-10-24 10:21:05 +05:30
shreyas
e05656963a
[Minor] Do not allow change in credit limit
2016-10-24 10:21:04 +05:30
shreyas
c48eb45410
[Fix] Use company_fieldname as parameter to the query
2016-10-24 10:18:28 +05:30
shreyas
0f4cb55c3c
[Fix] Delete communications before deleting the docs
2016-10-24 10:04:26 +05:30
shreyas
54d8590064
[Fix] Delete communications when user deletes company transactions
2016-10-24 10:04:26 +05:30
Kanchan Chauhan
55106ab66b
Warehouse based on selected Company
2016-10-22 21:42:28 +05:30
Kanchan Chauhan
29ce0aab28
Warning if there are mutliple active salary structures
2016-10-22 20:48:44 +05:30
Kanchan Chauhan
c4c966691f
[Fix] Make Bank Entry button depends_on fixed
2016-10-22 18:04:48 +05:30
Kanchan Chauhan
a084405bca
Total leave days gets updated on date change
2016-10-22 11:55:51 +05:30
Kanchan Chauhan
a1006c0549
include_holiday being taken into consideration while calculating lwp
2016-10-21 17:53:15 +05:30
Kanchan Chauhan
24d580206a
[Fix] leave application days should be less than max days leave allowed
2016-10-21 13:01:33 +05:30
Nabin Hait
db88bd66b0
Merge branch 'develop' of https://github.com/DigiThinkIT/erpnext into DigiThinkIT-develop
2016-10-20 16:59:40 +05:30
Nabin Hait
376449ff41
Merge pull request #6659 from shreyasp/selling-price-validation
...
[Minor] Validate purchase price against selling price
2016-10-20 16:46:35 +05:30
Nabin Hait
9f26bc16b7
Update selling_controller.py
2016-10-20 16:45:53 +05:30
Rohit Waghchaure
69be01aa1b
[Stock Entry] Show total amount for purpose Material Issue/Receipt/Transfer
2016-10-20 16:38:30 +05:30
Nabin Hait
725b547641
Merge pull request #6657 from rohitwaghchaure/invoice_unlink_feature
...
[Feature] Provision to allow unlink the payment against the invoice
2016-10-20 16:36:57 +05:30
Rohit Waghchaure
18fa0d8691
patch to set default value as 1
2016-10-20 16:16:28 +05:30
Nabin Hait
938c858720
Merge pull request #6513 from KanchanChauhan/group-similar-item-in-po
...
Group similar items in PO
2016-10-20 16:11:24 +05:30
Rohit Waghchaure
7917ff6936
Test cases
2016-10-20 16:11:22 +05:30
Rohit Waghchaure
8055bd39ba
[Feature] Provision to allow unlink the payment against the invoice
2016-10-20 16:11:22 +05:30
Nabin Hait
05245d6328
Merge pull request #6661 from KanchanChauhan/demo-fixed-processpayroll-ss
...
Demo fixed for Process Payroll and Salary Structure
2016-10-20 16:05:08 +05:30
Kanchan Chauhan
1c1e2e9cbe
Demo fixed for Process Payroll and Salary Structure
2016-10-20 16:04:09 +05:30
shreyas
e8aaa92816
[Minor] Some more fixes to the code
2016-10-20 15:57:45 +05:30
shreyas
edcba51c8b
[Fix] Added check to validate selling price against valuation rate
2016-10-20 15:57:45 +05:30
shreyas
1cfe2d7b45
[Minor] Validate purchase price against selling price
2016-10-20 15:57:45 +05:30
Nabin Hait
6fb7b162e8
Create tax template based on country
2016-10-20 15:56:07 +05:30
Rohit Waghchaure
d23835be84
[Feature] Countrywise sales tax template
2016-10-20 15:56:07 +05:30
Kanchan Chauhan
cce16b29b0
Group similar items in PO
2016-10-20 14:31:34 +05:30
Saurabh
bc0783b527
[fix] duplicate columns in monthly salary report #6623
2016-10-20 12:55:23 +05:30
Kanchan Chauhan
025fbd8f14
Customer group added to Gross Profit report
2016-10-20 12:54:06 +05:30
Nabin Hait
97fa119b37
Set prefered contact email in Employee
2016-10-19 18:26:01 +05:30
Nabin Hait
0702fa2fc6
Fixed version conflict
2016-10-19 16:49:36 +05:30
Nabin Hait
13a07c2029
bumped to version 7.0.62
2016-10-19 17:18:04 +06:00
Rohit Waghchaure
aa8abfa5b3
Test cases added in sales order to check total projected qty
2016-10-19 15:26:10 +05:30
Rohit Waghchaure
ac9172f6df
[Fix] total projected qty
2016-10-19 15:06:30 +05:30
Nabin Hait
44b4e5eef3
Merge pull request #6648 from saurabh6790/hotfix
...
[fix] calculate variance only for submitted budgets
2016-10-19 15:05:11 +05:30
Nabin Hait
ff183eedb9
Fixes for testcases
2016-10-19 14:23:02 +05:30
Saurabh
afceac620c
[fix] calculate variance only for submitted budgets
2016-10-19 12:49:48 +05:30
Faris Ansari
2acbb11923
[fix] print format image size
2016-10-19 12:08:00 +05:30
Nabin Hait
2b03d8f696
Merge pull request #6641 from JayVora-SerpentCS/develop
...
Pythonic corrections
2016-10-19 10:47:01 +05:30
Nabin Hait
a7a3a497d5
Fixed version conflict
2016-10-18 18:35:42 +05:30
Nabin Hait
8872842edf
bumped to version 7.0.61
2016-10-18 19:05:18 +06:00
Rushabh Mehta
7791ed845f
[hot] [fix] student_dashboard.py
2016-10-18 18:33:19 +05:30
Nabin Hait
a943ec8ff5
Merge pull request #6642 from neilLasrado/develop
...
Fixes to Schools Module
2016-10-18 18:16:29 +05:30
Neil Trini Lasrado
377da58378
Set Student Name in Program Enrollment
2016-10-18 18:11:52 +05:30
Serpent Consulting Services Pvt Ltd
8b231f7256
Pythonic corrections
2016-10-18 17:30:24 +05:30
Nabin Hait
6cb44133c3
Fixed version conflict
2016-10-18 16:18:34 +05:30
Nabin Hait
170b0cc83c
bumped to version 7.0.60
2016-10-18 16:48:17 +06:00
Nabin Hait
d5c4a5c802
Hotfix
2016-10-18 16:17:37 +05:30
Nabin Hait
fa1cdd5bf0
Fixed merge conflict
2016-10-18 15:37:33 +05:30
Nabin Hait
7b9e8368ea
bumped to version 7.0.59
2016-10-18 15:55:31 +06:00
Nabin Hait
f32547a414
Merge pull request #6637 from nabinhait/cost_center_fix
...
Set cost center while creating invoice from SO/PO
2016-10-18 15:18:16 +05:30
Rushabh Mehta
17f6874450
[minor] [fix] doctype_dasboard.py files, move data to get_data
2016-10-18 14:54:39 +05:30
Nabin Hait
55a8797919
Set cost center while creating invoice from SO/PO
2016-10-18 14:54:17 +05:30
Neil Trini Lasrado
8b3dd8fdf2
Changed nationality in student master from link to data field
2016-10-18 12:55:38 +05:30
Kanchan Chauhan
dc86964e91
Patch fixed for Employee
2016-10-18 11:29:41 +05:30
Nabin Hait
b3b1219109
Fixed merge conflict
2016-10-17 17:42:53 +05:30
Nabin Hait
fcd10f2e08
Merge pull request #6335 from RobertSchouten/stock_entry
...
[fix] warning for creating stock entry after sales invoice (causing missing gl entries)
2016-10-17 17:39:57 +05:30
Nabin Hait
e5eed00aa5
Update stock_entry.py
2016-10-17 17:37:35 +05:30
Pawan Mehta
1a96cc1e8d
Fixes 6171 ( #6417 )
...
* [fix] #6171
* [fix] #6171
* [fix] #6171
* [fix] #6171
* [fix] #6171
* [fix] #6171
* [fix] #6171
* [fix] #6171
2016-10-17 17:02:12 +05:30
KanchanChauhan
81581c669f
No Leave allocation for Leave Type for which Leave Without Pay is checked ( #6626 )
2016-10-17 17:01:29 +05:30
Nabin Hait
437b32d32c
Added filter to show unclosed fiscal year's P&L balances in trail balance
2016-10-17 16:57:52 +05:30
Nabin Hait
425bdee0ec
Merge branch 'unclosed_finance' of https://github.com/RobertSchouten/erpnext into RobertSchouten-unclosed_finance1
2016-10-17 16:46:54 +05:30
Nabin Hait
395d757c5a
Fixed merge conflict
2016-10-17 16:42:49 +05:30
KanchanChauhan
9cb69ca0e3
Posting Date cannot be future date ( #6628 )
2016-10-17 16:40:16 +05:30
Saurabh
048ee48475
[fix] #6573 Material Request Required Date auto set ( #6627 )
2016-10-17 16:24:20 +05:30
Faris Ansari
e1416c3dda
Update sales-invoice.md frappe/erpnext#6507 ( #6629 )
...
* Update sales-invoice.md
* add pos-invoice screenshot
2016-10-17 16:22:43 +05:30
Nabin Hait
401be3f49b
Merge pull request #6577 from PawanMeh/fixes_6566
...
[fix #6566 ]
2016-10-16 14:28:26 +05:30
Nabin Hait
a9ce406c48
Merge pull request #6579 from PawanMeh/fixes_6567
...
[fix] #6567
2016-10-16 14:28:00 +05:30
Nabin Hait
e040510545
Always calculate additional discount amount if percentage is mentioned
2016-10-13 12:14:47 +05:30
Rushabh Mehta
b62ed7a603
[fix] install issue
2016-10-13 11:00:00 +05:30
Rushabh Mehta
257bbbe588
[refactor] has_website_permission parameters
2016-10-12 10:53:34 +05:30
RobertSchouten
bb7308bbc1
[fix] email digest date range starting with opening balance of day one not closing ( #6524 )
...
ie monthly currently get's balance at the end of 1st of september to the 30th of september instead of the beginning of the 1st aka the end of the 31st fo august
2016-10-10 17:17:39 +05:30
Saurabh
afa14fc402
[fix][minor] ( #6449 )
2016-10-10 17:17:17 +05:30
Nabin Hait
1765259043
Merge pull request #6591 from vrms/patch-4
...
Update managing-fixed-assets.md
2016-10-10 17:12:58 +05:30
Rushabh Mehta
2757d8ef03
[minor] [perm] allow owner to read student applicant
2016-10-10 16:46:24 +05:30
Rohit Waghchaure
8e881cc7b9
[Fix] making of production order from material request with sales order, restirct validation validate_production_order_against_so in production order
2016-10-10 14:58:33 +05:30
Faris Ansari
a0608d463a
[gantt] Gantt fixes ( #6490 )
...
* [gantt] fix Gantt Chart link in Modules
* [gantt] added field for Task dependent
2016-10-10 14:32:35 +05:30
vrms
e4e8bfae9f
Update managing-fixed-assets.md
...
Sale an asset > Sell and Asset
2016-10-10 15:33:27 +08:00
Nabin Hait
fc90758932
Merge pull request #6589 from rohitwaghchaure/purchase_invoice_validation_issue
...
[Fix] Purchase invoice validation issue
2016-10-10 11:51:00 +05:30
Rohit Waghchaure
3485d2467a
[Fix] Purchase invoice validation issue
2016-10-09 18:05:17 +05:30
Rohit Waghchaure
6f33dfbc56
[Fix] wildcard search for pos not working
2016-10-09 15:32:56 +05:30
Rushabh Mehta
ac5b193100
[minor] direct student admission to the list page
2016-10-09 15:19:23 +05:30
Pawan Mehta
8d62af627a
Update fiscal-year.md
2016-10-09 09:20:12 +05:30
pawan
1c0ecede06
[fix] #6567
2016-10-09 09:06:49 +05:30
pawan
896c731a46
[fix] #6566
2016-10-09 08:44:40 +05:30
pawan
05790d1b38
[fix] #6566
2016-10-09 08:30:29 +05:30
pawan
5655ce936b
[fix] #6567
2016-10-08 08:02:08 +05:30
pawan
361739ffb6
[ fix #6566 ]
2016-10-07 19:00:30 +05:30
Nabin Hait
fc2a9e64fc
Fixed version conflict
2016-10-07 17:09:28 +05:30
Nabin Hait
89326b366d
bumped to version 7.0.58
2016-10-07 17:38:57 +06:00
Nabin Hait
6aaa7d7742
Added missing file extension
2016-10-07 17:08:03 +05:30
Nabin Hait
df61513037
Fixed merge conflict
2016-10-07 17:05:00 +05:30
Nabin Hait
d17bbdeb4d
bumped to version 7.0.57
2016-10-07 17:34:35 +06:00
Nabin Hait
2f3a68b8d6
Added missing file extension
2016-10-07 17:03:37 +05:30
Nabin Hait
cd9c45f816
Fixed merge conflict
2016-10-07 16:53:07 +05:30
Nabin Hait
06195de812
bumped to version 7.0.56
2016-10-07 17:17:17 +06:00
Nabin Hait
ad8218e5ac
minor fix
2016-10-07 16:39:30 +05:30
Nabin Hait
9bfef84545
Merge branch 'notification-center' of https://github.com/shreyasp/erpnext into shreyasp-notification-center
2016-10-07 16:37:10 +05:30
Nabin Hait
81754954cb
Update update_timesheet_communications
2016-10-07 16:08:44 +05:30
Nabin Hait
2907881dfb
Update update_timesheet_communications
2016-10-07 16:07:11 +05:30
Nabin Hait
0799969063
Update set_portal_settings.py
2016-10-07 14:55:17 +05:30
Nabin Hait
20e96b77bd
Update set_portal_settings.py
2016-10-07 14:54:28 +05:30
shreyas
c1b7104126
[Fix] Minor changes to logic
2016-10-07 14:20:51 +05:30
Nabin Hait
2f75b7b42e
Fixed merge conflict
2016-10-07 14:16:17 +05:30
Rohit Waghchaure
770d04e633
[Fix] sales order status showing completed, while it's status was to bill
2016-10-07 13:55:48 +05:30
Rohit Waghchaure
022d87969d
[Fix] Issue in merging duplicate item
2016-10-07 13:40:45 +05:30
shreyas
a1d7646e70
[Fix] Allow user to save Notification Control without selecting transaction
2016-10-07 12:58:58 +05:30
Nabin Hait
16f3f378f6
Update patches.txt
2016-10-07 12:54:27 +05:30
Nabin Hait
1885207eca
Update and rename update_timesheet_modified_created to update_timesheet_communications
2016-10-07 12:54:04 +05:30
RobertSchouten
e0a636c081
[fix] update timestamps and relink communication for timesheet
2016-10-07 11:03:04 +08:00
RobertSchouten
ef4e41380b
[fix] update timestamps and relink communication for timesheet
2016-10-07 11:01:12 +08:00
Saurabh
a2a25abfa5
[fix] warehouse account rename fix #6526
2016-10-06 18:20:53 +05:30
Nabin Hait
77ede941b0
Merge pull request #6550 from rohitwaghchaure/make_payment_using_journal_entry
...
[Enhancement] Option to make payment via Journal Entry
2016-10-06 17:07:11 +05:30
Rohit Waghchaure
7d5298997b
Documentation for payments
2016-10-06 16:49:39 +05:30
Nabin Hait
1397159bc1
Merge pull request #6561 from rohitwaghchaure/remove_sales_invoice_from_scheduler_log
...
removed sales invoice from scheduler log
2016-10-06 15:32:55 +05:30
Nabin Hait
ec08a50af1
Merge pull request #6564 from rohitwaghchaure/expense_claim_issue
...
[Fix] Expense Claim, sanctioned amount not auto-populated from claim amount
2016-10-06 15:32:37 +05:30
Rohit Waghchaure
370e711f48
[Fix] Expense Claim, sanctioned amount not auto-populated from claim amount
2016-10-06 15:19:53 +05:30
Saurabh
3ae5672e27
[fix] sales order translation for language code: fr
2016-10-06 12:57:21 +05:30
Rohit Waghchaure
297fbcd388
removed sales invoice from scheduler log
2016-10-06 12:40:09 +05:30
Rohit Waghchaure
b7a5502b97
[Enhancement] Option to make payment via Journal Entry
2016-10-06 12:04:52 +05:30
vrms
bbe7a1062e
Update product-bundle.md
...
tried to work out the mechanics of Parent and Child items a little clearer
2016-10-06 07:40:21 +08:00
Rushabh Mehta
4dacaa103c
[minor] do not submit after accpeting payment
2016-10-05 19:20:37 +05:30
Rushabh Mehta
a47652624a
[minor] student applicant fixes
2016-10-05 18:04:35 +05:30
Nabin Hait
558f526a68
Fixed version conflict
2016-10-05 17:18:36 +05:30
Nabin Hait
7dcab89321
Merge branch 'hotfix'
2016-10-05 17:18:11 +05:30
Nabin Hait
a162b3f0cd
bumped to version 7.0.55
2016-10-05 17:48:11 +06:00
Nabin Hait
cccc45edc5
Don't throw expense account validation on fetching item details
2016-10-05 17:15:53 +05:30
Nabin Hait
33fafb7728
Set warranty claim resolution date as today only if it is not set
2016-10-05 16:43:20 +05:30
Nabin Hait
2704a4a8fc
Update production_order.py
2016-10-05 16:14:42 +05:30
Nabin Hait
7c0fe7d9d3
Merge pull request #6534 from rohitwaghchaure/rfq_added_links_of_quotations
...
[Enhancement] Added supplier quotation link on rfq
2016-10-05 15:44:51 +05:30
Rohit Waghchaure
a26f685b9f
[Enhancement] Added supplier quotation link on rfq
2016-10-05 15:04:50 +05:30
Rohit Waghchaure
e86eaf543c
removed sync master data onload of the pos page
2016-10-05 14:45:15 +05:30
Rohit Waghchaure
163e3598c7
[Fix] POS wildcard search for customers, items
2016-10-05 13:52:17 +05:30
Nabin Hait
babafb8d01
Merge pull request #6531 from saurabh6790/je_currency_symbol_fix
...
[fix] currency symbol for total amount in JE
2016-10-05 13:12:59 +05:30
Nabin Hait
7229b64128
Merge pull request #6516 from bcornwellmott/patch-6
...
Update request_for_quotation.html
2016-10-05 13:12:09 +05:30
Nabin Hait
8db8a91d2e
Minor fixes
2016-10-05 13:11:19 +05:30
Kanchan Chauhan
f6f8ec68ad
Total and difference added for amount and qty
2016-10-05 13:11:19 +05:30
Rohit Waghchaure
712b871f06
Change project location in sales invoice
2016-10-05 12:45:56 +05:30
Neil Trini Lasrado
d5035e05b3
Field rearrange in student applicant
2016-10-05 12:35:55 +05:30
Nabin Hait
9501b38e8b
Update remove_doctypes_and_reports.py
2016-10-05 12:35:11 +05:30
Nabin Hait
219148d23d
Sales Personwise transaction summary - total row
2016-10-05 12:26:51 +05:30
Nabin Hait
9ac2fc932d
Validate dates, fixes #6542
2016-10-05 12:20:25 +05:30
Nabin Hait
6c49fa20b5
Fixed precision of rate field
2016-10-05 11:28:02 +05:30
Rushabh Mehta
bb89f6e151
[minor] student applications to be submitted after payment
2016-10-05 09:24:52 +05:30
Nabin Hait
efa68fb6b8
Fixed version conflict
2016-10-04 17:27:02 +05:30
Nabin Hait
d5cebd7bb4
bumped to version 7.0.54
2016-10-04 17:56:33 +06:00
Rushabh Mehta
6a1742abc8
[minor] status for student applicant
2016-10-04 16:26:32 +05:30
Nabin Hait
80de91776d
Merge pull request #6539 from rohitwaghchaure/stock_entry_grid_issue
...
[Fix] Source / Target warehouse does not toggle properly, if we change the purpose after saving a stock entry record
2016-10-04 16:20:47 +05:30
Nabin Hait
cf87027422
Merge pull request #6537 from rohitwaghchaure/pos_multi_company_issue
...
[Fix] Multi company issue for POS
2016-10-04 16:20:24 +05:30
Rohit Waghchaure
661db8ba71
[Fix] Source / Target warehouse does not toggle properly, if we change the purpose after saving a stock entry record
2016-10-04 14:46:34 +05:30
Rohit Waghchaure
82be020ae9
sync offline sales invoices from the POS
2016-10-04 12:58:48 +05:30
Nabin Hait
66d49565d2
Merge pull request #6536 from frappe/umairsy-patch-4
...
Update supplier.md
2016-10-04 12:25:45 +05:30
Rushabh Mehta
3af3d7abe3
[fixes] admission-applicant link and student applicant fixes
2016-10-04 12:20:47 +05:30
Rohit Waghchaure
6f1d012b65
[Fix] Multi company issue for POS
2016-10-04 12:18:59 +05:30
Umair Sayed
06b88a464d
Update supplier.md
2016-10-04 12:10:08 +05:30
Rushabh Mehta
aedad64445
[minor] fixes
2016-10-04 11:41:42 +05:30
Saurabh
f24d523fc9
[fix] currency symbol for total amount in JE
2016-10-04 11:29:26 +05:30
Nabin Hait
7fb79d175f
Fixed version conflict
2016-10-03 18:05:34 +05:30
Nabin Hait
e2b8ae56e1
bumped to version 7.0.53
2016-10-03 18:35:10 +06:00
Nabin Hait
d114aca20d
GL Entries for Purchase Invoices with Update Stock option checked and having non-stock items
2016-10-03 17:36:28 +05:30
Faris Ansari
69ca382529
[fix] image size fix in print format
2016-10-03 17:15:42 +05:30
Neil Trini Lasrado
93d314c573
Merged introduction and eligibility into a single text field in Student Admission. ( #6529 )
2016-10-03 15:50:47 +05:30
Nabin Hait
5fd5a77750
Fixed version conflict
2016-10-03 14:13:50 +05:30
Nabin Hait
e7e920b487
bumped to version 7.0.52
2016-10-03 14:42:53 +06:00
Nabin Hait
e8519938e0
Merge pull request #6525 from rohitwaghchaure/minor_pos
...
[Fix] disable apply discount on pos
2016-10-03 14:10:44 +05:30
Nabin Hait
10a48ea5e9
Merge pull request #6527 from rohitwaghchaure/budget_issue
...
[Fix] company key error during cancellation of stock entry
2016-10-03 14:05:10 +05:30
Saurabh
4f62c4cf2d
[minor][fix] for condition maker
2016-10-03 12:48:25 +05:30
Rohit Waghchaure
b1391ca635
[Fix] company key error during cancellation of stock entry
2016-10-03 12:25:04 +05:30
Rohit Waghchaure
6f3d04caf7
[Fix] Disable apply discount on
2016-10-03 11:46:04 +05:30
Nabin Hait
b498eb5f9e
Minor fix AR/AP
2016-10-01 15:51:59 +05:30
bcornwellmott
47863a3049
Update request_for_quotation.html
...
Fixing spelling mistakes
2016-09-30 15:45:20 -07:00
Nabin Hait
e1aee56e85
Merge pull request #6515 from rohitwaghchaure/purchase_receipt_title_issue
...
[Fix] Purchase receipt title issue
2016-09-30 21:24:03 +05:30
Rohit Waghchaure
74bf022273
[Fix] Purchase receipt title issue
2016-09-30 18:35:48 +05:30
Rohit Waghchaure
c1a3e379d8
[Fixed] Accounts receivable concat issue
2016-09-30 13:18:06 +05:30
Nabin Hait
6870e45276
Merge pull request #6495 from frappe/umairsy-patch-2
...
Update sales_partner.js
2016-09-29 20:44:59 +05:30
Nabin Hait
7652d5db93
Merge pull request #6501 from rohitwaghchaure/minor_fix_warranty_claim
...
[Fix] Minor changes in warranty claim
2016-09-29 20:44:03 +05:30
Rohit Waghchaure
1d0b18661e
[Fix] Minor changes in warranty claim
2016-09-29 18:55:45 +05:30
Umair Sayed
6c1c03efe7
Update data-import-tool.md
2016-09-29 16:34:39 +05:30
Umair Sayed
29a0b31ca6
Update sales_partner.js
2016-09-29 16:25:04 +05:30
Nabin Hait
2ad07f4912
Merge pull request #6491 from neilLasrado/develop
...
Removed Website Roles from Install Fixtures
2016-09-29 15:39:15 +05:30
Nabin Hait
80499bb657
Fixed merge conflict
2016-09-29 14:18:53 +05:30
Nabin Hait
626fcd5199
bumped to version 7.0.51
2016-09-29 14:46:42 +06:00
Nabin Hait
2c452a6881
Merge pull request #6485 from rohitwaghchaure/enhancement_payment_entry
...
[Enhancement] Added allocate payment amount checkbox in Payment Entry
2016-09-29 13:57:48 +05:30
Nabin Hait
d0a25f72c7
Merge pull request #6488 from rohitwaghchaure/timesheet_delete_transaction_issue
...
[Fix] Timesheet detail records not deleted with company transactions deletion
2016-09-29 13:55:38 +05:30
Nabin Hait
424bffc98b
Merge pull request #6486 from nabinhait/stock_trans_repost
...
Reposting of GLE and SLE for all stock transactions
2016-09-29 13:51:51 +05:30
Nabin Hait
473ccc410b
Merge pull request #6489 from nabinhait/leave_application_fix
...
[fix] Validate leave application period with salary slip only if leave type is LWP
2016-09-29 13:49:31 +05:30
Nabin Hait
b81a7538b9
Merge pull request #6492 from rohitwaghchaure/patch_for_change_amount_account
...
[Fix] added account for missing change amount account in the sales invoice
2016-09-29 13:41:50 +05:30
Nabin Hait
f1d2fd2436
[fix] Accounts Receivable report if negative write off in invoice
2016-09-29 13:03:10 +05:30
Rohit Waghchaure
4b24683c27
[Fix] added account for missing change amount account in the sales invoice
2016-09-29 12:55:48 +05:30
Neil Trini Lasrado
3da7354ba4
removed supplier role from Request for Quotation
2016-09-29 11:57:23 +05:30
Neil Trini Lasrado
84154f546a
Removed Website Roles from Install Fixtures
2016-09-29 11:36:55 +05:30
Nabin Hait
2e31d7c7bf
[fix] Validate leave application period with salary slip only if leave type is LWP
2016-09-29 10:59:46 +05:30
Rohit Waghchaure
17adb970f1
[Fix] Timesheet detail records not deleted with company transactions deletion
2016-09-29 01:07:28 +05:30
Rohit Waghchaure
f21f1af0c9
[Enhancement] Added allocate payment amount checkbox in Payment Entry
2016-09-28 18:24:17 +05:30
Nabin Hait
b3bc41131e
Reposting of GLE and SLE for all stock transactions
2016-09-28 18:17:52 +05:30
Nabin Hait
f1ad32059f
Merge pull request #6481 from rohitwaghchaure/fix_homepage
...
Fixed view button functionality in homepage
2016-09-28 16:57:21 +05:30
Nabin Hait
443ac7bf30
Test case fix
2016-09-28 16:54:23 +05:30
Kanchan Chauhan
b40c0a917d
[WIP] Process Payroll Changes
2016-09-28 15:14:41 +05:30
Rohit Waghchaure
7441a93a10
[Fix] sub-heading is missing in the excel sheet of the cash flow
2016-09-28 14:57:57 +05:30
Rohit Waghchaure
d63bfaa5f2
Fixed view button functionality in homepage
2016-09-28 14:08:47 +05:30
Rohit Waghchaure
0a6529a643
Remove time log, time log batch from Doc Field.
2016-09-28 13:03:42 +05:30
Nabin Hait
1e97fc8687
Merge pull request #6460 from KanchanChauhan/salary-slip-fixes
...
[Fix]Salary Slip can be created without salary structure
2016-09-28 12:55:04 +05:30
Nabin Hait
ba03ef775d
Fixed merge conflict
2016-09-28 10:47:41 +05:30
Nabin Hait
147ecab6b0
bumped to version 7.0.50
2016-09-28 11:16:36 +06:00
Nabin Hait
45f05d2c9b
Merge pull request #6465 from saurabh6790/hotfix
...
[fix] ledger view from coa
2016-09-28 10:44:40 +05:30
paurosello
a4d19b4c03
change to link of gantt in project ( #6469 )
2016-09-27 09:56:17 +05:30
Faris Ansari
70b7d3280b
added required fields in doctypes for gantt ( #6466 )
2016-09-26 18:20:14 +05:30
Nabin Hait
706612bcd4
Fixed version conflict
2016-09-26 18:11:56 +05:30
Nabin Hait
577aa9cb33
bumped to version 7.0.49
2016-09-26 18:32:19 +06:00
Nabin Hait
ad3e213b41
minor patch fixes
2016-09-26 18:00:13 +05:30
Nabin Hait
7faa4b5fdf
Merge pull request #6455 from rohitwaghchaure/retun_field_duplicate_issue
...
[Fix] Allow renaming for UOM, When Duplicate Is Return field should not be copied #5510 #6288
2016-09-26 17:57:28 +05:30
Nabin Hait
f04721ee79
Update naming_series.py
2016-09-26 17:55:34 +05:30
Saurabh
5874a76eac
[fix] ledger view from coa
2016-09-26 16:14:15 +05:30
Kanchan Chauhan
273c5e71fd
[Fix]Salary Slip can be created without salary structure
2016-09-24 18:56:56 +05:30
Rushabh Mehta
1f53aaf093
[minor] [patch] ignore_validate in update_portal_role
2016-09-24 00:21:53 +05:30
Rushabh Mehta
63cdbf08f9
[minor] [patch] ignore_validate in update_portal_role
2016-09-24 00:07:31 +05:30
Rushabh Mehta
82921f7d65
[minor] add paid field in Student Applicant
2016-09-23 23:50:55 +05:30
Pawan Mehta
4f72480045
Merge pull request #6453 from PawanMeh/hotfix
...
[fix]-Ageing buckets should not have amounts if due date is not reached
2016-09-23 22:52:00 +05:30
Rushabh Mehta
fc800b3f2f
[enhance] added roles for portal users frappe/frappe#2091 ( #6452 )
2016-09-23 21:51:51 +05:30
Felipe Orellana
51082006a9
[FIX] Issue with customer doctype not allowing name series past 10
...
Query used to fetch mast number in series breaks due to sql MAX function handing string and number ordering differently. This causes the last "[name] - 9" series to be picked up as last in the series instead of "[name] - 10". Fix is to cast value to unsigned to MAX handles ordering correctly.
2016-09-23 11:58:11 -04:00
Rohit Waghchaure
d728f5a429
[Fix] Allow renaming for UOM, When Duplicate Is Return field should not be copied #5510 #6288
2016-09-23 18:06:24 +05:30
Nabin Hait
5f825deadd
Fixed version conflict
2016-09-23 17:25:23 +05:30
Nabin Hait
aec28a2c88
bumped to version 7.0.48
2016-09-23 17:53:28 +06:00
pawan
09f1ee637e
[fix] #6371
2016-09-23 17:19:54 +05:30
Nabin Hait
3720045eb9
Update patches.txt
2016-09-23 16:31:43 +05:30
Nabin Hait
147b288d66
Update repost_gle_for_pos_sales_return.py
2016-09-23 13:11:05 +05:30
Nabin Hait
6b4eb7f77f
Fixed version conflict
2016-09-23 12:16:31 +05:30
Nabin Hait
84fa3dfac8
bumped to version 7.0.47
2016-09-23 12:46:01 +06:00
Nabin Hait
d03087d3ab
Patch fixed for legacy migration
2016-09-23 11:08:02 +05:30
Rohit Waghchaure
b2382c0b8e
[fix] Supplier status stuck at Open forever
2016-09-22 18:45:24 +05:30
Rohit Waghchaure
481ca832b0
minor fix
2016-09-22 17:21:37 +05:30
Nabin Hait
22e1665244
Merge pull request #6440 from rohitwaghchaure/additional_discount_amount_issue
...
[Fix] Additional Discount Amount can't be refresh automatically #6199
2016-09-22 16:03:00 +05:30
Rushabh Mehta
2d4f3bb04a
[fix] space
2016-09-22 15:17:04 +05:30
Rohit Waghchaure
deaee7c08b
[Fix] Additional Discount Amount can't be refresh automatically #6199
2016-09-22 14:02:53 +05:30
Rohit Waghchaure
bd599b0169
[Fix] Discount copied during making of PO from SO
2016-09-22 11:47:17 +05:30
Nabin Hait
d64454b1c1
Merge pull request #6433 from RobertSchouten/validate_sale_ware
...
[fix] si validate warehouse if is_stock item
2016-09-22 11:41:36 +05:30
Nabin Hait
e5c7d4b987
Fixed version conflict
2016-09-22 11:33:51 +05:30
Nabin Hait
b1041072a2
bumped to version 7.0.46
2016-09-22 12:03:32 +06:00
Nabin Hait
a58a65457f
Sales Register report minor fix
2016-09-22 11:31:42 +05:30
robert schouten
f91ca3a450
[fix] si validate warehouse if is_stock item
2016-09-22 13:07:00 +08:00
robert schouten
147c727743
changed from label based to fieldname based
2016-09-22 08:32:54 +08:00
Nabin Hait
993d7ca630
Merge pull request #6424 from rohitwaghchaure/daily_timesheet_summary_permission_issue
...
[Fix] Daily timesheet summary permission issue
2016-09-21 18:41:54 +05:30
Nabin Hait
be4c527453
Merge pull request #6426 from rohitwaghchaure/supplier_portal_enhancement
...
[Enhancement] Supplier quotation added on supplier portal
2016-09-21 18:41:21 +05:30
Nabin Hait
96d38eaac7
Merge pull request #6429 from rohitwaghchaure/minor_fix
...
[Fix] Image is copied when duplicate supplier, employee
2016-09-21 18:40:47 +05:30
Rohit Waghchaure
a7e3d11077
[Fix] Image is copied when duplicate supplier, employee
2016-09-21 18:13:16 +05:30
Kanchan Chauhan
2142a0ab37
[Fix] Indentation fixed
2016-09-21 17:28:42 +05:30
Rohit Waghchaure
21499e820d
[Enhancement] Supplier quotation added on supplier portal
2016-09-21 17:07:25 +05:30
Nabin Hait
7108991039
Patch order changed
2016-09-21 16:34:44 +05:30
Rohit Waghchaure
342ec18b83
[Fix] Daily timesheet summary permission issue
2016-09-21 13:22:15 +05:30
Nabin Hait
0be6073f10
Fixed version conflict
2016-09-21 13:06:19 +05:30
Nabin Hait
4fead63419
bumped to version 7.0.45
2016-09-21 13:35:26 +06:00
Nabin Hait
521b34c03b
Merge pull request #6413 from KanchanChauhan/salaryslip-docfield-in-condition
...
Salary Slip fields in Condition and Formula
2016-09-21 12:55:27 +05:30
Nabin Hait
081eab147f
Update salary_slip.py
2016-09-21 12:55:16 +05:30
Rushabh Mehta
301c8a94b8
[fix] [patch] update_lead_source
2016-09-21 12:00:58 +05:30
Rushabh Mehta
989a4849fe
[minor] patch fix for 6-7
2016-09-21 12:00:58 +05:30
Nabin Hait
aac32d644d
Fix in Sales Register for multiple mode of payments
2016-09-21 11:46:07 +05:30
robert schouten
d7721a605d
preferred email for payroll
2016-09-21 11:36:01 +08:00
Chude Osiegbu
4a0c840076
Fixing a regression in shopping_cart_settings that was caused by the change in structure of Currency Exchange Doctype
2016-09-20 19:34:10 +01:00
Nabin Hait
d12990ff57
Update update_home_page.py
2016-09-20 18:20:58 +05:30
Nabin Hait
5cf5019b89
minor patch fix
2016-09-20 18:19:59 +05:30
Nabin Hait
9f4ca1fb9e
set posting date in salalry slip
2016-09-20 18:19:59 +05:30
Nabin Hait
158ac5a844
Merge pull request #6416 from KanchanChauhan/minor-fix
...
[Fix] filters_by_name changed to query_report_filters_by_name
2016-09-20 18:14:00 +05:30
Nabin Hait
a36325c6e5
Merge pull request #6403 from saurabh6790/treeview_quick_entry_fix
...
[fix] minor fix to accomodate custom fields in tree popup
2016-09-20 18:06:49 +05:30
Nabin Hait
429a38f90b
Merge pull request #6415 from rmehta/hotfix
...
[minor] bring back old grid style in material request
2016-09-20 18:05:32 +05:30
Kanchan Chauhan
77aaa70734
[Fix] filters_by_name changed to query_report_filters_by_name
2016-09-20 17:54:07 +05:30
Rushabh Mehta
57a1905576
[minor] bring back old grid style in material request
2016-09-20 17:22:54 +05:30
Nabin Hait
b015f1b647
Fixed version conflict
2016-09-20 16:53:02 +05:30
Nabin Hait
1f912f67ae
bumped to version 7.0.44
2016-09-20 17:22:10 +06:00
Kanchan Chauhan
e5057c8c35
Salary Slip fields in Condition and Formula
2016-09-20 14:59:42 +05:30
RobertSchouten
8d43b32c2c
improvements to email digest ( #6323 )
2016-09-20 11:11:39 +05:30
Nabin Hait
b8eef64e5d
Merge pull request #6325 from RobertSchouten/patch-26
...
fix allow negatives in leave type check
2016-09-20 11:00:31 +05:30
Nabin Hait
79fe1fad5d
Merge pull request #6374 from RobertSchouten/salary_register
...
print formatting for monthly Salary register
2016-09-20 10:58:53 +05:30
Nabin Hait
33ea19d616
Merge pull request #6395 from RobertSchouten/payroll_date
...
[minor] adding Payroll date field to process payroll and salary slip
2016-09-20 10:57:32 +05:30
robert schouten
5c41c77c7e
added posting date to process payroll and salary slip
2016-09-20 08:19:05 +08:00
Rohit Waghchaure
414199a5db
[Fix] Mode of payment issue
2016-09-19 23:43:47 +05:30
Nabin Hait
383cb43135
Merge pull request #6393 from KanchanChauhan/gl-fix
...
Against Voucher Type and Against Voucher added to GL
2016-09-19 19:35:55 +05:30
Nabin Hait
b20c83de46
Merge pull request #6397 from neilLasrado/develop
...
Added ability to Import Data via Data Import Tool in Instructor Doctype
2016-09-19 19:25:41 +05:30
Nabin Hait
fe15fd622d
Merge pull request #6398 from mainul94/Issue#6370
...
Update Production Status Options
2016-09-19 19:25:24 +05:30
Nabin Hait
902bcc07b5
Merge pull request #6401 from rmehta/fix-lead-link
...
[fix] connect customer to Quotation, Opportunity if created from lead, fixes #6051
2016-09-19 19:22:34 +05:30
Nabin Hait
acc3f43666
Merge pull request #6406 from rohitwaghchaure/add_sq_in_opportunity
...
Opportunity, added supplier quotation in the dashboard
2016-09-19 19:14:39 +05:30
Neil Trini Lasrado
93424e95f4
Added ability to Import Data via Data Import Tool in Instructor Doctype
2016-09-19 18:40:35 +05:30
Rohit Waghchaure
5b5f3743dd
Opportunity, added supplier quotation in the dashboard
2016-09-19 18:36:21 +05:30
Saurabh
9aacf46c51
[fix] minor fix to accomodate custom fields in tree popup
2016-09-19 16:45:35 +05:30
Rushabh Mehta
559aa3ab7c
[enhance] show customer, supplier billing and outstanding, fixes #6078
2016-09-19 16:04:58 +05:30
Rushabh Mehta
5a58d8a11e
[minor] production order link in material request, fixes #6197
2016-09-19 15:33:46 +05:30
Rushabh Mehta
bd15e31ea1
[minor] [enhance] fixes #6222
2016-09-19 15:27:09 +05:30
Rushabh Mehta
e35dbca01b
[fix] connect customer to Quotation, Opportunity if created from lead, fixes #6051
2016-09-19 15:03:57 +05:30
Kanchan Chauhan
006a0e68bf
Against Voucher Type and Against Voucher added to GL
2016-09-19 13:44:52 +05:30
Nabin Hait
17c43cd799
Merge pull request #6392 from KanchanChauhan/actual-qty-in-mri
...
Actual Qty added to Material Request Item
2016-09-19 13:32:31 +05:30
strixaluco
71073e1730
Update stock-entry.md
...
Stock Reconciliation hyperlink added
2016-09-19 15:38:38 +08:00
Mainul Islam
dbf2ce67a6
Fixed Issue#6370
2016-09-19 12:49:01 +06:00
Chude Osiegbu
256ec170d0
Corrections properly distinguish between transaction_date and posting_date as the basis for determining translation date that is passed to get_exchange_rate
2016-09-19 03:53:37 +01:00
Chude Osiegbu
375a3c003d
Update to erpnext/public/js/controllers/transaction.js in order to enable it detect when the doctype for which exchange rate is to be determined is a Sales Order or Purchase order. If it is either, then use transaction_date instead of posting_date as the argument to get_exchange_rate method
2016-09-19 02:35:32 +01:00
Chude Osiegbu
1f64f9897c
Additional corrections for cases where get_exchange_rate was not called with the correct number of arguments.
2016-09-19 01:34:49 +01:00
Chude Osiegbu
7e74fb4357
Modification to set_price_list_currency in accounts_controller.py to allow for specification of date in get_exchange_rate call
2016-09-19 00:59:25 +01:00
Chude Osiegbu
3c6a937a7c
Merge branch 'develop' into exchange_rate_modifications
2016-09-18 21:47:55 +01:00
Kanchan Chauhan
d1d129edf0
Actual Qty added to Material Request Item
2016-09-19 00:22:37 +05:30
Rohit Waghchaure
3c4cdd2a94
[Fix] Added base_url, print_css in pos
2016-09-19 00:17:32 +05:30
Rushabh Mehta
cf7a36ac26
[fix] fix patch to clear lead customization
2016-09-16 23:01:41 +05:30
Nabin Hait
5bab04fead
Merge pull request #6381 from rmehta/lead-source
...
[enhance] added Lead Source master, fixes #6231
2016-09-16 16:58:40 +05:30
Nabin Hait
c4bf8c5493
Merge pull request #6383 from nabinhait/article_max_cols
...
Article on maximum number of fields
2016-09-16 16:58:15 +05:30
Saurabh
9919a0a9db
[fix] #5992
2016-09-16 16:47:03 +05:30
Rushabh Mehta
39b5d39df6
[fix] remove campaign depends on
2016-09-16 15:55:34 +05:30
Nabin Hait
86e660f6c3
Article on maximum number of fields
2016-09-16 14:51:45 +05:30
Rushabh Mehta
59dc0ece9f
[enhance] added Lead Source master, fixes #6231
2016-09-16 11:44:49 +05:30
Nabin Hait
56700ae148
Merge pull request #6356 from KanchanChauhan/job-application-webform
...
Job Application web form
2016-09-15 17:20:43 +05:30
Nabin Hait
f3fd2ce382
Merge pull request #6366 from rohitwaghchaure/opportunity_enhancement
...
[Enhancement] Make supplier quotation from opportunity
2016-09-15 17:18:51 +05:30
Nabin Hait
f79adfddf1
Merge pull request #6351 from RobertSchouten/patch-29
...
PPT material request non-stock items
2016-09-15 17:01:20 +05:30
Nabin Hait
3cef7d5ae9
Update production_planning_tool.py
2016-09-15 17:01:00 +05:30
Neil Trini Lasrado
bb5eb7d6f4
Added title to Student Admission ( #6379 )
2016-09-15 16:44:25 +05:30
Nabin Hait
b267673b8e
Merge pull request #6373 from vrms/patch-2
...
Patch 2
2016-09-15 16:11:56 +05:30
Nabin Hait
756467c872
Merge pull request #6372 from vrms/patch-1
...
Patch 1
2016-09-15 16:11:45 +05:30
Neil Trini Lasrado
7e1b516103
fixes for student admission ( #6377 )
...
* fixes for student admission
* Added Application Route to Student Admission
2016-09-15 15:36:14 +05:30
Rushabh Mehta
769dda0874
[translation] [fixes] #5860
2016-09-15 15:17:04 +05:30
Neil Trini Lasrado
83d81203b2
Added Student Admissions ( #6359 )
...
* Added Student Admissions
* Fixes for Student Application
2016-09-15 14:48:13 +05:30
Rushabh Mehta
33d18dbc9a
[docs] for auto email
2016-09-15 13:57:43 +05:30
Nabin Hait
759ef4c00d
Allowed past dates in next depreciation date
2016-09-15 12:24:33 +05:30
robert schouten
32c366508a
add print format and id to monthly salary register
2016-09-15 14:21:15 +08:00
vrms
05e33789aa
Update index.md
2016-09-15 14:11:06 +08:00
vrms
6d34033c3f
Update item-variants.md
...
tried to bring out the implications and meaning of Variants (compared to a regular item) a little more detailed
2016-09-15 14:05:13 +08:00
Nabin Hait
d5ebd79ad7
Fixed version conflict
2016-09-14 15:50:22 +05:30
Nabin Hait
72801043f1
bumped to version 7.0.43
2016-09-14 16:14:25 +06:00
Rohit Waghchaure
00295f2b8d
make supplier quotation from opportunity
2016-09-14 15:36:40 +05:30
Nabin Hait
e9fa81c286
Merge pull request #6327 from rohitwaghchaure/timesheet_enhancement
...
[Enhancement] Timesheet billing based on project
2016-09-14 15:31:54 +05:30
Nabin Hait
2e8eff3456
Merge pull request #6352 from superlack/patch-1
...
Activity Summary to not show cancelled timesheets on click
2016-09-14 15:27:02 +05:30
Nabin Hait
9c32baa1f4
Merge pull request #6355 from rohitwaghchaure/timesheet_calendar_permission_issue
...
[Fix] Timesheet calendar permission issue
2016-09-14 15:26:30 +05:30
Rohit Waghchaure
b78eb2b6f2
[Fix] Financial Statements reports are running very slow
2016-09-14 13:33:27 +05:30
robert schouten
7157b2f286
warnings for prevent stock entries after sales invoice
2016-09-14 08:48:52 +08:00
Rushabh Mehta
b6bca567ce
[fixes] [style] for web-form
2016-09-13 14:40:13 +05:30
Kanchan Chauhan
122d0791a3
Job Application web form
2016-09-13 14:29:02 +05:30
Rohit Waghchaure
4bd08182ac
[Fix] Timesheet calendar permission issue
2016-09-13 13:35:53 +05:30
Nabin Hait
ae9990cb81
Merge pull request #6353 from rohitwaghchaure/patch_fix_for_timesheet
...
[Fix] Timesheet patch
2016-09-13 13:31:11 +05:30
Rohit Waghchaure
a5de83351e
[Fix] Timesheet patch
2016-09-13 12:36:37 +05:30
superlack
1579565e52
Activity Summary to not show cancelled timesheets on click
...
Clicking an Activity Type in the Activity summary portion of project will add filter of "Status" != "Cancelled"
2016-09-12 21:18:41 -07:00
RobertSchouten
4ca64c33eb
Update production_planning_tool.json
2016-09-13 08:36:05 +08:00
RobertSchouten
5414725fd6
PPT material request non-stock items
2016-09-13 08:27:51 +08:00
Rohit Waghchaure
0568238786
rename total_billing_hours to total_billable_hours in timesheet doctype
2016-09-12 23:00:24 +05:30
Rohit Waghchaure
7b6fdb77d0
rename total_billing_amount to total_billable_amount in timesheet doctype
2016-09-12 19:06:41 +05:30
Nabin Hait
fcbb7692fa
Merge pull request #6322 from RobertSchouten/patch-23
...
leave balance now fy not calendar
2016-09-12 18:53:16 +05:30
Nabin Hait
b7c5b76ed1
Merge pull request #6321 from RobertSchouten/patch-22
...
allow users without employee with hr permission to view all calendars
2016-09-12 18:52:45 +05:30
Nabin Hait
9d9d1dceeb
Merge pull request #6314 from bcornwellmott/bom_desription
...
Fixed spelling
2016-09-12 18:45:21 +05:30
Nabin Hait
cd23530d24
Merge pull request #6324 from RobertSchouten/patch-24
...
stock entries from production_order dont fetch serial number of project
2016-09-12 18:35:13 +05:30
Nabin Hait
6c08f5caf9
Update stock_entry.py
2016-09-12 18:34:46 +05:30
Nabin Hait
d7b95267b3
Update production_planning_tool.py
2016-09-12 18:33:17 +05:30
Rohit Waghchaure
97a82714de
[Fix] so_dn_required for pos and stock update invoice
2016-09-12 18:04:17 +05:30
Nabin Hait
0a2c7a9a66
Merge pull request #6329 from bcornwellmott/quotecomp_add_supplier
...
Added supplier quotation filter for Quoted Item Comparison
2016-09-12 17:55:19 +05:30
Nabin Hait
97b661f995
Merge pull request #6334 from RobertSchouten/patch-27
...
[fix] itemwise sales register add sales invoice to delivery note when…
2016-09-12 17:53:10 +05:30
Nabin Hait
1d8d93d9ad
Update balance_sheet.py
2016-09-12 17:43:14 +05:30
Nabin Hait
9821816e6c
Merge pull request #6337 from RobertSchouten/patch-28
...
[fix] status updater percent when qty is minus value
2016-09-12 17:37:48 +05:30
Nabin Hait
0a7c0f4418
Merge pull request #6338 from RobertSchouten/report_names
...
add customer and supplier names to some reports
2016-09-12 17:36:46 +05:30
Nabin Hait
014c30c90d
Merge pull request #6339 from rohitwaghchaure/pos_enhancement
...
[Enhancement] POS changes and fixes
2016-09-12 17:35:40 +05:30
Nabin Hait
33a20bdb13
Merge pull request #6340 from nabinhait/se_difference_account
...
Remove Difference Account field from Stock Entry parent form
2016-09-12 17:34:59 +05:30
Nabin Hait
d220298e69
Merge pull request #6343 from PawanMeh/fixes_6195
...
[fix] #6195
2016-09-12 17:34:40 +05:30
Nabin Hait
f314494555
Merge pull request #6345 from rohitwaghchaure/employee_name_missing
...
[Fix] Employee name is missing in timesheet
2016-09-12 17:34:13 +05:30
bcornwellmott
6594c841a7
Added color coding to timesheet calendars ( #6269 )
2016-09-12 16:43:23 +05:30
Rushabh Mehta
daee449063
[fix] for print format draft ( #6346 )
2016-09-12 16:42:36 +05:30
Rohit Waghchaure
03e5e68a7a
[Fix] Employee name is missing in timesheet
2016-09-12 16:14:06 +05:30
pawan
af111e9c43
[fix] #6195
2016-09-12 15:16:23 +05:30
Rohit Waghchaure
4eb908fc76
Doc updated for timesheet
2016-09-12 13:27:28 +05:30
Rohit Waghchaure
e1d59d6dde
test cases and minor changes
2016-09-12 13:27:28 +05:30
Rohit Waghchaure
1d0e8ea9c6
minor changes
2016-09-12 13:27:27 +05:30
Rohit Waghchaure
c940440fbe
patch and rearrangement of fields
2016-09-12 13:27:27 +05:30
Rohit Waghchaure
3815ebff8a
Added %billed in timesheet
2016-09-12 13:27:27 +05:30
Rohit Waghchaure
a6927e05ba
set project wise timesheet data
2016-09-12 13:27:27 +05:30
Rohit Waghchaure
cc8644f86e
[Timesheet] Field rearrange
2016-09-12 13:27:27 +05:30
Nabin Hait
a36a88b6de
Remove Difference Account field from Stock Entry parent form
2016-09-12 13:15:59 +05:30
Rohit Waghchaure
60a05324ce
POS changes and fixes
2016-09-12 13:11:10 +05:30
Nabin Hait
294664b24c
Merge pull request #6267 from PawanMeh/fixes_6254
...
[fix] #6254
2016-09-12 13:03:14 +05:30
Nabin Hait
9c82dd9157
Merge pull request #6332 from rmehta/item-group-paging
...
[fix] paging for item group
2016-09-12 13:01:54 +05:30
robert schouten
4fc70d962b
add customer and supplier names to some reports
2016-09-12 15:23:51 +08:00
RobertSchouten
db33ebb0ff
[fix] status updater percent when qty is minus value
2016-09-12 14:54:46 +08:00
robert schouten
ea3b342dde
fix display unclosed values for trial/balance/sheet
2016-09-12 14:37:58 +08:00
robert schouten
6465711ca6
[fix] missing gl entries warnings
2016-09-12 11:17:14 +08:00
RobertSchouten
bd979ec1ed
[fix] itemwise sales register add sales invoice to delivery note when update stock
...
in item wise sales register put sales invoice into delivery note field when delivery note is null and update stock ticked
2016-09-12 09:46:10 +08:00
Rushabh Mehta
3aa315040f
[fix] paging for item group
2016-09-11 16:48:24 +05:30
Ben Cornwell-Mott
8d0b826840
Added supplier quotation filter for Quoted Item Comparison
2016-09-09 08:00:54 -07:00
Saurabh
b835fef8ac
[enhancement] modify payment request to get payment url ( #6097 )
...
* [enhancement] modify payment request to get payment url
* redirect to payment url if payment initiated via shopping cart
2016-09-09 11:19:22 +05:30
RobertSchouten
f4498307c6
fix allow negatives in leave type check
2016-09-09 11:35:51 +08:00
RobertSchouten
b64fc33be1
stock entries from production_order dont fetch serial number of project
2016-09-09 11:08:39 +08:00
RobertSchouten
2efe20bd9a
stock entries from production_order dont fetch serial number of project
2016-09-09 11:05:22 +08:00
RobertSchouten
b7fc4b76e4
stock entries from production_order dont fetch serial number of project
...
stock entries from production_order dont fetch serial number of project
2016-09-09 11:02:33 +08:00
RobertSchouten
2ecddf58d2
leave balance now fy not calendar
...
changed the default from_date and to_date of Leave Balance Report to FY
2016-09-09 10:48:34 +08:00
RobertSchouten
93c095bf16
allow users without employee with hr permission to view all calendars
2016-09-09 10:15:56 +08:00
RobertSchouten
e4d3809c87
allow users without employee with hr permission to view all calendars
2016-09-09 10:14:07 +08:00
Nabin Hait
e5d13f3156
Update set_student_guardian.py
2016-09-08 17:57:55 +05:30
Neil Trini Lasrado
1e060e98c5
Rearranged feilds in Student Applicant & Student, Split address feild
2016-09-08 16:12:39 +05:30
Rohit Waghchaure
aaa6d1f1bc
patch fix
2016-09-08 12:34:36 +05:30
Nabin Hait
3e669ca656
bumped to version 7.0.42
2016-09-07 17:50:14 +06:00
Nabin Hait
1bf8e70339
Update convert_timelog_to_timesheet.py
2016-09-07 17:19:27 +05:30
Nabin Hait
7c9d981614
Update convert_timelog_to_timesheet.py
2016-09-07 17:17:47 +05:30
Nabin Hait
0a0df2e433
fixed version conflict
2016-09-07 17:01:47 +05:30
Nabin Hait
094d3adba3
bumped to version 7.0.41
2016-09-07 17:31:17 +06:00
Nabin Hait
23147ff881
Patch fixed
2016-09-07 16:59:55 +05:30
Nabin Hait
c16c0ca944
Merge pull request #6310 from rohitwaghchaure/pos_itemwise_tax_issue
...
[Fix] Item level taxes are not getting calculated in POS
2016-09-07 15:59:32 +05:30
Rohit Waghchaure
525900c5c1
[Fix] Item level taxes are not getting calculated in POS
2016-09-07 15:01:08 +05:30
Ben Cornwell-Mott
0261889c0f
Fixed spelling
2016-09-07 02:28:50 -07:00
Chude Osiegbu
fbf27b5031
Further corrections to Currency Exchange table
2016-09-07 03:06:08 +01:00
pawan
7b2bd20a09
[fix] #6254
2016-09-06 18:28:41 +05:30
Nabin Hait
b8b228ed14
Fixed version conflict
2016-09-06 17:56:32 +05:30
Nabin Hait
9b54b78794
bumped to version 7.0.40
2016-09-06 18:25:55 +06:00
Neil Trini Lasrado
52891b55d2
Fixed Student Guardian patch - reload issue
2016-09-06 17:50:42 +05:30
Nabin Hait
f79d7188de
Patch fixed
2016-09-06 17:47:19 +05:30
Rohit Waghchaure
b44efef094
[Issue] Fixed, supplier quotation item uom conversion
2016-09-06 17:21:38 +05:30
Neil Trini Lasrado
6a95723a70
Fixed Student Guardian patch - permission issue
2016-09-06 17:11:13 +05:30
Nabin Hait
194fbaca13
Merge pull request #6291 from RobertSchouten/patch-21
...
fix for closing balance typo
2016-09-06 17:06:56 +05:30
Nabin Hait
06792a93cd
Merge pull request #6289 from KanchanChauhan/barcode-in-stock-reconciliation
...
Barcode added to Stock Reconciliation
2016-09-06 17:06:06 +05:30
Neil Trini Lasrado
49da25dd57
Added patch
2016-09-06 15:45:17 +05:30
RobertSchouten
5ae21053bd
fix for closing balance typo
2016-09-06 15:44:09 +08:00
Neil Trini Lasrado
c20adb532f
Added student Category
2016-09-06 13:08:07 +05:30
Neil Trini Lasrado
d878b66936
Updated Student Doctype
2016-09-06 13:08:07 +05:30
Neil Trini Lasrado
a477e411aa
Updated Guardian Doctype; Added new fields
2016-09-06 13:08:07 +05:30
Kanchan Chauhan
366ba04823
Barcode added to Stock Reconciliation
2016-09-06 12:44:57 +05:30
Chude Osiegbu
10024e13ec
Correction to test_records.json for Currency Exchange doctype
2016-09-06 00:26:27 +01:00
Chude Osiegbu
7be3aa3158
Changes to allow exchange rates on a specific day to be stored in Currency Exchange and to be pulled by the necessary transactions based on the posting date.
2016-09-05 23:35:00 +01:00
Rohit Waghchaure
377c7acd53
[POS] Added offline_pos_name in print format
2016-09-05 17:59:01 +05:30
Nabin Hait
ca627fb806
[fix] Fetch advance journal entry in invoice if it is tagged against linked order
2016-09-05 16:17:08 +05:30
Nabin Hait
406f0a38de
Fixed merge conflicts
2016-09-05 15:44:18 +05:30
Nabin Hait
911e9caa43
bumped to version 7.0.39
2016-09-05 16:13:48 +06:00
Nabin Hait
b239a09951
Merge pull request #6282 from nabinhait/maintenance_schedule_fix
...
Minor fix in maintenance schedule
2016-09-05 15:39:54 +05:30
Nabin Hait
4cb58c410a
Minor fix in maintenance schedule
2016-09-05 15:14:26 +05:30
Nabin Hait
906552a401
Notifications filters for DN, PR and PI
2016-09-05 14:35:40 +05:30
Nabin Hait
8693b5c93a
Minor fixes
2016-09-05 11:51:45 +05:30
Rohit Waghchaure
cc1c7ad2df
added test cases
2016-09-05 00:43:17 +05:30
Rohit Waghchaure
560ba391f9
[Enhancement] Purchase return for rejected qty
2016-09-05 00:43:17 +05:30
manqala
b2b238323b
Suggested Changes to School ( #6223 )
...
* Linkage of academic term to academic year
* School improvements. Modifications to Academic Term, Assessment, Fees, Student Batch, Student Group. Addition of Grading System.
* Removed Grading System from Assessment and put it on Program
* Removed the field Grading System from Program and added it back to Assessment. Added some validations for dates in controller of Academic Term and Academic Year
* Added validation comparing term start dates with academic year start dates and term end dates with academic year end dates where both are available.
* Renamed Grading System to Grading Structure. Implemented the code in Assessment.js to derive the Grade Code from the result entered for the student. Assumes that result is always a number. Will rename the field result in Results to score.
* Added validation to check if any grade intervals were overlapping when a Grading Structure is being saved.
* Corrections to error in autonaming for Academic Term
* Correction in white_list method get_grade in Assessment. Solves problem with grades not being derived when the score is at the boundaries of a grade interval
* Correction to setup_wizard.py to make sure that creation of academic terms in create_academic_term includes the academic_year which is now mandatory
* Corrections to test_records.json for doctype Academic Term
* Correction of test_records.json in doctype Student Groups
* Correction of test_records.json for doctype Student Group 2
* Correction to test_course_schedule.py in doctype Course Schedule
* More corrections to test_course_schedule.py in doctype Course Schedule
* Corrections to test_course_schedule.py
* Updates to Student DocType. Enrollment date, Nationality
* Linkage of academic term to academic year
* School improvements. Modifications to Academic Term, Assessment, Fees, Student Batch, Student Group. Addition of Grading System.
* Removed Grading System from Assessment and put it on Program
* Removed the field Grading System from Program and added it back to Assessment. Added some validations for dates in controller of Academic Term and Academic Year
* Added validation comparing term start dates with academic year start dates and term end dates with academic year end dates where both are available.
* Renamed Grading System to Grading Structure. Implemented the code in Assessment.js to derive the Grade Code from the result entered for the student. Assumes that result is always a number. Will rename the field result in Results to score.
* Added validation to check if any grade intervals were overlapping when a Grading Structure is being saved.
* Corrections to error in autonaming for Academic Term
2016-09-03 21:05:06 +05:30
pawan
bd9a275d5f
[fix] #6254
2016-09-02 16:51:22 +05:30
Nabin Hait
23d79b7059
fixed version conflict
2016-09-02 16:19:54 +05:30
Nabin Hait
533e564867
bumped to version 7.0.38
2016-09-02 16:49:21 +06:00
Nabin Hait
88d7e419ad
Merge pull request #6263 from nabinhait/timesheet_fix_101
...
Migrate employee field to timesheet only if it exists in time log
2016-09-02 16:18:12 +05:30
Nabin Hait
54254cca58
Update set_party_name_in_payment_entry.py
2016-09-02 16:17:42 +05:30
Nabin Hait
142f14dd5c
Migrate employee field to timesheet only if it exists in time log
2016-09-02 14:47:14 +05:30
Nabin Hait
15b26d8b1a
Fixed merge conflicts
2016-09-02 14:29:57 +05:30
Nabin Hait
e1e187bee1
bumped to version 7.0.37
2016-09-02 14:56:33 +06:00
Nabin Hait
5a4ca64c4a
Party name in Payment Entry and cheque print format
2016-09-02 14:20:01 +05:30
Nabin Hait
47fd4c6521
Merge pull request #6261 from nabinhait/order_trends_fix
...
Ignore closed sales/purchase order in trends report
2016-09-02 14:17:30 +05:30
Nabin Hait
e58031ab49
Merge pull request #6249 from rohitwaghchaure/rfq_webform_issue
...
[RFQ] Web form alignment issue
2016-09-02 14:17:22 +05:30
Nabin Hait
f8e374643c
Merge pull request #6257 from nabinhait/letter_head_in_report
...
Default letter head in report printing based on selected company
2016-09-02 14:17:12 +05:30
Nabin Hait
0ef9da65dc
Merge pull request #6260 from rohitwaghchaure/timesheet_status_and_date_issue
...
[Fix] Updated timesheet status, start date, end date
2016-09-02 14:16:53 +05:30
Saurabh
ff910f4c72
[fixes] set filter for warehouse
2016-09-02 13:39:05 +05:30
Nabin Hait
5c69fed218
Ignore closed sales/purchase order in trends report
2016-09-02 12:53:18 +05:30
Rohit Waghchaure
d07557eaf6
[Fix] Updated timesheet status
2016-09-02 12:24:54 +05:30
Nabin Hait
13b37c6346
Default letter head in report printing based on selected company
2016-09-02 11:25:42 +05:30
Rohit Waghchaure
b34ba6bd6e
[RFQ] Web form alignment issue
2016-09-01 19:10:58 +05:30
Rushabh Mehta
b2f0920346
[minor] new global for query report filters
2016-09-01 17:53:42 +05:30
Nabin Hait
5a101ef4c6
Fixed merge conflict
2016-09-01 12:43:24 +05:30
Nabin Hait
600ab0f7a0
bumped to version 7.0.36
2016-09-01 13:12:29 +06:00
Nabin Hait
9afee28c36
Merge pull request #6243 from rohitwaghchaure/timesheet_issue
...
[Patch] Check table exist
2016-09-01 12:38:30 +05:30
Rohit Waghchaure
86f143863f
[Patch] Check table exist
2016-09-01 12:37:20 +05:30
Nabin Hait
2490ea0b91
Fixed merge conflict
2016-09-01 12:29:31 +05:30
Nabin Hait
b6f33c7c4f
bumped to version 7.0.35
2016-09-01 12:56:11 +06:00
Nabin Hait
bb2bceef62
Merge pull request #6229 from rohitwaghchaure/pos_payment_issue
...
[POS] Fixed POS Sales Invoice when Payment Table is Empty
2016-09-01 12:25:31 +05:30
Rohit Waghchaure
7f165f19d2
[Fix] Timesheet employee is missing in patch
2016-09-01 12:07:21 +05:30
Rohit Waghchaure
774ce63b75
remove mode of payment, migrate mode of payment from v6 to v7
2016-08-31 21:21:41 +05:30
Rohit Waghchaure
879cb6ebee
[POS] Fixed POS Sales Invoice when Payment Table is Empty
2016-08-31 14:41:48 +05:30
Nabin Hait
c0c2f75159
fixed conflict
2016-08-31 12:36:03 +05:30
Nabin Hait
16e15283b5
Imported unicode literals
2016-08-31 12:33:22 +05:30
Nabin Hait
566759acae
Merge pull request #6211 from rohitwaghchaure/v7.1_fixes
...
[Fix] Billing Hours showing blank on sales invoice
2016-08-31 12:12:48 +05:30
Nabin Hait
88e3487f03
Merge pull request #6206 from neilLasrado/docs
...
Updated Docs for Schools Module
2016-08-31 12:12:17 +05:30
Nabin Hait
fa3146b444
Merge pull request #6218 from RobertSchouten/patch-20
...
fix for duplicate to bill status comment on submit
2016-08-31 11:09:47 +05:30
Rohit Waghchaure
d39f53319d
Added zero value condition
2016-08-31 02:09:15 +05:30
Rohit Waghchaure
609e2b4ca3
[POS] Currency format issue
2016-08-31 02:04:53 +05:30
RobertSchouten
ba4456b42b
dont run duplicate set status on submit
2016-08-30 08:21:20 +08:00
Rohit Waghchaure
da7fb70009
[Patch] Fixed error unknown column 'type' in 'field list'
2016-08-30 01:41:35 +05:30
Rohit Waghchaure
a57bf5ee2e
[fix] Precision issue for field conversion rate in POS
2016-08-30 01:05:01 +05:30
Nabin Hait
d260602cae
Merge pull request #6202 from KanchanChauhan/component-type-added
...
'Type' field added to Salary Component
2016-08-29 16:19:05 +05:30
Kanchan Chauhan
145f87c068
'Type' field added to Salary Component
2016-08-29 15:26:57 +05:30
Rohit Waghchaure
a2bf16bfaa
[Fix] Billing Hours showing blank on sales invoice
2016-08-29 13:37:13 +05:30
Nabin Hait
338e63c448
Fixed version conflict
2016-08-29 11:47:50 +05:30
Nabin Hait
11c2207a8a
bumped to version 7.0.34
2016-08-29 12:17:30 +06:00
Nabin Hait
a0da708d51
Merge pull request #6185 from rohitwaghchaure/fixes_and_cleanup_pos
...
[POS] Fixes and cleanup
2016-08-29 11:42:09 +05:30
Rushabh Mehta
9d1b56f423
[minor] validate permission in Process Payroll and all products fix for home page
2016-08-29 11:03:10 +05:30
Rohit Waghchaure
63bdd679d0
[POS] Fixes and cleanup
2016-08-27 02:53:36 +05:30
Kanchan Chauhan
dd96cbd012
Coded column deleted, column added from UI
2016-08-26 14:32:38 +05:30
Nabin Hait
4403cf71b5
Merge pull request #6152 from rohitwaghchaure/profitability_report
...
[Report] Profitability Analysis
2016-08-26 13:21:01 +05:30
Rohit Waghchaure
69aebf4db5
fixes test cases, added patch
2016-08-26 13:18:14 +05:30
Rohit Waghchaure
0cb171feb2
[Enhancement] Added billing hours for account user in timesheet
2016-08-26 13:17:46 +05:30
Nabin Hait
e334813daf
Merge pull request #6166 from neilLasrado/demo
...
Merged Schools Demo into ERPNext
2016-08-26 13:05:43 +05:30
Rohit Waghchaure
6462ba4e0b
minor changes
2016-08-26 12:42:52 +05:30
Nabin Hait
0da75aede3
Fixed merge conflict
2016-08-26 12:40:02 +05:30
Nabin Hait
6592899741
bumped to version 7.0.33
2016-08-26 13:07:19 +06:00
Nabin Hait
06b27757ab
Merge pull request #6179 from rohitwaghchaure/minor_fix_patch
...
[Sales Return] Minor fix in patch
2016-08-26 12:33:33 +05:30
Rohit Waghchaure
e21e1ebae2
[Sales Return] Minor fix in patch
2016-08-26 12:31:41 +05:30
Nabin Hait
0a99b4347b
Party mandatory message
2016-08-26 12:30:45 +05:30
Nabin Hait
a26bb96d2d
Merge pull request #6178 from nabinhait/status_updater_fix
...
Ignore validating billed amount against order if order item amount is zero
2016-08-26 12:09:39 +05:30
Nabin Hait
e244cde9c3
Merge pull request #6158 from KanchanChauhan/salary-structure-layout
...
Layout changes in Salary Structure
2016-08-26 12:00:29 +05:30
Nabin Hait
c97f7cac80
Merge pull request #6162 from strixaluco/patch-1
...
[minor] docs typo fix
2016-08-26 11:59:11 +05:30
Nabin Hait
fbe1563101
Merge pull request #6168 from rohitwaghchaure/hotfix
...
[POS] Fixed payment gl entry for sales return
2016-08-26 11:58:46 +05:30
Nabin Hait
47a3f639ed
Ignore validating billed amount against order if order item amount is zero
2016-08-26 11:39:39 +05:30
Nabin Hait
6b8435c902
Merge pull request #6172 from joopdorresteijn/patch-1
...
Update user-restriction.md
2016-08-26 10:50:54 +05:30
Neil Trini Lasrado
067245933e
Fixed Demo
2016-08-25 18:31:42 +05:30
Rohit Waghchaure
efb5bf2cfc
[POS] Fixed payment gl entry for sales return
2016-08-25 16:23:47 +05:30
Rushabh Mehta
cdfd35c9ca
New Languages added:
...
frappe/translations/am.csv
frappe/translations/en-US.csv
frappe/translations/en.csv
frappe/translations/es-AR.csv
frappe/translations/es-CL.csv
frappe/translations/es-GT.csv
frappe/translations/es-MX.csv
frappe/translations/es-NI.csv
frappe/translations/fr-CA.csv
frappe/translations/ku.csv
frappe/translations/lo.csv
frappe/translations/lt.csv
frappe/translations/ps.csv
frappe/translations/rw.csv
frappe/translations/sr-SP.csv
2016-08-25 15:23:40 +05:30
joopdorresteijn
8da1e9eeb8
Update user-restriction.md
...
Sales user also doesn't exist
2016-08-25 15:46:24 +08:00
Rohit Waghchaure
0788ee62c1
Fixed patch, 'SalesInvoice' object has no attribute 'account_for_change_amount'
2016-08-25 12:46:34 +05:30
strixaluco
5380a1c56a
Update price-lists.md
...
Repetitive sentence removed.
2016-08-25 10:40:42 +08:00
Rohit Waghchaure
1e8732abc2
removed old report
2016-08-24 19:20:58 +05:30
Rohit Waghchaure
5794ffd43d
added filters project and cost center in profit and loss statement, open profit and loss statement on click of cost center/project in profitability analysis
2016-08-24 19:12:14 +05:30
Rohit Waghchaure
1255a6627e
project based profitability Analysis
2016-08-24 18:01:39 +05:30
Rohit Waghchaure
78e08b8af5
[Report] Profitability Analysis
2016-08-24 18:00:22 +05:30
Rohit Waghchaure
fb432821bf
[Report] Cost center wise profitability
2016-08-24 18:00:22 +05:30
Rushabh Mehta
b9b36a2062
[minor] update salary structure company if not set
2016-08-24 15:20:43 +05:30
Rushabh Mehta
caeb9dc025
[minor] update salary structure company if not set
2016-08-24 15:14:48 +05:30
Rushabh Mehta
5fb2bc2b87
[fix] [versioning]
2016-08-24 12:51:45 +05:30
Rushabh Mehta
547dff5d5b
[version] 7.1-beta
2016-08-24 12:44:32 +05:30
strixaluco
7d60dd7e21
Update price-lists.md
2016-08-24 09:42:07 +08:00
strixaluco
a623a59f9e
[minor] docs typo fix
...
availale → available
2016-08-24 09:36:17 +08:00
Rushabh Mehta
fcb793e4dd
[minor] language fields are now links
2016-08-23 16:51:18 +05:30
Kanchan Chauhan
22073f3a7f
Layout changes in Salary Structure
2016-08-23 16:14:04 +05:30
Nabin Hait
cfbd0199eb
Merge branch 'master' into develop
2016-08-23 12:10:56 +05:30
Nabin Hait
db05ac2414
bumped to version 7.0.32
2016-08-23 12:40:56 +06:00
Rohit Waghchaure
ea6d7e9b09
[Fix] decimal button not working
2016-08-23 11:39:44 +05:30
Nabin Hait
26f9673ad9
Merge pull request #6126 from rohitwaghchaure/multiyear_financial_statements
...
[Enhancement] Multi year financial statements
2016-08-23 11:32:08 +05:30
Nabin Hait
423f39b4f0
Merge pull request #6101 from bcornwellmott/ppt_test2
...
Upgraded PPT for more variety of MR creation options. Added tests
2016-08-23 11:31:17 +05:30
Rushabh Mehta
3d93ddc606
[fix] docs links
2016-08-22 18:48:04 +05:30
Nabin Hait
c525449c13
Merge pull request #6139 from PawanMeh/fixes_6089
...
[fix] #6089
2016-08-22 18:10:14 +05:30
Rohit Waghchaure
ca4d9b54cd
fixed accumulated values for cash flow
2016-08-22 17:51:58 +05:30
Pawan Mehta
bee3b40725
Update gross_profit.py
2016-08-22 17:47:13 +05:30
pawan
18bb431baa
[fix] #6089
2016-08-22 17:27:22 +05:30
Nabin Hait
8f782e71af
Merge pull request #6149 from nabinhait/change_log_v7
...
Change logs for v7
2016-08-22 15:56:32 +05:30
Nabin Hait
dac204b1e3
Merge pull request #6124 from rohitwaghchaure/hotfix
...
[POS] Fixed issue of paid amount, write off account
2016-08-22 15:56:20 +05:30
Nabin Hait
9c786948d5
Merge pull request #6125 from nabinhait/lcv_hotfix
...
[fix] Repost only distinct purchase receipts and invoices
2016-08-22 15:53:21 +05:30
Nabin Hait
6f1795cb3d
Merge pull request #6146 from neilLasrado/operation
...
Operations related fixes
2016-08-22 15:52:57 +05:30
Nabin Hait
01b555edc7
Change logs for v7
2016-08-22 15:50:21 +05:30
Nabin Hait
c95a3180c2
Merge pull request #6127 from KanchanChauhan/demo-fixes-salary
...
Demo updated for new salary structure
2016-08-22 15:22:41 +05:30
Neil Trini Lasrado
20b01873ab
Made operation mandatory and removed mandatory from operation desc in Production Order Operation, set operation name as desc in operation master if desc is blank
2016-08-22 15:05:50 +05:30
Faris Ansari
3a6155b1b9
add help_links.js
2016-08-22 14:37:22 +05:30
Nabin Hait
5c9a2b39bc
Revert "Ignore validating mandatory fields on converting timelogs to timesheets"
2016-08-22 14:36:33 +05:30
Nabin Hait
1b9f8006c2
Merge pull request #6140 from nabinhait/timesheet_patch_fix
...
Ignore validating mandatory fields on converting timelogs to timesheets
2016-08-22 14:36:08 +05:30
Nabin Hait
9239ed5c44
Ignore validating mandatory fields on converting timelogs to timesheets
2016-08-22 14:35:06 +05:30
pawan
851e05672c
[fix] #6089
2016-08-22 14:25:17 +05:30
Kanchan Chauhan
681a86d70e
[Minor]Fixes
2016-08-22 00:28:20 +05:30
Rohit Waghchaure
26b646f8a3
Added validation for fiscal year
2016-08-21 17:14:12 +05:30
Kanchan Chauhan
db197d593a
Demo updated for new salary structure
2016-08-20 00:30:59 +05:30
Rohit Waghchaure
713e2b7b62
[POS] Fixed issue of paid amount, write off account
2016-08-19 19:27:16 +05:30
Rohit Waghchaure
4275c30059
[Enhancement] Multi year financial statements
2016-08-19 18:04:32 +05:30
Nabin Hait
3b6dc141c6
[fix] Repost only distinct purchase receipts and invoices
2016-08-19 16:39:50 +05:30
Nabin Hait
4cda566139
Merge pull request #6120 from KanchanChauhan/images-for-salary-doc
...
Better images for redesigned salary docs
2016-08-19 12:50:25 +05:30
Kanchan Chauhan
3769996dfd
Images for redesigned salary docs
2016-08-18 23:06:16 +05:30
Nabin Hait
6b3706aef8
Update move_employee_parent_to_child_in_salary_structure.py
2016-08-18 17:32:53 +05:30
Rushabh Mehta
69349f2672
[fix] [patch] column conversion before item reload
2016-08-18 17:06:55 +05:30
Nabin Hait
b5951b72f3
Merge pull request #5924 from KanchanChauhan/salary-structure-changes
...
Formula based Salary Structure
2016-08-18 16:39:58 +05:30
Nabin Hait
9a1bcac576
bumped to version 7.0.31
2016-08-18 16:45:49 +06:00
Nabin Hait
e68b089187
Query for warehouse in delivery note
2016-08-18 16:14:23 +05:30
Nabin Hait
d8a372587d
[fix] Legend in support analytics chart
2016-08-18 16:14:23 +05:30
Nabin Hait
f04ce3c5a6
[fix] check expense agaist budget
2016-08-18 16:14:23 +05:30
Nabin Hait
50f8262ac7
Currency fix in reports
2016-08-18 16:14:23 +05:30
Nabin Hait
f0937bf722
bumped to version 7.0.30
2016-08-18 16:43:15 +06:00
Nabin Hait
4810831678
Merge pull request #6107 from neilLasrado/develop
...
[Fix] Enroll Students from Student Applicants in Program Enrollment Tool.
2016-08-18 14:21:11 +05:30
Nabin Hait
7cdc6fd789
Merge pull request #6115 from rohitwaghchaure/pos_stock_update_issue
...
[POS] Fixed stock update issue
2016-08-18 14:20:26 +05:30
Rushabh Mehta
03e5ea3a0d
Merge pull request #6114 from hereabdulla/patch-1
...
Update employee_list.js
2016-08-18 14:05:58 +05:30
Rohit Waghchaure
9d5a07d101
[POS] Fixed stock update issue
2016-08-18 13:27:06 +05:30
Kanchan Chauhan
bccf0fa041
[WIP] Formula based Salary Structure and multiple employees for same Salary Structure
2016-08-18 13:02:39 +05:30
Rushabh Mehta
b7bc6bd75d
[fix] better message for cost center, fixes #6109
2016-08-18 12:50:58 +05:30
Abdulla P I
23a6d05622
Update employee_list.js
2016-08-18 12:43:19 +05:30
Rushabh Mehta
b969c2cb60
[minor] budget link in cost center, fixes #6093
2016-08-18 12:36:20 +05:30
Ben Cornwell-Mott
a7c98ba0fe
More formatting adjustments
2016-08-17 05:56:00 -07:00
Ben Cornwell-Mott
d5a9d475e7
Adjusted formatting
2016-08-17 05:45:43 -07:00
Ben Cornwell-Mott
06bfecea73
Fixed formatting of code and repositioned checkboxes in PPT.
2016-08-17 05:42:25 -07:00
Neil Trini Lasrado
c4e71fcc51
[Fix] Enroll Students from Student Applicants in Program Enrollment Tool.
2016-08-17 17:37:19 +05:30
Nabin Hait
734cf70b43
bumped to version 7.0.29
2016-08-17 17:41:09 +06:00
Nabin Hait
6fe3ac49cf
Merge pull request #6039 from rohitwaghchaure/allow_to_edit_change_amount
...
Allow to edit change amount
2016-08-17 17:08:54 +05:30
Rohit Waghchaure
e4e69ec027
changed field name, validation for change amount account, validation for serial no qty
2016-08-17 16:20:13 +05:30
Nabin Hait
40c60b6182
Default material request type field restored
2016-08-17 16:14:24 +05:30
Nabin Hait
95c998109d
Merge pull request #6043 from aruizramon/purchase-taxes-client-validation
...
Validate on changing from Total to Valuation/Valuation&Total when add…
2016-08-17 12:12:14 +05:30
Nabin Hait
33bcaa8a07
Merge pull request #6080 from bcornwellmott/quoteditem_picksupplier
...
Quoted Item Comparison: Button for setting the default_supplier
2016-08-17 11:36:55 +05:30
Nabin Hait
4da2c81641
Merge pull request #6094 from rmehta/sales-purchase-items
...
[revert] is_sales_item, is_purchase_item back
2016-08-17 11:30:37 +05:30
Ben Cornwell-Mott
e977fc5dee
Upgraded PPT for more variety of MR creation options. Added tests
2016-08-16 06:01:52 -07:00
Nabin Hait
613ef344f3
Patch fixed for v6 to v7 migration
2016-08-16 18:31:26 +05:30
Nabin Hait
0c1be8df35
Merge pull request #6096 from rohitwaghchaure/minor_fix
...
[Fix] lwp salary structure
2016-08-16 18:17:14 +05:30
Umair Sayyed
8f7708ed5b
docs updated
2016-08-16 18:13:12 +05:30
Umair Sayyed
1bd9f22add
updated docsgd
2016-08-16 18:08:24 +05:30
Umair Sayyed
f369b5951e
updated docs
2016-08-16 18:08:00 +05:30
Umair Sayyed
81995389ac
updated docs
2016-08-16 18:08:00 +05:30
Neil Trini Lasrado
999f34a568
Updated Docs for Schools Module
2016-08-16 17:50:08 +05:30
Rohit Waghchaure
fe913c9969
[Fix] lwp salary structure
2016-08-16 15:43:50 +05:30
Nabin Hait
91d6544958
bumped to version 7.0.28
2016-08-16 15:55:33 +06:00
Nabin Hait
39bc4b2a4c
Ignore overlap validation while creating timesheet from existing time logs
2016-08-16 15:18:28 +05:30
Rushabh Mehta
d973c1606a
[revert] is_sales_item, is_purchase_item back
2016-08-16 11:32:08 +05:30
Nabin Hait
df9cf2ef8e
Merge pull request #6068 from neilLasrado/develop
...
Added image field to guardian, program enrollment, fixed some typos
2016-08-16 11:01:58 +05:30
Nabin Hait
528ab53b3a
Merge pull request #6067 from rohitwaghchaure/pos_fixes
...
[POS] fixed issue of negative stock
2016-08-16 11:00:31 +05:30
Rohit Waghchaure
9cd356c7f0
[POS] Fixed print qty decimal issue
2016-08-16 10:44:21 +05:30
Rushabh Mehta
de08639d49
[minor] fixes to patches while moving from v5
2016-08-16 10:01:56 +05:30
Neil Trini Lasrado
987009bf35
Update quotation.json
2016-08-12 16:44:00 +05:30
Rushabh Mehta
3f22ec9536
bumped to version 7.0.27
2016-08-12 12:23:08 +06:00
Rushabh Mehta
d643f2b249
[minor] fixes #6074 ;
2016-08-12 10:36:59 +05:30
Ben Cornwell-Mott
b739dd24b2
Added a button to assist in setting the default_supplier
2016-08-11 19:45:55 -07:00
Neil Trini Lasrado
c917423b01
Fixed typo in quotation, added image feild in Program Enrollment
2016-08-11 18:22:45 +05:30
Neil Trini Lasrado
6a23016f90
Added image feild to guardian
2016-08-11 17:28:21 +05:30
Rushabh Mehta
730f3e7aba
[minor] remove validation #4904
2016-08-11 17:17:26 +05:30
Rohit Waghchaure
033ed00c56
[POS] fixed issue of negative stock
2016-08-11 16:37:29 +05:30
Rushabh Mehta
6c0d9579d2
Merge pull request #6055 from rohitwaghchaure/bank_reconciliation_statement_report_issue
...
[Fix] No permission to read DocType for account user in bank reconciliation statement report
2016-08-11 10:55:10 +05:30
Rohit Waghchaure
e78ef5f8c8
[Fix] No permission to read DocType for account user in bank reconciliation statement report
2016-08-11 00:46:15 +05:30
Rohit Waghchaure
315a5e1b4d
[Fix] Debit and credit not equal for purchase invoice, if update stock is yes and taxes is defined
2016-08-11 00:35:00 +05:30
Rushabh Mehta
cf80f850bd
bumped to version 7.0.26
2016-08-10 20:17:23 +06:00
Rushabh Mehta
36f2d4f81e
[fix] patch for schools;
2016-08-10 19:46:12 +05:30
Rushabh Mehta
a7d92bc8f6
Merge pull request #6050 from rohitwaghchaure/pos_serial_no_search_issue
...
[Fix] Serial no search issue, if serial no is similar with item code.
2016-08-10 18:52:17 +05:30
Rushabh Mehta
18480bdc23
bumped to version 7.0.25
2016-08-10 18:49:14 +06:00
Rushabh Mehta
4b08f9ad1f
[fix] patch
2016-08-10 18:18:14 +05:30
Rohit Waghchaure
ea5a32d304
[Fix] Searial no search issue, if serial no is similar with item code
2016-08-10 17:18:52 +05:30
Rushabh Mehta
d908b99b00
bumped to version 7.0.24
2016-08-10 15:04:39 +06:00
Rushabh Mehta
6646960e31
Merge pull request #6045 from bcornwellmott/quotereportcurrency
...
Quoted item currency
2016-08-10 14:26:25 +05:30
Rushabh Mehta
185c247286
Merge pull request #6024 from rohitwaghchaure/get_account_of_payment_mode_issue
...
[Fix] Get account of the mode of payment on sales invoice and pos profile
2016-08-10 14:25:42 +05:30
Rushabh Mehta
a56121a342
Merge pull request #6034 from netchampfaris/ui-fixes
...
[ui] fix thumbnail for long images in image view frappe/erpnext#1939
2016-08-10 14:24:58 +05:30
Rushabh Mehta
cc054a5bbc
[minor] fix reload for school migrate patch
2016-08-10 14:24:16 +05:30
pawan mehta
399a4bf201
[fix] #5723
2016-08-10 13:20:16 +05:30
Rohit Waghchaure
70be24d6f0
[Fix] Get account of the mode of payment on sales invoice and pos profile
2016-08-10 13:16:39 +05:30
Rushabh Mehta
6ddbb8820a
Merge pull request #6047 from revant/develop
...
[fix] Issue #6046 group_name replaced with name
2016-08-10 12:57:53 +05:30
Rushabh Mehta
6252e935a0
Merge pull request #5844 from bcornwellmott/quoteditemplot-1
...
Added C3.JS Plot to compare quotes in Print view
2016-08-10 12:50:36 +05:30
Revant Nandgaonkar
5bbc68df8b
[fix] Issue #6046 group_name replaced with name
2016-08-10 11:06:31 +05:30
aruizramon
8bd2487533
semicolon
2016-08-09 16:04:45 -04:00
Alec Ruiz-Ramon
08fb39f1ba
Validate on changing from Total to Valuation/Valuation&Total when add_deduct_tax is 'Deduct'
2016-08-09 15:38:34 -04:00
Rohit Waghchaure
baef2624a2
Given provision to enter write off and change amount on POS
2016-08-10 00:50:53 +05:30
Nabin Hait
f44b5152d2
Portal settings for schools
2016-08-09 17:08:13 +05:30
Rushabh Mehta
ec2d09c557
[minor] setting up website optional in setup wizard
2016-08-09 16:44:37 +05:30
Nabin Hait
08e2105b09
bumped to version 7.0.23
2016-08-09 16:00:31 +06:00
Nabin Hait
11d565b07c
Update migrate_schools_to_erpnext.py
2016-08-09 15:23:01 +05:30
Nabin Hait
508542d4d9
bumped to version 7.0.22
2016-08-09 15:30:16 +06:00
Nabin Hait
50ff8471e0
Merge pull request #6023 from neilLasrado/docs
...
Merged docs for schools to erpnext docs
2016-08-09 14:23:48 +05:30
Nabin Hait
2275cd15e6
[patch] Reload Purchase Invoice in patch
2016-08-09 14:21:29 +05:30
Faris Ansari
d217387400
[ui] fix thumbnail for long images in image view
2016-08-09 14:15:59 +05:30
Nabin Hait
ee018b5ae1
[fix]Patch order changed. Fixed #6026
2016-08-09 11:27:28 +05:30
Rohit Waghchaure
c41ab8d15b
Added change amount account
2016-08-08 23:19:18 +05:30
Rohit Waghchaure
7127a8f522
Allow user to edit change amount from sales invoice form for is pos
2016-08-08 23:19:18 +05:30
Neil Trini Lasrado
acf85dffc5
Merged docs for schools to erpnext docs
2016-08-08 18:59:15 +05:30
Nabin Hait
d5c83122f2
bumped to version 7.0.21
2016-08-08 16:20:00 +06:00
Nabin Hait
ae65172dca
Added 'Ledger' button to show accounting entries against PCV
2016-08-08 15:44:45 +05:30
Nabin Hait
d261d40c7e
Fixed test cases for period closing voucher
2016-08-08 15:44:45 +05:30
Nabin Hait
4b231c2692
Merge pull request #6018 from rohitwaghchaure/add_calendar_to_timesheets
...
Added a Calendar view for timesheet logs
2016-08-08 14:46:18 +05:30
Ben Cornwell-Mott
ed1b8cfe3f
Added a Calendar view for timesheet logs
2016-08-08 14:17:06 +05:30
Nabin Hait
99d4ff4a29
Repost gle for future transactions if update stock checked in back dated purchase invoice
2016-08-08 14:12:58 +05:30
Nabin Hait
595dbd6dea
Merge pull request #5963 from neilLasrado/assessment
...
Assessment Groups
2016-08-08 12:50:10 +05:30
Nabin Hait
f979b18ddb
Merge pull request #6003 from neilLasrado/bug-fix
...
[bug fix] Fixed bug in fee caclulation, renamed functions
2016-08-08 12:44:27 +05:30
Nabin Hait
3ef6e7847e
Merge pull request #6010 from rohitwaghchaure/minor_fix_pos
...
[Fix] pos ambiguous issue
2016-08-08 12:40:28 +05:30
Nabin Hait
2dba3b5e25
Merge pull request #6012 from bohlian/develop
...
[Enhancement + Fix] Disable buttons when Production Order is Stopped, Fixed Stopping and Re-Opening of Production Order
2016-08-08 12:40:00 +05:30
Nabin Hait
2cb8c6a867
Merge pull request #6015 from nabinhait/ar_ap_cols
...
[fix] Label for ageing cols in AR/AP report
2016-08-08 12:37:19 +05:30
Nabin Hait
c30c342bdf
[fix] Label for ageing cols in AR/AP report
2016-08-08 11:47:13 +05:30
Neil Trini Lasrado
f02a0d4d24
[bug fix] Fixed bug in fee caclulation, renamed functions
2016-08-08 11:09:29 +05:30
Ben Cornwell-Mott
44f85fed26
Converted to a common currency (company)
2016-08-07 10:29:51 -07:00
Rohit Waghchaure
cd6c00d505
[Fix] pos ambiguous issue
2016-08-07 14:29:21 +05:30
Javier Wong
e6cd228288
[Enhancement + Fix] Disable buttons when Production Order is Stopped, Fixed Stopping and Re-Opening of Production Order
...
Disabled the following buttons:
- Make Timesheet
- Start
- Finish `
- A better fix than 316f78f859
2016-08-07 16:01:49 +08:00
Saurabh
ec14c81ebd
[minor][fix] return if account details not found
2016-08-07 08:52:45 +05:30
Nabin Hait
537301a210
bumped to version 7.0.20
2016-08-06 14:45:34 +06:00
Nabin Hait
f1d8fc3d51
Merge pull request #6008 from KanchanChauhan/leave-application-validation
...
Leave Application Validation for processed salary
2016-08-06 14:13:46 +05:30
Nabin Hait
20b4666e89
Merge pull request #5958 from rohitwaghchaure/minor_fixes_and_cleanups
...
fixes and cleanups.
2016-08-06 14:11:24 +05:30
Rushabh Mehta
84969bdb2d
Merge pull request #6007 from KanchanChauhan/task-json-fixed
...
[Minor] Removed hard coded success URL from task webform
2016-08-06 13:42:50 +05:30
Kanchan Chauhan
705384d8fe
Leave Application Validation for processed salary
2016-08-06 13:42:18 +05:30
Rohit Waghchaure
b77a1057ce
fixes and cleanups.
2016-08-06 12:45:02 +05:30
Kanchan Chauhan
93b1f2ad72
[Minor] Removed hard coded success URL
2016-08-06 12:09:08 +05:30
Revant Nandgaonkar
9a433ffca1
[fix] success_url Issue #6004
2016-08-05 21:44:34 +05:30
Nabin Hait
82446bf83e
bumped to version 7.0.19
2016-08-05 17:15:14 +06:00
Nabin Hait
c72f8976aa
Merge pull request #5989 from umairsy/2aug
...
updated docs
2016-08-05 15:50:34 +05:30
Neil Trini Lasrado
50b2278eda
Renamed fields in Examination Doctype, Renamed examination doctype to Assessment, Added Assessment Group, added patch
2016-08-05 15:09:49 +05:30
Nabin Hait
e1d85f2467
Payment Entry fix: Unallocated amount in payment entry considering deductions
2016-08-05 14:51:36 +05:30
Umair Sayyed
3962cded76
updated docs
2016-08-04 19:01:02 +05:30
Umair Sayyed
66360f694e
updated docs
2016-08-04 19:01:02 +05:30
Umair Sayyed
5dba950afa
docs update
2016-08-04 19:01:02 +05:30
Umair Sayyed
6a3f51bee2
updated docs
2016-08-04 19:01:02 +05:30
Rushabh Mehta
efe1ab742f
[minor] fixes for demo
2016-08-04 17:29:46 +05:30
Rushabh Mehta
4d32d5301a
Merge pull request #5996 from KanchanChauhan/users-selection-for-project
...
'Project Users' role not required to add user to the project
2016-08-04 14:25:52 +05:30
Kanchan Chauhan
58bc00f954
Project Users role not required to add user to the project
2016-08-04 14:21:20 +05:30
Nabin Hait
155074479b
Merge pull request #5986 from nabinhait/pe_fix_101
...
Set received amount based on paid amount if currency is same
2016-08-03 17:54:01 +05:30
Nabin Hait
764e6ef210
default material request type field restored in item
2016-08-03 17:32:26 +05:30
Rushabh Mehta
f2d89987f5
[minor] ignore email validation if comes from email;
2016-08-03 16:42:29 +05:30
Rushabh Mehta
06c92a782a
[fix] small text for route
2016-08-03 16:27:11 +05:30
Nabin Hait
f43e49f378
Set received amount based on paid amount if currency is same
2016-08-03 14:17:05 +05:30
Rushabh Mehta
ea5ad84c5e
[minor] fix image for demo
2016-08-02 21:26:04 +05:30
Nabin Hait
1b9a01b6c3
bumped to version 7.0.18
2016-08-02 18:37:52 +06:00
Nabin Hait
ae921ce2c8
[patch] Set default material request type in Item based on default bom
2016-08-02 18:02:31 +05:30
Nabin Hait
cc13a9f2f6
bumped to version 7.0.17
2016-08-02 17:46:46 +06:00
Nabin Hait
97c74f9f8f
Merge pull request #5925 from rohitwaghchaure/bcornwellmott-1
...
PPT looks at default MR type in Item to set MR type.
2016-08-02 17:15:02 +05:30
Nabin Hait
6620e2a494
Test case fixed for pos gl entry
2016-08-02 17:14:28 +05:30
Rohit Waghchaure
08aadb853c
PPT looks at default MR type in Item to set MR type.
2016-08-02 16:59:03 +05:30
Nabin Hait
3bb1a421f0
Change amount calcualtion in POS if there is write off amount and gl entries in this scenario
2016-08-02 16:41:15 +05:30
Nabin Hait
afc0bbc8ff
Merge pull request #5964 from frappe/neilLasrado-patch-1-1
...
Fixes for patch - make_guardian.py
2016-08-02 11:30:45 +05:30
Rohit Waghchaure
7f031d1bfd
minor fix in payment entry
2016-08-02 11:07:40 +05:30
Neil Trini Lasrado
5bb2f56b47
Update make_guardian.py
2016-08-02 00:01:00 +05:30
Nabin Hait
94542e104c
bumped to version 7.0.16
2016-08-01 18:37:20 +06:00
Nabin Hait
3b8109780f
[patch] reload guardian interest
2016-08-01 17:59:46 +05:30
Nabin Hait
f863055b91
Merge pull request #5955 from umairsy/28jul
...
added documentation for the new features
2016-08-01 17:53:26 +05:30
Nabin Hait
ed75667f64
bumped to version 7.0.15
2016-08-01 18:18:27 +06:00
Nabin Hait
08aec855c4
[patch] fixed reload doc and permission issue in guardian patch
2016-08-01 17:46:56 +05:30
Umair Sayyed
e96b3ce725
added documentation for the new features
2016-08-01 17:42:30 +05:30
Nabin Hait
798f3897a3
bumped to version 7.0.14
2016-08-01 18:05:02 +06:00
Nabin Hait
29a8a93aa1
Run guardian patch only if student doctype exists and there is father_name column
2016-08-01 17:31:17 +05:30
Nabin Hait
cd339b2ecf
bumped to version 7.0.13
2016-08-01 16:54:53 +06:00
Nabin Hait
c9d04ab1fc
Merge pull request #5952 from nabinhait/lcv_reference
...
[patch] Update refdoc in Landed Cost Voucher
2016-08-01 16:23:33 +05:30
Nabin Hait
6f84026c24
Merge pull request #5951 from nabinhait/patch_fix_104
...
[patch] Reload RFQ and timesheet before removing customer/supplier roles
2016-08-01 16:15:47 +05:30
Rushabh Mehta
24f45af27e
[fix] minor dont make lead for invalid email
2016-08-01 16:07:56 +05:30
Nabin Hait
3c364dd5b8
[patch] Update refdoc in Landed Cost Voucher
2016-08-01 15:53:36 +05:30
Nabin Hait
5940dc1a8e
[patch] Reload RFQ and timesheet before removing customer/supplier roles
2016-08-01 15:30:44 +05:30
Neil Trini Lasrado
3e78558357
Moved Intrest to HR module
2016-08-01 15:18:36 +05:30
Neil Trini Lasrado
74dbd168c2
[new Feature] Added guardian master
2016-08-01 15:08:04 +05:30
Nabin Hait
de745e1df6
bumped to version 7.0.12
2016-08-01 14:42:47 +06:00
Nabin Hait
77dd190cc8
Merge pull request #5939 from rohitwaghchaure/pos_batch_no_fixes
...
[Fix] batch no searching in pos & minor fixes
2016-08-01 13:17:00 +05:30
Nabin Hait
ddde4bec39
Merge pull request #5932 from rohitwaghchaure/demo_records
...
[demo] sales and purchase returns
2016-08-01 13:11:54 +05:30
Nabin Hait
9ed1891440
Merge pull request #5931 from neilLasrado/student-log
...
[new feature] Added Student Log
2016-08-01 13:10:19 +05:30
Nabin Hait
dfcf55d010
Merge pull request #5948 from nabinhait/department_role
...
Assigned permissions for Academic User role in Department
2016-08-01 13:07:02 +05:30
Nabin Hait
66126ffc7a
Merge pull request #5938 from nabinhait/salary_renaming
...
Delete old salary earning and deduction doctypes
2016-08-01 13:06:52 +05:30
Rohit Waghchaure
a88dec8775
[Fix] batch no searching in pos
2016-08-01 13:01:13 +05:30
Nabin Hait
86a477d07e
Assigned permissions for Academic User role in Department
2016-08-01 12:51:04 +05:30
Nabin Hait
bc691dccba
Changed the order of the patch
2016-08-01 12:36:28 +05:30
Nabin Hait
e9674f8866
Create columns for custom fields in new table Salary Detail and Component
2016-08-01 12:13:11 +05:30
Nabin Hait
84306ccc4c
Salary component fixtures
2016-08-01 11:54:19 +05:30
Nabin Hait
feed313a66
Delete old salary earning and deduction doctypes
2016-08-01 11:54:19 +05:30
Nabin Hait
981f6ea34e
minor fix for item and employee link formatter
2016-07-31 11:44:43 +05:30
Nabin Hait
ba1c34eef3
Merge pull request #5919 from bcornwellmott/timesheet_dates
...
Timesheets update on date changes in Salary Slip
2016-07-29 20:31:01 +05:30
Rushabh Mehta
3e001b5fac
Merge branch 'develop'
2016-07-29 18:55:48 +05:30
Rushabh Mehta
6201068f8f
bumped to version 7.0.11
2016-07-29 19:25:48 +06:00
Rushabh Mehta
9421a109cf
[fix] reports template
2016-07-29 18:52:00 +05:30
Rushabh Mehta
26005c25b2
[minor] fix filter for item-code
2016-07-29 18:52:00 +05:30
Rushabh Mehta
180e43585f
[minor] formatter for item and employee
2016-07-29 18:52:00 +05:30
Rohit Waghchaure
05cc36a864
[demo] sales and purchase returns
2016-07-29 18:26:02 +05:30
Neil Trini Lasrado
1e5c251ce2
[new feature] Added Student Log
2016-07-29 17:05:49 +05:30
Nabin Hait
95c2ba9736
Merge pull request #5901 from bcornwellmott/fix_employee_lookup
...
Fix Timesheet employee query to show names
2016-07-29 16:28:18 +05:30
Kanchan Chauhan
db0e57cdce
Demo data for Leave Allocation, Leave Application and Attendance
2016-07-29 15:59:39 +05:30
Revant Nandgaonkar
cc8fb1a8d6
changed path to login
...
frappe.templates.pages.login.login_via_google changed to frappe.www.login.login_via_google
2016-07-28 19:50:15 +05:30
Nabin Hait
3bf486c5c6
bumped to version 7.0.10
2016-07-28 18:56:23 +06:00
Nabin Hait
6b8024a834
Merge pull request #5909 from nabinhait/fix_113
...
[fix] Show supplier name field if it is different from supplier id
2016-07-28 17:52:02 +05:30
Nabin Hait
7bae70a993
[fix] Show supplier name field if it is different from supplier id
2016-07-28 17:19:35 +05:30
Nabin Hait
e7d0639edc
Set difference amount in Payment Entry as per field precision
2016-07-28 16:56:59 +05:30
Nabin Hait
a163299991
bumped to version 7.0.9
2016-07-28 16:31:00 +06:00
Nabin Hait
e72ff9377a
Added converted status in Opportunity
2016-07-28 15:59:20 +05:30
Nabin Hait
ee70f26131
bumped to version 7.0.8
2016-07-28 16:16:35 +06:00
akshay
14384c2787
[fix] serial no button
2016-07-28 13:53:17 +05:30
Nabin Hait
fa97b3cac7
[fix] repost gle only if there is any stock account without warehouse
2016-07-27 17:33:32 +05:30
Nabin Hait
95f53cca44
Merge pull request #5885 from nabinhait/payment_entry_fix12
...
[fix] Set amounts only if party and bank account exists
2016-07-27 16:45:20 +05:30
Nabin Hait
7590b8fff1
minor fix for stock ledger entry
2016-07-27 16:44:26 +05:30
Neil Trini Lasrado
98151ce5b2
[Patch] Change status in Opportunity to Quotation where status is converted
2016-07-27 15:58:16 +05:30
Neil Trini Lasrado
ee75d41da0
[Fix] Fixed issues in Fee records
2016-07-27 15:23:19 +05:30
Rushabh Mehta
b2c9848886
bumped to version 7.0.7
2016-07-27 15:49:58 +06:00
Nabin Hait
b4bf757a15
Update fix_nonwarehouse_ledger_gl_entries_for_transactions.py
2016-07-27 15:19:12 +05:30
Rushabh Mehta
fc49c2c5f9
Merge branch 'develop'
2016-07-27 15:09:03 +05:30
Rushabh Mehta
384f0b18c0
bumped to version 7.0.6
2016-07-27 15:39:03 +06:00
Nabin Hait
2a2346422d
[fix] Set amounts only if party and bank account exists
2016-07-27 13:08:00 +05:30
Rushabh Mehta
548ea777a9
Merge pull request #5883 from saurabh6790/maintenance_schedule_fix
...
[fix] report filter fix
2016-07-27 12:43:41 +05:30
Nabin Hait
10007ab4df
[fix] reposting of gle where stock account not linked with warehouse
2016-07-27 12:43:02 +05:30
Nabin Hait
444bedcd20
Merge branch 'warehouse_blank_issue_for_non_stock_account' of https://github.com/rohitwaghchaure/erpnext_develop into rohitwaghchaure-warehouse_blank_issue_for_non_stock_account
2016-07-27 12:33:10 +05:30
Saurabh
4bc0f7d105
[minor][fix] rename attribute from amount to components
2016-07-27 12:10:21 +05:30
Saurabh
3642f987c7
[fix] report filter fix
2016-07-27 11:42:50 +05:30
Ben Cornwell-Mott
07e5758a94
Timesheets update on date changes in Salary Slip
2016-07-26 21:00:43 -07:00
Ben Cornwell-Mott
e326ae95ef
Fixed typo
2016-07-26 19:55:09 -07:00
bcornwellmott
5f59a0a00f
Corrected SQL query
2016-07-28 06:56:20 -07:00
Ben Cornwell-Mott
19cb34ce40
removed test variable
2016-07-26 13:48:36 -07:00
Ben Cornwell-Mott
5342ec5055
Added employee name to get_employee_list query
2016-07-26 13:47:55 -07:00
Rushabh Mehta
593d2e3146
Merge pull request #5877 from rohitwaghchaure/v7_fixes
...
[minor] Fixes
2016-07-26 21:21:45 +05:30
Rohit Waghchaure
c4afd63e50
[minor] Fixes
2016-07-26 20:47:42 +05:30
Rushabh Mehta
154be9b693
bumped to version 7.0.5
2016-07-26 18:32:38 +06:00
Saurabh
17a9940f00
[minor][fix] end date should not be less or equal to start date
2016-07-26 17:18:45 +05:30
Rohit Waghchaure
4d3e8da4a2
[Fix] Set warehouse to stock account and fixed gl entries against transactions.
2016-07-26 17:09:33 +05:30
Ben Cornwell-Mott
d4d1f1b036
Added date filters for the Timesheet query in Salary Slip
2016-07-26 03:33:38 -07:00
Saurabh
21a5658fdf
[fix] fee component rename patch fix
2016-07-26 15:03:41 +05:30
Rohit Waghchaure
8a9daece7e
[Fix] Timesheet patch
2016-07-26 12:57:05 +05:30
Rushabh Mehta
5662ad6d96
bumped to version 7.0.4
2016-07-26 09:54:00 +06:00
Rushabh Mehta
859843687e
[minor] add abbr if missing
2016-07-26 08:23:32 +05:30
Ben Cornwell-Mott
590d2d524b
Updated html file to use c3.js instead of Google Charts
2016-07-25 18:03:01 -07:00
Rohit Waghchaure
26cf01aaba
[mionr] fixes and cleanups
2016-07-26 00:30:25 +05:30
Neil Trini Lasrado
ce1c63f776
[rename] Renamed Fee Amount to Fee Component
2016-07-25 18:24:37 +05:30
Rushabh Mehta
95b550dd8f
Merge pull request #5862 from neilLasrado/rename
...
Renamed sg_creation_tool_course to Student Group Creation Tool Course
2016-07-25 16:21:32 +05:30
Rushabh Mehta
bb78f1ac16
Merge pull request #5861 from neilLasrado/develop
...
[Fix] fixed test cases for schools
2016-07-25 16:21:18 +05:30
Neil Trini Lasrado
feea2e3dec
[Doctype Rename] Renamed sg_creation_tool_course to Student Group Creation Tool Course
2016-07-25 16:13:05 +05:30
Neil Trini Lasrado
7dae3e1ed4
[Fix] fixed test cases for schools
2016-07-25 15:55:31 +05:30
Rushabh Mehta
1c93dd0591
bumped to version 7.0.3
2016-07-25 16:15:46 +06:00
Rushabh Mehta
c910e0c614
[translations] update icenlandic
2016-07-25 15:03:39 +05:30
Rushabh Mehta
6c3ac9587e
[fix] quick entry
2016-07-25 15:03:39 +05:30
Javier Wong
5b2af6ad40
[Fixed] Stopping and Re-Opening of Production Order
2016-07-25 16:49:39 +08:00
Rushabh Mehta
3f8428e972
bumped to version 7.0.2
2016-07-25 13:28:03 +06:00
Rushabh Mehta
644a04b378
[fix] translations v7.0
2016-07-25 12:15:30 +05:30
Rushabh Mehta
c9478fc4f1
[minor] setup website before domainify
2016-07-25 12:09:21 +05:30
Neil Trini Lasrado
d69d961f2a
Removed Administrator role from Doctypes
2016-07-25 11:39:23 +05:30
Rushabh Mehta
ead3ccfd52
[fix] more routes patch up
2016-07-24 22:28:50 +05:30
Rushabh Mehta
581a12c56a
bumped to version 7.0.1
2016-07-24 17:47:43 +06:00
Rushabh Mehta
cd385c3735
[fix] [minor] email pulling error, via scheduler log
2016-07-24 13:07:50 +05:30
Rushabh Mehta
49e17e4590
Merge pull request #5849 from netchampfaris/ui-fixes
...
[mobile ui] fix pos payment layout #5780
2016-07-24 12:47:13 +05:30
Faris Ansari
8e282c2ed8
[mobile ui] fix pos payment layout #5780
2016-07-24 11:37:25 +05:30
Rohit Waghchaure
f027fd0c66
[Fix] Timesheet patch
2016-07-24 00:38:10 +05:30
Rushabh Mehta
71b6494395
Merge pull request #5845 from KanchanChauhan/quotation-fix
...
[Minor Fix]
2016-07-23 15:16:31 +05:30
Kanchan Chauhan
39c952a3f2
[Minor Fix]
2016-07-23 14:39:01 +05:30
Ben Cornwell-Mott
fe11e71084
Removed hover tooltip
2016-07-22 10:02:41 -07:00
Ben Cornwell-Mott
2c76aec119
Added Google Chart to compare quotes in Print view
2016-07-22 09:56:29 -07:00
Rushabh Mehta
e7399dff2d
[fix] homepage patch
2016-07-22 21:01:39 +05:30
Rushabh Mehta
29517d0b8c
[fix] purchase order dashboard
2016-07-22 21:01:39 +05:30
Neil Trini Lasrado
6cfb60dc98
Minor fixed for Schools
2016-07-22 19:08:18 +05:30
Anand Doshi
b2e1d54fce
bumped to version 7.0.0
2016-07-22 16:33:16 +06:00
Rohit Waghchaure
7d439ecc20
Demo records for Projects+Tasks+Billing, pos invoice
2016-07-22 15:56:20 +05:30
Nabin Hait
dcefd29e3f
Merge pull request #5839 from saurabh6790/payment_request_demo
...
Payment request demo
2016-07-22 15:53:26 +05:30
Rushabh Mehta
5340cadcf9
Merge pull request #5827 from neilLasrado/student_batch
...
Added Student Batch
2016-07-22 15:47:48 +05:30
Neil Trini Lasrado
f521a9c601
Added Student Batch
2016-07-22 15:45:42 +05:30
Saurabh
6e0a00b537
[minor][fix] flag fix for payment entry creation via payment request
2016-07-22 15:43:27 +05:30
Saurabh
90c0b7fbea
[fix] payment request demo
2016-07-22 15:43:27 +05:30
Saurabh
e4e8954a19
[fix] make payment request without payment gateway
2016-07-22 15:43:26 +05:30
Umair Sayyed
6fcfc87d60
Documentation of Timesheet, Budgeting and Payment Entry
2016-07-22 15:22:56 +05:30
Nabin Hait
13e248af8d
Merge pull request #5833 from nabinhait/fix_108
...
Validate warehouse if update stock checked in Purchase Invoice
2016-07-22 13:21:43 +05:30
Nabin Hait
db4aca3eaf
Merge pull request #5823 from nabinhait/fix_107
...
Update opening stock on creation if item, only if it is non-serialized and does maintain batch
2016-07-22 13:17:26 +05:30
Nabin Hait
2b12a74fef
Merge pull request #5822 from nabinhait/fix_106
...
Unlink payment entries on cancellation of Invoice
2016-07-22 13:17:04 +05:30
Nabin Hait
0953aeb731
Merge branch 'master' into develop
2016-07-22 13:15:53 +05:30
Nabin Hait
368a314d48
bumped to version 6.27.26
2016-07-22 13:28:12 +06:00
Nabin Hait
8ecb78ba39
Validate warehouse if update stock checked in Purchase Invoice
2016-07-22 12:25:16 +05:30
Rushabh Mehta
6207883b7c
[fix] patch #5831
2016-07-22 12:20:52 +05:30
Rushabh Mehta
04a64a7f48
[fix] patch #5831
2016-07-22 12:19:18 +05:30
Rushabh Mehta
f276b52af3
[fix] patch #5831
2016-07-22 11:31:51 +05:30
Rushabh Mehta
0e3e16cda0
Merge pull request #5830 from MaxMorais/patch-6
...
Extend search_fields for customer querie
2016-07-22 11:10:54 +05:30
Rushabh Mehta
428a59f7a1
Merge pull request #5829 from bcornwellmott/quoteitemreport-1
...
Added new report for Supplier Quotation comparisons
2016-07-22 11:03:51 +05:30
Rushabh Mehta
11900e8fad
[fix] make grid editable for schools and fix #5831
2016-07-22 10:59:07 +05:30
Maxwell Morais
3557261313
Extend search_fields for customer querie
...
This PR is intended to extend the customer querie adding the meta-info from the doctype using the search fields to extend the customer querie
2016-07-21 23:42:59 -03:00
Ben Cornwell-Mott
99e03f2371
Added new report for Supplier Quotation comparisons
2016-07-21 13:03:58 -07:00
Rohit Waghchaure
ea278b5971
[Fix]POS and timesheet issues
2016-07-22 01:22:56 +05:30
Nabin Hait
767cf99435
Update opening stock on creation if item, only if it is non-serialized and does maintain batch
2016-07-21 18:46:09 +05:30
Nabin Hait
6889d294ae
Merge pull request #5812 from nabinhait/budget_demo
...
Demo data for Budget
2016-07-21 18:32:56 +05:30
Nabin Hait
e0cc87d2d8
Unlink payment entries on cancellation of Invoice
2016-07-21 18:30:18 +05:30
Rushabh Mehta
d4f3c6b5e7
[fix] schools patch
2016-07-21 18:22:58 +05:30
Rushabh Mehta
7e472f898d
[fix] setup wizard
2016-07-21 18:01:42 +05:30
Rushabh Mehta
39671e22c9
[fix] patch
2016-07-21 17:14:27 +05:30
Rushabh Mehta
fe7d6932ee
[fix] patch
2016-07-21 17:12:47 +05:30
Neil Trini Lasrado
a537e43838
Fixed patch for migrating schools to erpnext again
2016-07-21 16:57:04 +05:30
Neil Trini Lasrado
af5e00363a
Fixed patch for migrating schools to erpnext
2016-07-21 16:41:05 +05:30
Rushabh Mehta
137e722af1
Merge pull request #5817 from rmehta/neilLasrado-schools
...
Merge schools, fix setup wizard, update domainify
2016-07-21 16:04:22 +05:30
Rushabh Mehta
20038ad2c9
[fixes] setup wizard and domainify for schools;
2016-07-21 16:01:59 +05:30
Rohit Waghchaure
3176bc93c1
[Fix] Timesheet to time issue
2016-07-21 14:56:15 +05:30
Rohit Waghchaure
47c64ec728
[Fix] Stock entry differnce amount issue.
2016-07-21 12:24:12 +05:30
Nabin Hait
74edfff0a7
Demo data for Budget
2016-07-21 11:39:46 +05:30
Nabin Hait
1606626d29
Demo data for Payment Entry
2016-07-21 11:00:28 +05:30
Rushabh Mehta
b0061c9341
Merge branch 'schools' of https://github.com/neilLasrado/erpnext into neilLasrado-schools
2016-07-21 10:46:32 +05:30
Nabin Hait
26cad30372
Demo data for Payment Entry
2016-07-21 10:29:06 +05:30
Nabin Hait
89d0b1b9a5
Merge pull request #5804 from nabinhait/demo1
...
Demo data for fixed asset depreciation
2016-07-21 10:05:00 +05:30
Nabin Hait
ba33026a6b
Merge pull request #5798 from rohitwaghchaure/sales_invoice_form_is_pos_issue
...
[Fix] POS auto set paid amount with outstanding amount issue
2016-07-21 09:39:57 +05:30
Rushabh Mehta
5a39d41a0c
[redesign] replace document flow with dashboard, sorry @saurabh6790, fixes #5792
2016-07-20 22:53:23 +05:30
Neil Trini Lasrado
3f0a581b85
Merge ERPNext Schools into ERPNext
2016-07-20 19:25:02 +05:30
Rushabh Mehta
39077d4210
[dashboard] for quotation and sales order
2016-07-20 18:55:42 +05:30
Rohit Waghchaure
61b4a43d84
[Fix] POS auto set paid amount with outstanding amount issue
2016-07-20 17:01:29 +05:30
Nabin Hait
3edefb19b9
Demo data for fixed asset depreciation
2016-07-20 16:14:30 +05:30
Rushabh Mehta
649e2538e5
[fix] merge conflict?
2016-07-20 15:30:17 +05:30
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
Alec Ruiz-Ramon
fcaaa29a58
Status updater for quotation/lost to lead, quotation lost to oppt, and to set conversion as priority in lead
...
cleanup
squashed
2016-06-09 21:17:57 -04:00
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
Rushabh Mehta
72615977d7
Merge pull request #5337 from rohitwaghchaure/pos
...
[WIP] [POS] Some changes and fixes
2016-05-16 12:06:42 +05:30
Rushabh Mehta
3a87c479c7
Merge pull request #5346 from umairsy/domains
...
Domainifying
2016-05-16 12:02:51 +05:30
Rushabh Mehta
dc997dc426
Merge pull request #5352 from fderyckel/patch-2
...
Update multi-currency-accounting.md
2016-05-16 12:02:23 +05:30
Rushabh Mehta
9f5ff9476e
Merge pull request #5342 from rohitwaghchaure/support_week_2
...
[Fix] Removed is_pro_applicable
2016-05-16 12:02:01 +05:30
Rushabh Mehta
d474e0cb5b
Merge pull request #5345 from nabinhait/coa
...
Changes related for charts builder
2016-05-16 12:01:32 +05:30
Rohit Waghchaure
e0934d118f
[Fixes] Some changes and fixes
2016-05-16 12:01:16 +05:30
Rushabh Mehta
03578620e0
Merge pull request #5338 from fderyckel/patch-1
...
Update make-field-visible-in-print-format.md
2016-05-16 12:00:15 +05:30
Rushabh Mehta
a9e3936b20
Merge pull request #5335 from neilLasrado/patch-1
...
Update manufacturing-settings.md
2016-05-16 11:57:48 +05:30
Rushabh Mehta
6471e178f6
Merge pull request #5321 from rohitwaghchaure/rfq_fixes
...
[Fixes] RFQ minor fixes
2016-05-16 11:57:35 +05:30
Rushabh Mehta
c93caee284
Merge pull request #5265 from ShashaQin/patch-46
...
Update opportunity.py
2016-05-16 11:56:32 +05:30
Rushabh Mehta
02f76dc0f9
[patch] [fix]
2016-05-16 11:46:29 +05:30
Rushabh Mehta
f1bdae4496
[patch] [fix]
2016-05-16 11:41:29 +05:30
Rushabh Mehta
7c96dc1783
[minor] [fix] cart
2016-05-16 11:36:08 +05:30
Maxwell Morais
28453efece
Small improvement in maintenance scheduler
...
This improvement is intended to start disable blocking Maintenance Schedule submit, when the `Sales Person` does not have a `user_id` in the Employee!
The old logic try to use the `sales_person` email_id or the `owner` to create the event, but due some fails in the code, it dont occurs!
2016-05-16 00:50:03 -03:00
François
0802c56625
Update multi-currency-accounting.md
2016-05-15 20:21:08 +02:00
Rushabh Mehta
c8b2a9d654
[patch] [fix]
2016-05-15 10:08:52 +05:30
Anand Doshi
a5e4dc85db
Merge pull request #5341 from rohitwaghchaure/support_week_1
...
[Fix] Warranty claim form, unexpected token illegal error
2016-05-14 13:16:48 +05:30
Anand Doshi
97a70b226a
Merge pull request #5332 from anandpdoshi/fix/validate-account-company
...
[fix] Validate Company in Account autoname
2016-05-14 13:10:42 +05:30
kressi
0179909db2
Merge branch 'develop' into docfix
2016-05-13 15:40:33 +02:00
kressi
472a84ab13
fixed broken links and links to content in different language
2016-05-13 15:22:22 +02:00
Umair Sayyed
e44d1430e1
fixes in domainification. Also reordered some fields in BOM
2016-05-13 18:31:20 +05:30
kressi
28737b6808
fixed formatting and punctuation
2016-05-13 14:37:42 +02:00
Umair Sayyed
90cea14ce3
domanifying EPRNext, fixes #5334
2016-05-13 18:06:17 +05:30
Umair Sayyed
99f7528578
domanifying ERPNext via #5334
2016-05-13 18:06:17 +05:30
Rushabh Mehta
9c6c0d2836
[patch] [fix]
2016-05-13 17:50:33 +05:30
kressi
e7c773310b
fixed typos and inconsistencies
2016-05-13 13:20:25 +02:00
Rushabh Mehta
d774f40497
remove print in homepage
2016-05-13 16:21:37 +05:30
Nabin Hait
665568d87e
ignore permissions while creating records from charts builder portal
2016-05-13 15:56:11 +05:30
Nabin Hait
a21f49dd94
Tax rate in chart of accounts
2016-05-13 15:56:11 +05:30
Nabin Hait
e4670a9a45
Cleaned up chart of accounts
2016-05-13 15:56:11 +05:30
Michael Kressibucher
c53df03262
fixed typo
2016-05-12 15:14:52 +02:00
Rohit Waghchaure
8904730cd4
[Fix] Removed is_pro_applicable
2016-05-12 18:03:08 +05:30
Rohit Waghchaure
a92560c851
[Fix] Warranty claim form, unexpected token illegal error
2016-05-12 16:30:56 +05:30
Rushabh Mehta
48c7658aee
[minor] added set_value in domainify
2016-05-12 16:26:01 +05:30
Rushabh Mehta
4b9238a03b
[cleanup] homepage
2016-05-12 15:23:17 +05:30
Nabin Hait
825070e504
Merge pull request #5331 from nabinhait/multi-fix-55
...
Multiple fixes
2016-05-12 12:27:42 +05:30
François
d9f7364289
Update make-field-visible-in-print-format.md
...
Change a few typo
2016-05-12 06:32:40 +02:00
Rohit Waghchaure
29c7876e87
[Fixes] RFQ minor fixes
2016-05-11 19:38:29 +05:30
Neil Trini Lasrado
0b1d7c032a
Update manufacturing-settings.md
2016-05-11 16:47:55 +05:30
Rushabh Mehta
d42167e0e5
[cleanup] remove Features Setup
2016-05-11 16:47:14 +05:30
Rushabh Mehta
2dd0581134
[added] domainify.py
2016-05-11 15:14:15 +05:30
Anand Doshi
19fec06366
[fix] Validate Company in Account autoname
2016-05-11 13:27:18 +05:30
Nabin Hait
b81ed45b2b
fixed conflict
2016-05-11 12:52:31 +05:30
Nabin Hait
a1fcded0ba
bumped to version 6.27.17
2016-05-11 13:13:39 +06:00
Nabin Hait
719504a0fe
Merge pull request #5325 from nabinhait/return_fix_2
...
In Purchase Return entry, make sle and gle as per actual inward entry's valuation rate
2016-05-11 12:38:58 +05:30
Nabin Hait
b3a0e05bae
included path fixed in report print formats
2016-05-11 12:38:11 +05:30
Nabin Hait
a1ec7f1eed
Add root account
2016-05-11 12:38:11 +05:30
Nabin Hait
1997350364
[fix] Divisional loss in purchase receipt
2016-05-11 12:06:29 +05:30
IAGAdmin
63b33d0478
Update concepts-and-terms.md
2016-05-11 09:43:10 +08:00
Rushabh Mehta
d95b4a5c5b
[minor] added beta for homepage
2016-05-10 17:46:28 +05:30
Anand Doshi
a3f20ae9e6
Merge pull request #5329 from KanchanChauhan/shoppingcart-cleanup
...
Shopping Cart error messages issue resolved
2016-05-10 17:35:02 +05:30
Kanchan Chauhan
1d79f350bc
Shopping Cart error messages issue resolved
2016-05-10 17:19:47 +05:30
Nabin Hait
9b5a049fff
Merge pull request #5327 from nabinhait/pp_tool
...
[fix] Create Material Requests for All Required Qty via Production Planning Tool
2016-05-10 17:18:38 +05:30
Nabin Hait
3323d06be0
Mode of Payment columns and filters added in sales/purchase register
2016-05-10 13:17:02 +05:30
Nabin Hait
43d75448ea
[fix] Create Material Requests for All Required Qty via Production Plannign Tool
2016-05-10 12:57:24 +05:30
Rohit Waghchaure
6087fe178e
[Enhancement] POS
2016-05-09 23:36:15 +05:30
Nabin Hait
a9c4c8fc31
In Purchase Return entry, make sle and gle as per actual inward entry's valuation rate
2016-05-09 17:34:47 +05:30
Anand Doshi
e00a20d99d
Merge pull request #5284 from kickapoo/develop
...
Add (optional) Country field to Buying.Supplier DocType (fixes #5223 )
2016-05-09 16:58:30 +05:30
Anand Doshi
969863541d
Merge pull request #5323 from KanchanChauhan/shoppingcart-changes
...
Shopping cart dropdown changes
2016-05-09 16:57:08 +05:30
Anand Doshi
c2ade3d34f
Merge pull request #5298 from neilLasrado/sal-slip
...
Moved email salary slip to employee under HR Settings
2016-05-09 16:56:51 +05:30
Neil Trini Lasrado
b2b0b37cc1
Added reference_doctype and reference_name to link Bulk Email to Salary Slip
2016-05-09 13:24:31 +05:30
Kanchan Chauhan
b3573a881e
Shopping cart dropdown changes
2016-05-09 12:30:58 +05:30
Nabin Hait
332d29f166
Merge branch 'master' into develop
2016-05-06 16:13:35 +05:30
Nabin Hait
42800d24cc
bumped to version 6.27.16
2016-05-06 16:43:34 +06:00
Nabin Hait
845a980a79
Merge pull request #5320 from nabinhait/return_fix_1
...
[fix] In purchase return entry, consider outgoing rate for serialized items
2016-05-06 16:09:55 +05:30
Nabin Hait
e67c1cdf12
[fix] In purchase return entry, consider outgoing rate for serialized items
2016-05-06 15:46:31 +05:30
Nabin Hait
8704bead49
[fix] Validate returned serial nos and batch nos with original document
2016-05-06 15:30:10 +05:30
Valmik
5fb86ce570
Minor link fix
2016-05-06 12:06:40 +05:30
Nabin Hait
09fec7a15e
Merge pull request #5313 from shreyasp/support-week-hotfix
...
[Hotfixes] Payment tool and Leave Allocation Tool
2016-05-05 16:44:40 +05:30
shreyas
c2a49211a5
[Fix] Payment Tool, Fetch due date when user does 'Get Outstanding Vouchers'
2016-05-05 15:56:48 +05:30
shreyas
55cbd52200
[Fix] Allocate leaves only to active employees
2016-05-05 15:16:39 +05:30
shreyas
622fe3f1e3
[Fix] Fetch due date for Sales/Purchase invoice in payment tool
2016-05-05 15:11:04 +05:30
Valmik Jangla
a0b9c4cdeb
Fixed Leave Application issue
2016-05-05 01:20:47 -07:00
Anand Doshi
b114f73cfe
Merge pull request #5299 from vjFaLk/alert-docs
...
Updated Email Alert docs
2016-05-04 16:14:28 +05:30
Neil Trini Lasrado
728d01945c
redirect issues of erpnext to erpnext repository
2016-05-02 18:37:47 +05:30
Valmik Jangla
f3c203ba2c
Updated Email Alert docs
2016-05-02 18:24:17 +05:30
Rushabh Mehta
c711b82889
Merge pull request #5296 from KanchanChauhan/websitemakeover
...
New look to the website
2016-05-02 15:54:41 +05:30
Nabin Hait
f3bff49799
Merge branch 'master' into develop
2016-05-02 15:19:17 +05:30
Nabin Hait
d824fbbddd
bumped to version 6.27.15
2016-05-02 15:49:16 +06:00
Rushabh Mehta
360b05f0f5
[enhancement] activity summary in projects
2016-05-02 14:13:38 +05:30
Nabin Hait
863cb12426
minor fix
2016-05-02 13:48:27 +05:30
Rushabh Mehta
764aa92da4
[minor] added remember_selected in hooks and doc update
2016-05-02 13:28:59 +05:30
Neil Trini Lasrado
71e93d6691
Added test cased
2016-05-02 12:04:20 +05:30
Neil Trini Lasrado
b14af59d39
Moved send email checkbox from salary slip to a global setting under hr settings
2016-05-02 12:04:19 +05:30
Valmik Jangla
651dc5b345
Reset Values in Tools
2016-05-02 12:00:06 +05:30
Kanchan Chauhan
239b351367
New look to the website
2016-05-02 11:43:44 +05:30
Nabin Hait
b78adcf279
Merge branch 'master' into develop
2016-04-29 18:26:46 +05:30
Nabin Hait
ab7f6870cb
bumped to version 6.27.14
2016-04-29 18:56:45 +06:00
Neil Trini Lasrado
c33b5b74c6
Itemwise purchase and Itemwise sales
2016-04-29 18:21:51 +05:30
Rushabh Mehta
be2ee18de4
[fixed] frappe.require is now async 💥
2016-04-29 17:22:42 +05:30
Rushabh Mehta
127de729b2
[fix] making time log entry easier, to time not mandatory while making time log and Finish button
2016-04-29 14:19:21 +05:30
Anand Doshi
49e470035d
[fix] removed rename_item_field patch
2016-04-29 12:50:07 +05:30
Rushabh Mehta
1aa1c8a9ef
[minor] remove hide_first in forms
2016-04-29 12:20:23 +05:30
Nabin Hait
6146cc1e33
Merge branch 'master' into develop
2016-04-29 11:44:55 +05:30
Nabin Hait
cfe14d9814
bumped to version 6.27.13
2016-04-29 12:14:54 +06:00
Stavros Anastasiadis
5bd40db0ba
Add (optional) Country field to Buying.Supplier DocType ( fixes #5223 )
...
Most companies have a headquarter country;
2016-04-28 18:06:45 +03:00
Nabin Hait
f2008b95e8
[docs] Fixed asset movement
2016-04-28 18:40:58 +05:30
Nabin Hait
48577c15a2
Show all scheduled depreciation in dotted line
2016-04-28 18:12:41 +05:30
Nabin Hait
70f05df075
Asset Movement
2016-04-28 18:01:32 +05:30
Nabin Hait
ce35c56cd3
Added line graph in asset dashboard
2016-04-28 18:01:32 +05:30
Nabin Hait
92426f5e56
Added Image field in Asset
2016-04-28 18:01:32 +05:30
Nabin Hait
761a7a8e7c
[fix] On rename update item code in item_wise_tax_detail json in tax table
2016-04-28 17:33:49 +05:30
Nabin Hait
314246939f
[report][fix] Item-wise tax calculation if item appears multiple times in the same invoice
2016-04-28 17:32:36 +05:30
Nabin Hait
b7b7f0062d
[report][fix] Consider taxes only the tax contributed in invoice total
2016-04-28 17:31:27 +05:30
Anand Doshi
79c536acb5
Merge branch 'master' into develop
2016-04-27 15:44:11 +05:30
Anand Doshi
08de396d46
bumped to version 6.27.12
2016-04-27 16:13:21 +06:00
Anand Doshi
b5e700f3af
Merge pull request #5248 from saurabh6790/hotfix
...
[fixes] raise exception on deletion of fiscal year if fiscal year is set as Default
2016-04-27 14:25:58 +05:30
Neil Trini Lasrado
4c95ed49ed
Fixed Currency Symbol in Trial Balance and Trial Balance for Party reports
2016-04-27 13:09:17 +05:30
Saurabh
9be40ee7c3
[fixes] raise exception while deleting fiscal year if fiscal year is set as default in Global Settings and while calculating get_month_details if year_start_date not found
2016-04-27 12:58:40 +05:30
Anand Doshi
c6479bcbb6
Merge pull request #5264 from neilLasrado/hotfix
...
Fixed Currency Symbol in Trial Balance and Trial Balance for Party re…
2016-04-27 12:32:05 +05:30
Rushabh Mehta
5dfe20ce17
[fix] frappe.require in stock_entry.js
2016-04-26 12:59:08 +05:30
ShashaQin
4303164ae0
Update opportunity.py
2016-04-26 14:49:34 +08:00
Neil Trini Lasrado
ea7181e1b5
Fixed arabic translation
2016-04-25 19:21:39 +05:30
Rushabh Mehta
3d2622ce91
[refacator] added dashboard in item
2016-04-25 17:53:42 +05:30
Neil Trini Lasrado
b93d525c96
Fixed Currency Symbol in Trial Balance and Trial Balance for Party reports
2016-04-25 17:18:52 +05:30
Rushabh Mehta
0fa7b7c4f2
[test] [fix] default cost_center
2016-04-23 11:11:10 +05:30
Anand Doshi
a6f48688bc
[enhancement] website: optionally show products as list
2016-04-22 19:10:49 +05:30
Anand Doshi
e3bd78e912
[css] portal
2016-04-22 18:53:21 +05:30
Kanchan Chauhan
e0818f8f46
Website Changes
2016-04-22 17:47:16 +05:30
Rushabh Mehta
0394aec6a4
[wip] inventory tool
2016-04-22 17:22:22 +05:30
Rushabh Mehta
68d428bfd4
[fix] for sort selector
2016-04-22 13:23:34 +05:30
Nabin Hait
d6bc490274
Merge branch 'master' into develop
2016-04-22 12:24:26 +05:30
Nabin Hait
054e2952c8
bumped to version 6.27.11
2016-04-22 12:45:35 +06:00
Nabin Hait
3ab6181a4f
[fix] Fixed ambiguous column name in query
2016-04-22 11:26:44 +05:30
Rushabh Mehta
621283c5c5
[enhancement] stock balance page
2016-04-21 19:00:34 +05:30
Rushabh Mehta
cd3c979207
[cleanup] website.less
2016-04-21 13:09:41 +05:30
Rushabh Mehta
202cb7cdf1
Merge pull request #5249 from nabinhait/fixed_asset
...
Fixed asset
2016-04-21 11:41:11 +05:30
Rushabh Mehta
c291ab64a6
Merge pull request #5197 from KanchanChauhan/UXChanges_ERPNext
...
[WIP] No not merge
2016-04-21 11:39:45 +05:30
Rushabh Mehta
f2c3cb85a9
Merge pull request #5164 from KanchanChauhan/project-permissions
...
Collaborate PM permission fixes and daily tme log fix
2016-04-21 11:37:31 +05:30
Rushabh Mehta
02772442b6
[cleanup] added dashboard in project
2016-04-20 18:45:56 +05:30
Nabin Hait
595d3c03ef
updated docs for fixed asset
2016-04-20 18:17:05 +05:30
Nabin Hait
85a2776e91
Depreciation Schedule considering already booked depreciations for existing asset and testcases
2016-04-20 17:57:12 +05:30
Nabin Hait
318fa287df
[report] Asset Depreciations and Balances
2016-04-20 17:57:12 +05:30
Nabin Hait
e58c26edca
[report] Added asset depreciation ledger report
2016-04-20 17:57:12 +05:30
Nabin Hait
cd0e8ce8ad
Fixes and modification in fixed asset
2016-04-20 17:57:12 +05:30
Nabin Hait
3d9c5c0c20
Fixed Asset module cleanup and fixes
2016-04-20 17:57:11 +05:30
Anand Doshi
b2b02a574a
Merge branch 'master' into develop
2016-04-20 16:45:20 +05:30
Anand Doshi
25dd38c8f2
bumped to version 6.27.10
2016-04-20 17:13:00 +06:00
Kanchan Chauhan
11638ba358
Changes 3
2016-04-20 16:24:25 +05:30
Kanchan Chauhan
704f248952
Changes 2
2016-04-20 16:24:24 +05:30
Kanchan Chauhan
2dbf5294a9
[WIP] No not merge
2016-04-20 16:24:24 +05:30
Nabin Hait
867dfec64b
Reload bin in reserved qty reposting patch
2016-04-20 11:53:34 +05:30
Neil Trini Lasrado
ab822c5d16
Removed no-copy from source in lead
2016-04-20 11:03:15 +05:30
Maxwell Morais
52ec0fa7e9
get_address_display calling method error
...
get_address_display, dont can be use in replacement as a function in the doctype controler, since it dont expect `cdt` and `cdn` as arguments.
972c25f78d/erpnext/public/js/utils/party.js (L53)
2016-04-18 13:24:25 -03:00
Rushabh Mehta
0525387328
[enhancement] added reserved_qty_for_production in bin and updated item dashboard
2016-04-18 19:27:46 +05:30
Nabin Hait
c46c1f0288
[fix] Rejected serial nos in purchase invoice
2016-04-18 17:46:36 +05:30
Nabin Hait
14aa9c5320
[fix] Cleanup and fixes in update stock feature in Purchase Invoice
2016-04-18 16:59:47 +05:30
Nabin Hait
ffd1e4efe6
Removed db_set from inside validate
2016-04-18 15:58:44 +05:30
Saurabh
7fee1b8343
[fixes] set expence account to item on sales invoice
2016-04-18 15:58:43 +05:30
Saurabh
224737b9ed
[fixes] split make gl entry function into chuncks as per SI
2016-04-18 15:58:43 +05:30
Saurabh
fbb342c1ac
[enhancement] update landed cost on PI via landed cost voucher when update stock is set on PI
2016-04-18 15:58:43 +05:30
Saurabh
130c57b201
[fixes] code clean-up
2016-04-18 15:58:43 +05:30
Saurabh
e29248bcb3
[fixes] test-case to validate quantity after update stock and purchase return and code-cleaning
2016-04-18 15:58:43 +05:30
Saurabh
d697f3d6a3
[minor][fix] reset is_paid if company not selected
2016-04-18 15:58:42 +05:30
Saurabh
43520f93a1
[fixes] test cases, code cleanup.
2016-04-18 15:58:42 +05:30
Saurabh
2a0e2fe95c
[test-case] test update stock and payment
2016-04-18 15:57:56 +05:30
Saurabh
4bd34a58ba
[fixes] fix perpetual inventory
2016-04-18 15:57:55 +05:30
Saurabh
bd5fc8ecbe
[fixes] add posting time
2016-04-18 15:57:55 +05:30
jof2jc
c204775fe2
Added posting_time in purchase invoice
2016-04-18 15:57:55 +05:30
jof2jc
821f571640
added payments, make receipt field
2016-04-18 15:57:55 +05:30
jof2jc
524ebbcbb9
Added Make Receipt (Update Stock) and IsCash option on Purchase Invoice
2016-04-18 15:57:55 +05:30
Rushabh Mehta
17d52becdf
[typo]
2016-04-15 16:51:33 +05:30
Rushabh Mehta
86a824c767
[ux] added opening stock and rate in new Item
2016-04-15 16:44:44 +05:30
Rushabh Mehta
e8e9440b06
[fix] [tests]
2016-04-15 15:19:35 +05:30
Rushabh Mehta
be2dde468d
[enhance] set material request title as comma separated list of items
2016-04-15 15:11:06 +05:30
Rushabh Mehta
a305c29b0e
[cleanup] remove is_pro_applicable
2016-04-15 15:03:16 +05:30
Nabin Hait
18f0dd0a6d
[translations]
2016-04-15 14:50:45 +05:30
Rushabh Mehta
dd9a973a0b
Merge pull request #5216 from umairsy/is-sales-purchase
...
Removed Is Sales Item and Is Purchase Item
2016-04-15 14:12:14 +05:30
Rushabh Mehta
f4c25b13e2
[fix] update total_projected_qty in bin.py
2016-04-15 13:01:09 +05:30
Umair Sayyed
72534deea2
removed Is Sales Item and Is Purchase Item
2016-04-15 12:57:00 +05:30
Rushabh Mehta
c65726bf07
[patch] hide new icons if equivalent old ones are set
2016-04-15 12:51:28 +05:30
Rushabh Mehta
18fc39b609
[feature] progress bars on production order
2016-04-15 11:24:19 +05:30
Nabin Hait
bd07ea43e8
fixed conflict
2016-04-15 11:06:41 +05:30
Nabin Hait
66953941ea
bumped to version 6.27.9
2016-04-15 11:31:32 +06:00
Nabin Hait
36c9d11bee
Merge pull request #5211 from nabinhait/jv_precision_fix
...
[fix] Set debit / credit as per field precision
2016-04-15 10:58:49 +05:30
Nabin Hait
972c25f78d
Fixed conflict
2016-04-14 18:25:53 +05:30
Nabin Hait
e393c62086
[fix] Set debit / credit as per field precision
2016-04-14 18:15:42 +05:30
Rushabh Mehta
15a7f215b9
[enhancement] heatmaps on item and notifications for item
2016-04-14 17:30:53 +05:30
Umair Sayyed
6269f1e3d0
address and contact related fields re-arranged in the sales transactions fixes #5192
2016-04-14 13:07:41 +05:30
ShashaQin
14baa70de3
Update project.py
2016-04-14 10:53:08 +08:00
Anand Doshi
65f2d92437
Merge branch 'vjFaLk-remove-celery' into develop
2016-04-13 19:28:56 +05:30
Valmik Jangla
4af736b989
Moved tasks content to newsletter.py
2016-04-13 19:11:55 +05:30
Rushabh Mehta
8c9c57c8f3
[minor] update party timestamp after transaction
2016-04-13 18:22:06 +05:30
Rushabh Mehta
0e2dd859b0
[cleanup] link dashboard for customer, supplier, item, employee and hide form by default
2016-04-13 17:22:09 +05:30
Nabin Hait
ba7d8b0cac
bumped to version 6.27.8
2016-04-13 16:34:37 +06:00
Nabin Hait
1ce6df8ff6
Merge pull request #5203 from nabinhait/credit_limit_fix
...
[fix] Ignore closed sales order in credit limit validation
2016-04-13 15:36:33 +05:30
Nabin Hait
7132bd3659
[fix] Ignore closed sales order in credit limit validation
2016-04-13 15:19:37 +05:30
Nabin Hait
13a2574bd6
Merge pull request #5159 from neilLasrado/setup-wizard-fix
...
Fixed setup wizard
2016-04-13 12:06:55 +05:30
Nabin Hait
09855fc3cc
Merge pull request #5158 from neilLasrado/hotfix
...
Removed education as a domain in ERPNext setup wizard
2016-04-13 12:05:11 +05:30
Nabin Hait
c2ae1a7375
fixed merge conflict
2016-04-13 11:55:15 +05:30
Nabin Hait
4b09f48d94
Merge pull request #5195 from nabinhait/stock_non_stock_item_toggle
...
Dont allow to toggle stock and non-stock settings if any transaction exists against the item
2016-04-13 11:40:45 +05:30
Nabin Hait
c792e65d99
Merge pull request #5196 from nabinhait/report_fix34
...
[fix] Fixed pending so items for material request report
2016-04-13 11:40:34 +05:30
Rushabh Mehta
8bbca6fa2e
[enhancement] links menu in customer, supplier, item
2016-04-12 19:16:33 +05:30
Nabin Hait
dd94d4e43d
Dont allow to toggle stock and non-stock settings if any transaction exists against the item
2016-04-12 19:00:50 +05:30
Nabin Hait
471908ab9f
Merge pull request #5194 from nabinhait/gross_profit_fix
...
Gross profit fix
2016-04-12 18:57:45 +05:30
Nabin Hait
9fef3df6a0
[fix] Fixed pending so items for material request report
2016-04-12 18:46:47 +05:30
Nabin Hait
8a686ba982
[fix] Prevent from directly creating payment request
2016-04-12 17:02:15 +05:30
Nabin Hait
f509d13d28
[fix] Get average selling rate based on group by
2016-04-12 17:01:39 +05:30
Valmik Jangla
6842f2e75c
WIP code migration from Celery to RQ
2016-04-11 17:41:34 +05:30
Rushabh Mehta
5d0e8dee11
[fix] dashboard for customer, supplier
2016-04-11 17:34:49 +05:30
Rohit Waghchaure
b2e7a1f605
[Fix] Default letter head
2016-04-11 17:30:44 +05:30
Nabin Hait
3912a31a6f
Merge pull request #5176 from nabinhait/ar_ap_print_currency
...
Currency column in AR/AP and Sales/Purchase register report
2016-04-11 17:13:04 +05:30
Nabin Hait
b713406e22
Merge pull request #5180 from nabinhait/stock_entry_actual_qty
...
[fix] Set actual qty onload of the draft stock entry. Fixed #5172
2016-04-11 17:12:34 +05:30
Nabin Hait
32b2a7795e
[fix] Set actual qty onload of the draft stock entry. Fixed #5172
2016-04-11 15:14:05 +05:30
Rohit Waghchaure
ae270d6648
[Fixes] Supplier can view their addresses, default buying price list issue
2016-04-11 13:58:33 +05:30
Nabin Hait
f945e10cce
Currency column in AR/AP and sales/purchase register report
2016-04-11 11:56:57 +05:30
Rushabh Mehta
f4d1b18895
[hooks] notify party on_change
2016-04-11 11:34:59 +05:30
Nabin Hait
e1433aab30
[fix] Fixed party update status patch
2016-04-09 16:12:40 +05:30
Kanchan Chauhan
a4ff5d3195
Collaborate PM permission fixes and daily tme log fix
2016-04-08 23:22:04 +05:30
Rushabh Mehta
2dff9275f3
[test] fixed circular dependencies
2016-04-08 18:05:12 +05:30
Rushabh Mehta
6fe962e6ad
[test] fixed circular dependencies
2016-04-08 17:55:11 +05:30
Anand Doshi
2f957f27b0
[fix] apply Tax Rule for lead
2016-04-08 17:43:08 +05:30
Rushabh Mehta
bdefa2414f
[test] [fix] test-dependency
2016-04-08 17:40:06 +05:30
Neil Trini Lasrado
7b46e5148a
Fixed setup wizard
2016-04-08 17:28:44 +05:30
Rushabh Mehta
8cd1ab894c
[minor] [fix] notifications for customer, supplier
2016-04-08 17:26:53 +05:30
Rushabh Mehta
dda1349a2d
[minor] [fix] typo in customer_list.js
2016-04-08 17:22:52 +05:30
Rushabh Mehta
f16f9c569b
[enhancement] add status in customer, supplier
2016-04-08 17:21:00 +05:30
Rushabh Mehta
203cc962f5
[enhancement] Item Selector
2016-04-08 17:21:00 +05:30
Anand Doshi
79a415e3b8
[fix] Use for shopping cart validation in Tax Rule
2016-04-08 17:08:26 +05:30
Neil Trini Lasrado
ce893499d7
Removed education as a domain in ERPNext setup wizard
2016-04-08 16:52:53 +05:30
Anand Doshi
9b8937d257
Merge pull request #5157 from agusputra/patch-29
...
Update quotation.md
2016-04-08 16:37:13 +05:30
Neil Trini Lasrado
cb6430575b
Fixed validation message for disabled employee
2016-04-08 16:36:26 +05:30
shreyas
ffeacb299d
[Fix] Show a message while user tries to create Material request with BOM which contains only non-stock item
2016-04-08 16:32:19 +05:30
Agus Syahputra
155edfc43e
Update quotation.md
2016-04-08 17:55:04 +07:00
Anand Doshi
3af1b00e4e
[fix] BOM name in test_records.json
2016-04-08 16:21:03 +05:30
Anand Doshi
e6e7cd90c9
Merge pull request #5143 from KanchanChauhan/somefixes
...
[Minor Fixes] Findings in setting up erpnext
2016-04-08 16:20:11 +05:30
Agus Syahputra
34f6145e9d
Update opening-stock.md
2016-04-08 16:35:59 +07:00
Anand Doshi
54910000d4
bumped to version 6.27.7
2016-04-07 18:11:48 +06:00
Anand Doshi
1f2f82fcc2
Merge pull request #5147 from vjFaLk/leave-allocation-fix
...
[Fix] Leave Allocation now includes To Date in Difference
2016-04-07 16:53:29 +05:30
Anand Doshi
1a0d32cdfb
[fix] [minor] Learn link in welcome to ERPNext
2016-04-07 16:28:01 +05:30
shreyas
b94b94afd9
[Fix] Move company field to top of the Stock Entry form
2016-04-07 16:25:29 +05:30
Valmik Jangla
c33e96f860
Leave Allocation Fix
2016-04-07 12:02:31 +05:30
Kanchan Chauhan
017d30f465
[Minor Fixes] Findings in setting up erpnext
2016-04-06 19:28:50 +05:30
Rushabh Mehta
78b7a53635
[cleanup] set default bold, print_hide for prints
2016-04-06 15:29:45 +05:30
Anand Doshi
ca95384f05
[fix] Salary Slip: use accounts.utils.get_fiscal_year
2016-04-06 12:31:01 +05:30
Anand Doshi
4b207647db
[fix] sanitize html of product bundle description
2016-04-05 18:34:11 +05:30
Anand Doshi
bcbfeb0d53
bumped to version 6.27.6
2016-04-04 18:24:48 +06:00
Anand Doshi
a32b3ea3e8
Merge pull request #5115 from nabinhait/test_fix
...
[fix] Test cases
2016-04-04 17:43:02 +05:30
Nabin Hait
94360cca20
[fix] received and delivered items to be billed report based on percentage billed
2016-04-04 17:40:33 +05:30
Anand Doshi
cd3ae0bb50
Merge pull request #5121 from kaflesudip/develop
...
Add User Remark to Quick Entry Form in Journal Entry
2016-04-04 17:07:21 +05:30
Anand Doshi
f1b276122e
Merge pull request #5117 from nabinhait/report_modified_change
...
[fix] Modified date changed in query report due to project field renaming
2016-04-04 17:04:14 +05:30
Rushabh Mehta
d690094b12
[image] added default image field for employee, customer, item, contact, lead, supplier and using - instead of / as separator in BOM
2016-04-04 16:57:56 +05:30
Anand Doshi
62be8dfd21
Merge pull request #5131 from shreyasp/creditnote-print-format
...
[Fix] Correct amount shown in credit note print format
2016-04-04 15:37:31 +05:30
shreyas
c6b47bcdda
[Fix] Show amount in credit note print format
2016-04-04 15:13:03 +05:30
Anand Doshi
15f7b1ee1a
[fix] POS paid amount validation using grand total
2016-04-04 15:03:28 +05:30
Kanchan Chauhan
7379fd4b9a
POS Search Fixed
2016-04-04 14:39:29 +05:30
Anand Doshi
08b39b1ff8
[fix] escape fg_item in production planning's get_so_items
2016-04-04 13:16:56 +05:30
sudip
0e55417f81
Add User Remarks to Quick Entry Form in Journal Entry
2016-04-02 08:42:42 +05:45
Nabin Hait
4f10f15686
[fix] Modified date changed in query report due to project field renaming
2016-04-01 17:59:06 +05:30
Nabin Hait
adddf6f471
[fix] Test cases
2016-04-01 16:47:46 +05:30
Rohit Waghchaure
e4b5fcb6e8
[Fix] Minor fix
2016-04-01 14:09:29 +05:30
Rushabh Mehta
0c76f21f81
[minor] absolute links for portal menu
2016-04-01 11:54:01 +05:30
Rushabh Mehta
d02038f591
Merge pull request #5110 from nabinhait/warranty_claim_fix
...
[fix] Get query for item in warranty claim
2016-04-01 11:44:48 +05:30
Rushabh Mehta
87736b7fc3
Merge pull request #5109 from agusputra/patch-27
...
Update managing-batch-wise-inventory.md
2016-04-01 11:44:27 +05:30
Rushabh Mehta
948ebfef16
Merge pull request #5108 from neilLasrado/expense-querry
...
Fixed bug in get expense query
2016-04-01 11:44:11 +05:30
Rushabh Mehta
8aa24232cf
Merge pull request #5103 from bohlian/develop
...
Set Resolution Date to include Time
2016-04-01 11:41:57 +05:30
Rushabh Mehta
7d480879ae
Merge pull request #5102 from agusputra/patch-26
...
Update managing-assets.md
2016-04-01 11:41:39 +05:30
Rushabh Mehta
8ca426d94a
Merge pull request #5095 from rohitwaghchaure/new_rfq
...
[Enhancement] Added currency symbol on RFQ form of supplier portal, currency validation for party
2016-04-01 11:41:15 +05:30
Rushabh Mehta
fff8e6c733
Merge pull request #5080 from nabinhait/fy_overlap
...
[fix] Added overlap validation in fiscal year
2016-04-01 11:37:03 +05:30
Nabin Hait
83e61bf368
[fix] Get query for item in warranty claim
2016-04-01 11:10:27 +05:30
Agus Syahputra
623f9f6bef
Update managing-batch-wise-inventory.md
2016-04-01 12:21:26 +07:00
Neil Trini Lasrado
30b97b0b45
Fixed bug in get expense query
2016-03-31 23:10:13 +05:30
rohitwaghchaure
62fea0374b
[Enhancement] Added currency symbol on RFQ form of supplier portal, currency validation for party
2016-03-31 21:49:07 +05:30
Rushabh Mehta
b04409746e
[fix] tests
2016-03-31 16:55:21 +05:30
Javier Wong
6487b525d0
Set Resolution Date to include Time
2016-03-31 18:27:36 +08:00
Agus Syahputra
c30dc6d2e6
Update managing-assets.md
2016-03-31 17:12:41 +07:00
Rushabh Mehta
45c6b550f0
[cleanup] assets and made items mandatory in transactions
2016-03-31 15:37:51 +05:30
Rushabh Mehta
acf28af19c
[fix] set default depreciation accounts and test fix
2016-03-31 15:04:06 +05:30
Rushabh Mehta
cb144bfcd4
[cleanup] projects
2016-03-31 14:27:35 +05:30
Nabin Hait
2ed0b59747
[fix] Added overlap validation in fiscal year
2016-03-31 12:40:37 +05:30
Nabin Hait
33f42aaad1
[fix] Get email field if field type is Code, Text, Small Text or Data
2016-03-31 11:59:10 +05:30
Nabin Hait
91a58808c0
[fix] Allowed deletion of root account
2016-03-31 11:59:10 +05:30
Nabin Hait
6123560f51
Merge pull request #5076 from vjFaLk/develop
...
Fix for Opportunity
2016-03-31 11:55:07 +05:30
Nabin Hait
1d04a23a00
Merge pull request #5082 from umairsy/perm-issue-2
...
[Fix] changed permission for the Stock Ledger Entry
2016-03-31 11:54:28 +05:30
Nabin Hait
b664cabeef
Merge pull request #5096 from nabinhait/test_case_fix
...
Test case fix
2016-03-31 11:53:07 +05:30
Rushabh Mehta
2d985e1973
[fix] edit-profile in frappe;
2016-03-30 17:15:33 +05:30
Rushabh Mehta
72b4ad8155
[cleanup] for quick-entry
2016-03-30 15:42:22 +05:30
Nabin Hait
9501a1e034
Links for fixed assets added in accounts module page
2016-03-30 15:06:26 +05:30
Nabin Hait
684052e978
[fix] Permissions added in asset and asset category
2016-03-30 15:06:25 +05:30
Nabin Hait
7fcec4118b
[fix] Test case
2016-03-30 15:06:25 +05:30
Anand Doshi
62ae39441d
Merge pull request #5091 from rmehta/portal-settings
...
[enhancement] configurable portal menu, fixes #5087
2016-03-30 14:38:11 +05:30
Rushabh Mehta
3fc6fdeba0
[cleanup] for quick-entry
2016-03-30 13:18:30 +05:30
Nabin Hait
c6285069dc
[fix] Item query in bom
2016-03-30 13:10:25 +05:30
Rushabh Mehta
c78b3110b5
[enhancement] configurable portal menu;
2016-03-30 12:29:48 +05:30
Rushabh Mehta
df7e523c3f
[fix] web forms for collaborative pm
2016-03-30 11:00:42 +05:30
Rushabh Mehta
8b43fd7f02
Merge pull request #5084 from KanchanChauhan/PM-UI-Edits
...
UI Changes
2016-03-29 18:45:58 +05:30
Kanchan Chauhan
b566d42d37
UI Changes
2016-03-29 18:21:59 +05:30
Nabin Hait
e8e2d406b5
minor fix
2016-03-29 18:17:03 +05:30
Rushabh Mehta
bb8c6de043
[opt] transaction.js
2016-03-29 17:52:22 +05:30
Rushabh Mehta
652dee45a6
[minor] make margin collapsible
2016-03-29 16:42:13 +05:30
Rushabh Mehta
1d05ada5e9
Merge pull request #4950 from nabinhait/fixed_asset_depreciation
...
Fixed asset depreciation
2016-03-29 16:39:31 +05:30
Rushabh Mehta
7a1b5da830
[cleanup] request for quotation cleanup
2016-03-29 16:04:43 +05:30
Rushabh Mehta
22fe3a8b7e
Merge pull request #5081 from nabinhait/trans_fix
...
[fix] Translations
2016-03-29 15:16:07 +05:30
Rushabh Mehta
b5aa50de06
[fix] select default company in chart of accounts
2016-03-29 14:41:20 +05:30
Umair Sayyed
6481ab23ce
[Fix] changed permission for stock ledger entry
2016-03-29 13:35:46 +05:30
Nabin Hait
d9449e396f
[fix] Translations
2016-03-29 13:22:31 +05:30
Anand Doshi
aad384c669
Merge pull request #5078 from umairsy/march2
...
Manual - Accounts module
2016-03-29 11:59:48 +05:30
Rushabh Mehta
c9850f9e04
Merge pull request #5077 from frappe/master
...
Master
2016-03-29 11:59:32 +05:30
Umair Sayyed
d6d283b424
edited perpetual inventory system
2016-03-29 11:57:38 +05:30
Umair Sayyed
cf3c371367
update in the Accounts manual
2016-03-29 11:57:38 +05:30
Nabin Hait
fb03b96992
fixed asset fixes
2016-03-29 11:54:38 +05:30
Nabin Hait
7de15321c9
[docs] Managing fixed assets
2016-03-29 11:54:38 +05:30
Nabin Hait
fc937ee370
[docs] managing fixed assets
2016-03-29 11:54:37 +05:30
Nabin Hait
06a41aca13
fixed asset: related accounts added in default chart of accounts
2016-03-29 11:54:37 +05:30
Nabin Hait
7536349f17
Fixed asset: status, restore, testcase and much more
2016-03-29 11:54:37 +05:30
Nabin Hait
4d668dbaa3
[tests] creation of asset and asset category
2016-03-29 11:54:37 +05:30
Nabin Hait
4fdb05228d
fixed asset depreciation
2016-03-29 11:54:37 +05:30
Nabin Hait
3a15c92c5e
Fixed Asset Depreciation first commit
2016-03-29 11:54:37 +05:30
Rushabh Mehta
3117b4b8d6
[fix] minor for quick-entry
2016-03-29 11:53:17 +05:30
Valmik Jangla
29563275f5
Fix for Opportunity
2016-03-29 11:18:36 +05:30
Rushabh Mehta
9904c5acf4
Merge pull request #5050 from neilLasrado/develop
...
Fixes Translations
2016-03-29 10:51:44 +05:30
Rushabh Mehta
8573aee8b8
bumped to version 6.27.5
2016-03-29 11:19:46 +06:00
Rushabh Mehta
dab3cdc106
Merge pull request #5071 from neilLasrado/pricing-rule-fix
...
Fixed Issues in Pricing rule
2016-03-29 10:18:03 +05:30
rohitwaghchaure
f480f0fd1e
[Fix] Minor changes
2016-03-28 18:52:59 +05:30
Rushabh Mehta
d3fdbaa261
Merge pull request #5041 from nabinhait/recurring_doc_amend
...
[fix] Reset recurring id on amendment
2016-03-28 18:29:44 +05:30
Rushabh Mehta
0a9ad699cf
Merge pull request #5047 from umairsy/task-list-fix
...
On Task, added default filter, Status=Open
2016-03-28 18:28:09 +05:30
Rushabh Mehta
e1b20a0b29
Merge pull request #5044 from rohitwaghchaure/add_margin_feature
...
[Enhancement] Add margin in sales flow.
2016-03-28 18:27:05 +05:30
Rushabh Mehta
730b66b1dd
Merge pull request #4921 from rohitwaghchaure/new_rfq
...
[enhancement] request for quotation
2016-03-28 18:22:02 +05:30
rohitwaghchaure
a1064a6149
[enhancement] request for quotation
2016-03-28 17:28:45 +05:30
Neil Trini Lasrado
b176dea74e
Fixed issues in Pricing Rule if multiple pricing rules existed with same priority
2016-03-28 13:23:47 +05:30
Rushabh Mehta
fe027b34a9
[bot] first bot
2016-03-28 13:21:48 +05:30
Neil Trini Lasrado
b6d9946854
Fixes Translations
2016-03-28 12:44:05 +05:30
Valmik Jangla
47b89756d9
Fix for Holiday List in Maintenance Schedule
2016-03-28 12:34:21 +05:30
rohitwaghchaure
6d1b5d618a
[enhancement] request for quotation
2016-03-28 12:13:07 +05:30
rohitwaghchaure
44d0449895
[enhancement] request for quotation
2016-03-28 12:13:07 +05:30
Rushabh Mehta
d5bf8253da
[fix] job application link, fixes #5066
2016-03-28 11:30:05 +05:30
Rushabh Mehta
c20c536f28
[fix] [wip] cleanup for collaborative pm
2016-03-25 17:22:17 +05:30
rohitwaghchaure
f3f2ecf968
[fixes] Set default company's letter head in purchase flow
2016-03-25 12:57:50 +05:30
Kanchan Chauhan
53ce94f9bd
Minor fixes
2016-03-25 12:04:54 +05:30
Rushabh Mehta
3becd4239f
bumped to version 6.27.4
2016-03-25 12:00:22 +06:00
Rushabh Mehta
1b5edcbbd8
[fix] holiday_list issues in maintenance schedule too
2016-03-25 11:22:15 +05:30
Rushabh Mehta
51135a1522
[fix] fix get holidays in leave application
2016-03-25 11:13:11 +05:30
mbauskar
a52472cf5b
[fixes] added fields in SI and DN, moved the margin calculation to to pricing_rule.py
2016-03-24 14:07:51 +05:30
mbauskar
a720c89535
[docs] documentation for adding margin in Quoation and SO
2016-03-24 14:07:51 +05:30
mbauskar
c1331d0e8e
[minor-fix] pricing rule test-case fix
2016-03-24 14:07:51 +05:30
mbauskar
75b6fbb6a7
[fix] apply pricing rule added type and rate on ignore pricing rule trigger
2016-03-24 14:07:50 +05:30
mbauskar
b6d19bcfc2
[fixes] minor fixes, added eval on pricing rule, Sales Order Item, Quotation Item
2016-03-24 14:07:50 +05:30
mbauskar
6f60339e75
[fix] total margin calculations
2016-03-24 14:07:50 +05:30
mbauskar
dcd8b7773d
[fix] calculated rate on py side, added depends on for sales order item
2016-03-24 14:07:50 +05:30
mbauskar
1e428ae400
[fix] function to calculate the revised margin and rate
2016-03-24 14:07:50 +05:30
mbauskar
46c97c6e95
[fix] discount percentage fix
2016-03-24 14:07:50 +05:30
mbauskar
5e76a1cffa
[fix] added eval for total margin and margin rate field
2016-03-24 14:07:50 +05:30
mbauskar
e40736c105
test case for quotation
2016-03-24 14:07:49 +05:30
mbauskar
b8b56f127f
fetched the markup type and rate of selected item
2016-03-24 14:07:49 +05:30
mbauskar
c79415eb96
added rate and total margin in price_list
2016-03-24 14:07:49 +05:30
mbauskar
36b5189163
calculated the rate and total margin
2016-03-24 14:07:49 +05:30
mbauskar
c97becbd15
added document type in args
2016-03-24 14:07:49 +05:30
mbauskar
5738dd473c
set the target.ignore_pricing_rule to 0
2016-03-24 14:07:49 +05:30
mbauskar
1e9c1640fa
triggers on Margin type and Margin rate fields to calculate the revised Total Margin and Rate
2016-03-24 14:07:49 +05:30
mbauskar
ea60c635ab
changed the description of rate fields depending on margin type and if ignore pricing is unchecked returned the rate=0
2016-03-24 14:07:48 +05:30
mbauskar
8c8fa17a9b
[new fields] added Margin type (Percetage/Amount) and Rate field to capture Margin details in Pricing Rule, Sales Order Item, Quotation Item
2016-03-24 14:07:48 +05:30
DrTrills
6e9c8916c0
Update quotes.py
...
Added a fun fact to change it up
2016-03-23 18:27:34 -04:00
Rushabh Mehta
b2269dd326
[fix] back links from project web view
2016-03-23 18:29:00 +05:30
Umair Sayyed
99a686237a
On Task, added default filter, Status=Open
2016-03-23 15:00:51 +05:30
Kanchan Chauhan
e14389ec6e
Added task and issue webforms and few fixes
2016-03-23 14:14:38 +05:30
Rushabh Mehta
2d832bba70
Merge pull request #5043 from neilLasrado/warehouse
...
Validate purchase item only if material request type is purchase
2016-03-23 12:28:07 +05:30
Neil Trini Lasrado
240f629458
Validate purchase item only if material request type is purchase
2016-03-23 12:13:23 +05:30
Anand Doshi
1947b1784e
[minor] removed typo in order.html
2016-03-23 12:12:41 +05:30
Nabin Hait
7504ea7033
[fix] Reset recurring id on amendment
2016-03-23 12:07:34 +05:30
Rushabh Mehta
bd8d288255
Merge pull request #4993 from KanchanChauhan/collaborativeprojectmanagement
...
[WIP] Collaborative Project Management first commit
2016-03-23 12:02:22 +05:30
Anand Doshi
a75fe1a4c3
Revert "[cleanup] PayPal payment UX and moved related methods to hooks of respective apps"
2016-03-23 11:59:24 +05:30
Rushabh Mehta
eec21d041c
Merge pull request #5028 from anandpdoshi/paypal-cleanup
...
[cleanup] PayPal payment UX and moved related methods to hooks of respective apps
2016-03-23 11:50:46 +05:30
Rushabh Mehta
17da0b8f8b
Merge pull request #5035 from rmehta/warehouse-buttons
...
[enhancement] [minor] stock ledger, general ledger buttons in warehouse
2016-03-23 11:50:30 +05:30
Rushabh Mehta
1e7ca6c77a
Merge pull request #5023 from nabinhait/balance_sheet_opening
...
[fix][balance sheet] Check if precious fiscal year is closed
2016-03-23 11:46:13 +05:30
Rushabh Mehta
b07b06dde0
Merge pull request #5011 from neilLasrado/develop
...
[WIP] - Added Project to Manufacturing
2016-03-23 11:45:35 +05:30
Rushabh Mehta
3cc9b3ef08
[enhancement] [minor] stock ledger, general ledger buttons in warehouse
2016-03-22 16:18:01 +05:30
Kanchan Chauhan
2ad801cfd8
Minor Updates
2016-03-22 16:00:41 +05:30
Rushabh Mehta
e29192c197
[fix] default letter in salary slip comes from customized default or company and optimized boot for curreny
2016-03-22 14:52:25 +05:30
Rushabh Mehta
79a6fc9a84
[fix] recurring patch for purchase
2016-03-22 11:01:31 +05:30
Anand Doshi
71b90b7b7d
[cleanup] PayPal payment UX and moved related methods to hooks of respective apps
2016-03-21 17:50:02 +05:30
Rushabh Mehta
09ec13f7cf
bumped to version 6.27.3
2016-03-21 17:55:09 +06:00
Rushabh Mehta
2179cd97c8
Merge pull request #5026 from nabinhait/modified_fix
...
[fix] Updated modified datetime
2016-03-21 17:23:28 +05:30
Nabin Hait
c8baa01e9c
[fix] Updated modified datetime
2016-03-21 17:20:03 +05:30
Rushabh Mehta
cd04380149
bumped to version 6.27.2
2016-03-21 16:15:21 +06:00
Rushabh Mehta
df3bf5d76b
Merge pull request #5020 from rohitwaghchaure/support_week_14_03_5
...
[formatting] Added between in trends.py
2016-03-21 15:42:34 +05:30
Nabin Hait
2646f84a30
[patch] Fix delivery and billing status of recurring orders
2016-03-21 15:22:31 +05:30
Rushabh Mehta
7364f0cf1c
[patch-fix] remove old patches for web-forms
2016-03-21 14:47:35 +05:30
Nabin Hait
443a7c13e4
[fix][balance sheet] Check if previous fiscal year is closed
2016-03-21 14:38:32 +05:30
Rushabh Mehta
a9ce706bfb
[update] translations
2016-03-21 14:35:36 +05:30
Neil Trini Lasrado
11dafa27ba
Added Project to materail request
2016-03-21 12:40:42 +05:30
Neil Trini Lasrado
c7f53ff318
Added Project filter to Production Planning Tool
2016-03-21 12:40:42 +05:30
rohitwaghchaure
49ccac5d95
[formatting] Added between in trends.py
2016-03-21 12:31:41 +05:30
Rushabh Mehta
98122a2574
Merge pull request #5013 from agusputra/patch-25
...
Update allow-over-delivery-billing-against-sales-order-upto-certain-l…
2016-03-21 12:22:01 +05:30
Rushabh Mehta
ea768ec132
Merge pull request #5019 from saurabh6790/supp1.0
...
[fixes] set todays date on employee attendance tool
2016-03-21 12:06:01 +05:30
Nabin Hait
68a628ea1e
[fix] set recurring id after saving
2016-03-21 12:03:30 +05:30
Saurabh
6a277e244c
[fixes] set todays date on employee attendance tool
2016-03-20 19:00:26 +05:30
Agus Syahputra
383b13cdb5
Update allow-over-delivery-billing-against-sales-order-upto-certain-limit.md
2016-03-19 08:31:50 +07:00
Nabin Hait
6d27470401
bumped to version 6.27.1
2016-03-18 17:06:40 +06:00
Nabin Hait
3f11f0ae44
Merge pull request #5010 from rohitwaghchaure/support_week_14_03_5
...
[Enhancement]Fetch default letter head of company on salary structure and salary slip
2016-03-18 16:35:14 +05:30
rohitwaghchaure
277b7fa641
[Enhancement]Fetch default letter head of company on salary structure and salary slip
2016-03-18 16:33:18 +05:30
Nabin Hait
9a75530c26
[fix] reload doctype for renaming project
2016-03-18 16:19:25 +05:30
rohitwaghchaure
cef1086441
[fix]Letterhead not being changed with change in company
2016-03-18 15:37:24 +05:30
Nabin Hait
d6c59656e8
Merge pull request #5009 from saurabh6790/cart_fixes-1.0
...
[fixes] return debtors account name
2016-03-18 15:36:06 +05:30
Nabin Hait
5996b2f1bb
[fix] recurring document logic
2016-03-18 15:19:54 +05:30
Saurabh
b43df36e85
[fixes] return debtors account name
2016-03-18 15:05:50 +05:30
rohitwaghchaure
90ff509f6d
[fix]Earlier recurring billing
2016-03-18 10:44:53 +05:30
rohitwaghchaure
5b9d517d04
[fix]Fiscal year removed from trends report
2016-03-17 22:46:09 +05:30
Nabin Hait
eba2c4323e
bumped to version 6.27.0
2016-03-17 20:01:45 +06:00
Nabin Hait
1ecd8cdaa3
[change-log]
2016-03-17 19:26:29 +05:30
Nabin Hait
24f1c50dca
Create sample Material Requests via setup wizard only if warehouse exists
2016-03-17 19:14:53 +05:30
Nabin Hait
4f01704234
[fix] Fetch shipping address only if field exists
2016-03-17 19:14:53 +05:30
Nabin Hait
547d223b28
Merge pull request #4979 from vjFaLk/leave-improvements
...
Improved Leave Application / Approver feature
2016-03-17 19:06:06 +05:30
Nabin Hait
2e08e3e186
Merge pull request #4991 from neilLasrado/develop
...
Fixed Production Planning Tool
2016-03-17 19:05:09 +05:30
Nabin Hait
4e78cee1c2
Merge pull request #4959 from ShashaQin/patch-37
...
Improvements about Item Prices Report
2016-03-17 18:13:09 +05:30
Nabin Hait
2ed8f8f099
[fix] BOM Browser
2016-03-17 15:55:48 +05:30
Nabin Hait
cf8fd6274d
Merge pull request #4994 from umairsy/report-fix
...
fixes in the Account Receivable print format - with Nabin
2016-03-17 15:53:26 +05:30
Rushabh Mehta
813b9efe28
[fix] [minor] address.py
2016-03-17 15:36:30 +05:30
Umair Sayyed
8cbc076dc2
fixes in the Account Receivale print format - with Nabin
2016-03-17 15:12:31 +05:30
Valmik Jangla
15343be386
Commonified functions for retrieving Leave Approvers
2016-03-17 11:47:30 +05:30
Valmik Jangla
33cc081c3b
Improved Leave Application / Approver feature
2016-03-17 11:47:30 +05:30
Kanchan Chauhan
b3fe6a45a7
WIP Collaborative Project Management first commit
2016-03-16 18:34:33 +05:30
Nabin Hait
6221117069
[fix] shipping address position in document
2016-03-16 16:23:30 +05:30
Nabin Hait
cd6c09fbee
[fix] shipping address in purchasee cycle
2016-03-16 16:23:30 +05:30
Saurabh
0f063a5f46
[patch] map customer_address to shipping_address and customer_address_display to shipping_address_display
2016-03-16 16:23:30 +05:30
Saurabh
14d646f636
[fixes] shipping address on purchase flow
2016-03-16 16:23:30 +05:30
shreyas
7e2d7e88a6
[Partial]Some more changes to enable shipping address to be displayed in PO
2016-03-16 16:23:30 +05:30
shreyas
26bb6f37bc
[Partial] Fix to add Shipping address in Purchase order
2016-03-16 16:23:29 +05:30
shreyas
77d23824df
[Partial]Some more changes to enable shipping address to be displayed in PO
2016-03-16 16:23:29 +05:30
shreyas
22d26a1d82
[Partial] Fix to add Shipping address in Purchase order
2016-03-16 16:23:29 +05:30
Nabin Hait
91a69e4a8d
Merge pull request #4992 from neilLasrado/project-rename
...
Fixed bug while selecting project in sales_invoice, sales_order, deli…
2016-03-16 16:03:18 +05:30
Neil Trini Lasrado
f433a5a124
Fixed bug while selecting project in sales_invoice, sales_order, delivery_note
2016-03-16 16:00:27 +05:30
Neil Trini Lasrado
41380dfad8
Fixed Production Planning Tool
2016-03-16 15:26:01 +05:30
Nabin Hait
2a5c1138a0
Merge pull request #4944 from rmehta/modules-redesign
...
[redesign] modules
2016-03-16 14:35:11 +05:30
ShashaQin
769b01e07a
Update item_prices.py
2016-03-16 16:37:28 +08:00
Nabin Hait
fc827b329e
Merge pull request #4932 from ci2014/patch-2
...
Update purchase-return.md
2016-03-16 12:33:33 +05:30
Nabin Hait
1f11b96533
Merge pull request #4931 from ci2014/patch-1
...
Update sales-return.md
2016-03-16 12:32:42 +05:30
Nabin Hait
a61930e7a7
[fix] reload doctype forcefully to rename project field
2016-03-16 12:29:32 +05:30
Nabin Hait
22d4a7e742
Merge branch 'prod-order' of https://github.com/neilLasrado/erpnext into neilLasrado-prod-order
2016-03-16 12:18:01 +05:30
Nabin Hait
df4deba515
minor fix
2016-03-16 11:16:31 +05:30
Neil Trini Lasrado
6e343e23d9
Renamed project_name to project
2016-03-15 17:50:53 +05:30
Nabin Hait
d0723f8a96
bumped to version 6.26.0
2016-03-15 17:13:05 +06:00
Nabin Hait
2ecf239925
[change-log]
2016-03-15 16:26:36 +05:30
Nabin Hait
29b01226ea
[translations]
2016-03-15 16:17:21 +05:30
Nabin Hait
f853a92676
Fixes in AR/AP Print Format
2016-03-15 16:10:15 +05:30
Nabin Hait
89301863e5
minot fixes
2016-03-15 15:20:49 +05:30
Nabin Hait
6c3cc3647b
Merge pull request #4969 from rmehta/link-count
...
[enhancement] sort links on basis of link_count (idx)
2016-03-15 11:40:18 +05:30
Nabin Hait
b9126317b3
Merge pull request #4981 from umairsy/march1
...
updated manual
2016-03-15 11:39:29 +05:30
rohitwaghchaure
986616f8ee
[fixes]draft BOM showing in Material Request
2016-03-14 19:33:30 +05:30
Umair Sayyed
d3ed3638cf
updated manual
2016-03-14 19:28:53 +05:30
Nabin Hait
5fc9552d29
Merge pull request #4980 from rohitwaghchaure/support_week_14_03
...
[fixes]Unable set recurring date in sales order
2016-03-14 19:20:13 +05:30
Nabin Hait
b1f0a7d52e
Merge pull request #4876 from saurabh6790/valuation_rate_on_so
...
[enhancement] get valuation rate and gross profit on sales order item
2016-03-14 19:18:58 +05:30
rohitwaghchaure
c54b805981
[fixes]Unable set recurring date in sales order
2016-03-14 19:03:22 +05:30
Nabin Hait
a098b4178a
Merge pull request #4976 from saurabh6790/pr_from_si
...
[fixes] set amount in PR by checking party_account_currency field
2016-03-14 19:01:07 +05:30
Nabin Hait
c2f973b521
Merge pull request #4977 from nabinhait/fix88
...
[fix] Item or Warehouse filter mandatory in Stock Balance if number of sle is greater than 500000
2016-03-14 19:00:42 +05:30
Anand Doshi
ad61a28730
[fix] [hot] compact print: check in_format_data for print format builder prints
2016-03-14 18:20:48 +05:30
rohitwaghchaure
bea7558908
[fixes]indicator in material request item
2016-03-14 17:47:36 +05:30
Nabin Hait
aa7e17cd80
Merge pull request #4970 from nabinhait/fix77
...
[fix] delete company transactions
2016-03-14 16:36:51 +05:30
Saurabh
c54619570a
[fixes] check party_account_currency while creating Pull Request from Sales Invoice
2016-03-14 15:55:23 +05:30
Nabin Hait
d1f85c4fe6
[fix] Item or Warehouse filter mandatory in Stock Balance if number of sle is greater than 500000
2016-03-14 14:59:21 +05:30
Saurabh
9f94266892
[fixes] fetch value from grand total field while creating payment request from si
2016-03-14 11:23:03 +05:30
Anand Doshi
01a8473996
[fix] [docs] removed contents.md
2016-03-12 00:08:38 +05:30
Anand Doshi
f319206d22
[fix] [hot] reload doctype Holiday List
2016-03-11 19:45:28 +05:30
Nabin Hait
653f68d2e4
[fix] delete company transactions
2016-03-11 17:36:57 +05:30
Anand Doshi
4284fcf2a6
[fix] additional fixes for removal of Fiscal Year form Holiday List
2016-03-11 17:16:30 +05:30
ci2014
73db44d0b9
Update purchase-return.md
...
Added back {next}
2016-03-11 11:27:17 +01:00
Valmik Jangla
e2b8af16ed
Fixed Salary Slip to work with new Holiday List
2016-03-11 14:58:55 +05:30
Valmik Jangla
ba54a43e32
Fixed Maintenance Schedule to work wit new Holiday List
...
Improved code in Holiday List for speed
2016-03-11 14:58:55 +05:30
Valmik Jangla
3427c939bd
Removed unused code
2016-03-11 14:58:55 +05:30
Valmik Jangla
c666030f34
Get Weekly Off dates now gets dates dynamically
...
Fixed Holiday List test records
2016-03-11 14:58:55 +05:30
Valmik Jangla
3085186182
Removed Fiscal Year from Holiday List and Calendar
2016-03-11 14:58:55 +05:30
Anand Doshi
c75c1d7e3e
[fix] additional fixes after deprecating Fiscal Year
2016-03-11 14:56:19 +05:30
Rushabh Mehta
3574b37ff3
[enhancement] sort links on basis of link_count (idx)
2016-03-11 14:33:04 +05:30
Valmik Jangla
d9cc14ddd5
Removed from Leave Block List and Monthly Attendance List
2016-03-11 13:07:49 +05:30
Valmik Jangla
13bb2ba779
Removed fiscal year related things from, Recurrent Document, Leave Application, Upload attendance, Stock Reconciliation and Stock Balance
2016-03-11 13:07:49 +05:30
Valmik Jangla
063946a02f
Removed from Purchase Invoice and Purchase Reciept
2016-03-11 13:07:48 +05:30
Valmik Jangla
d89dcf60e6
Removed from Delivery Note and Appraisal
...
Added back in Stock Ledger Entry
Added validation in GL Entry and SL Entry
Stock Controller sets Fiscal Year using Posting Date
2016-03-11 13:07:48 +05:30
Valmik Jangla
d4ac3d8ceb
Removed from Stock Ledger Entry and Sales Invoice
2016-03-11 13:07:48 +05:30
Valmik Jangla
98ec1164fc
Removed from Attendance, Upload Attendance, and Sales Order
2016-03-11 13:07:16 +05:30
Valmik Jangla
836fd6450d
Removed from Purchase Order and Supplier Quotation
2016-03-11 13:07:16 +05:30
Valmik Jangla
cd9daf6671
Removed from Journal Entry and Stock Reconciliation
2016-03-11 13:07:16 +05:30
Valmik Jangla
c7e774fda9
BudgetError Fix
2016-03-11 13:05:20 +05:30
Valmik Jangla
865d547965
Removed from GL Entry, Opportunity and Quotation
2016-03-11 13:05:20 +05:30
Valmik Jangla
bc60970fcb
Removed from Maitenance Visit and Warranty Claim
2016-03-11 13:05:19 +05:30
Valmik Jangla
319bbad4d4
Removed from Stock Entry
2016-03-11 13:05:19 +05:30
Valmik Jangla
57b69cecbf
Removed from C-Form
2016-03-11 13:05:19 +05:30
Valmik Jangla
634ecae020
Removed from Lead
2016-03-11 13:05:19 +05:30
Valmik Jangla
c4c603dcd2
Removed from Expense Claim
2016-03-11 13:05:19 +05:30
Valmik Jangla
1d797c1688
Removed from Installation Note
2016-03-11 13:05:19 +05:30
Anand Doshi
22ef68945d
[minor] comment about hack
2016-03-11 12:47:14 +05:30
Anand Doshi
39dda5cf49
bumped to version 6.25.5
2016-03-11 13:00:42 +06:00
shreyas
6c89bb1900
[Minor] Moved company field to top of the form, making it more consistent other doctypes
2016-03-11 12:12:30 +05:30
Anand Doshi
06b3ecb99b
bumped to version 6.25.4
2016-03-10 16:21:35 +06:00
Anand Doshi
6d59a41b27
[fix] delete Web Form contact
2016-03-10 14:31:04 +05:30
Anand Doshi
1bca0780a4
bumped to version 6.25.3
2016-03-10 13:18:52 +06:00
Anand Doshi
b015f9eca2
[fix] [hot] web form fixtures - removed Contact, added Issues and Addresses
2016-03-10 12:40:10 +05:30
ShashaQin
e8d635827a
Update item_prices.py
2016-03-10 14:55:06 +08:00
Anand Doshi
f0e16e68c5
Merge pull request #4962 from nabinhait/trial_balance_fix
...
[fix] Trial Balance report, showing rows with zero values
2016-03-10 12:24:24 +05:30
Nabin Hait
3883e86ad7
[fix] Trial Balance report, showing rows with zero values
2016-03-10 12:01:01 +05:30
Nabin Hait
dd8dbe000b
[fix] Rearranged position of mode_of_payment in sales invoice
2016-03-10 10:58:31 +05:30
ShashaQin
c6b5f7dcae
Update item_prices.py
2016-03-10 08:49:38 +08:00
Anand Doshi
25e947bef6
bumped to version 6.25.2
2016-03-09 19:34:54 +06:00
Anand Doshi
bb4db5ae80
[fix] [hot] german translation for Sales Return = Rücklieferung
2016-03-09 19:00:30 +05:30
Anand Doshi
a2d03c849f
bumped to version 6.25.1
2016-03-09 17:04:03 +06:00
Anand Doshi
0179242f04
[fix] [hot] setup wizard domain
2016-03-09 16:32:13 +05:30
Anand Doshi
1d0c5896c0
bumped to version 6.25.0
2016-03-09 16:17:14 +06:00
Saurabh
3fbf3ce852
[fixes] raise if selects product bundle as sub item in another product bundle.
2016-03-09 15:42:01 +05:30
Saurabh
bd01a81638
[fixes] calculate valuation rate for stock, non-stop and product bundle items
2016-03-09 15:42:01 +05:30
Saurabh
5ada14b887
[fixes] calculate valuation rate for non stock item
2016-03-09 15:42:01 +05:30
Saurabh
2d7af63351
[fixe] typo-fixes and set base currency symbol to gross-profit and valuation rate
2016-03-09 15:42:00 +05:30
Saurabh
d313553ae3
[enhancement] get valuation rate and gross profit on sales order item
2016-03-09 15:42:00 +05:30
Anand Doshi
27e9b77a3d
[translations]
2016-03-09 14:50:38 +05:30
Anand Doshi
71ea34a0ba
[change log]
2016-03-09 14:50:37 +05:30
Anand Doshi
065d24b26d
Merge pull request #4951 from shreyasp/gross-profit-wn-sup17486
...
[Minor] Remove Warehouse column while user groups by 'Item code' in Gross profit report
2016-03-09 14:22:16 +05:30
shreyas
7c42995949
[Minor] Remove Warehouse column while user groups by 'Item code' in Gross profit report
2016-03-09 13:15:38 +05:30
Anand Doshi
3fb67c7c3b
Merge pull request #4945 from shreyasp/mr-wn-sup17487
...
[Minor] Displaying 'for warehouse' while creating Material request from BOM
2016-03-09 10:32:15 +05:30
ci2014
1e735a87aa
Update purchase-return.md
...
Fixed the images.
2016-03-08 17:13:18 +01:00
Neil Trini Lasrado
1b03e0a6d0
Added Other as a Domain in Company/setup wizard
2016-03-08 20:22:24 +05:30
Neil Trini Lasrado
342895c9df
Added Domain to setup wizard
2016-03-08 19:55:57 +05:30
ci2014
6dd7e682af
Update sales-return.md
...
Fixed the images.
2016-03-08 15:13:04 +01:00
shreyas
007e87b8a5
[Minor] Whitespace fixes
2016-03-08 19:01:50 +05:30
shreyas
405b66898e
[Minor] Displaying 'for warehouse' while creating Material request from BOM
2016-03-08 18:39:20 +05:30
Rushabh Mehta
d1e1c52171
[redesign] modules
2016-03-08 18:07:20 +05:30
Anand Doshi
b073cf4fa1
[fix] POS amount_paid when not cash - Fixes #4686 , #4828 , #4289
2016-03-08 17:59:19 +05:30
Anand Doshi
20b2a75603
Merge pull request #4943 from strixaluco/develop
...
Minor typo fix in bulk-rename.md
2016-03-08 17:40:48 +05:30
Javier Wong
102f9062e8
Whitelist get_month_details
...
This is useful when manually pulling the salary structure in custom scripts for processing of other customized deductables or perhaps contributions.
2016-03-08 17:39:58 +05:30
strixaluco
184f0fa264
Minor typo fix in bulk-rename.md
2016-03-08 16:57:04 +08:00
Anand Doshi
ba7b05ad27
Merge branch 'emakis-in_words_configurable' into develop
2016-03-07 20:00:54 +05:30
emakis
b5b3d478a2
Made In Words configurable
2016-03-07 20:00:41 +05:30
Anand Doshi
44f777eeec
[fix] Material Request notifications docstatus < 2
2016-03-07 19:35:54 +05:30
Anand Doshi
a2bd145d68
Merge pull request #4935 from shreyasp/sales-inv-WN-SUP17465
...
[Minor] Fix print settings for custom print format
2016-03-07 19:21:51 +05:30
Anand Doshi
40b230ea9e
Merge pull request #4926 from nabinhait/balance_sheet
...
[fix][report] Show group rows with zero values if there are values against children
2016-03-07 19:15:46 +05:30
shreyas
6f8dfa4c8d
[Minor] Fix print settings for custom print format
2016-03-07 18:22:40 +05:30
Anand Doshi
dab167791c
Merge pull request #4934 from anandpdoshi/fix/stock-balance-filters
...
[fix] Run Stock Balance report only after one of the filters is set
2016-03-07 14:31:08 +05:30
Anand Doshi
0902fb2e3d
[fix] Run Stock Balance report only after one of the filters is set
2016-03-07 13:11:59 +05:30
Rushabh Mehta
5a700820e7
[fix] [minor] autoload chart of accounts
2016-03-07 11:57:54 +05:30
ci2014
fde7bfec31
Update purchase-return.md
...
You swapped sales return and purchase return in the german documentation, see https://github.com/frappe/erpnext/pull/4931
2016-03-07 00:45:15 +01:00
ci2014
943d707021
Update sales-return.md
...
You swapped sales return and purchase return in the german documentation.
2016-03-07 00:42:55 +01:00
frehu01
eb5ad3f793
Update journal-entry.md
2016-03-06 17:52:29 +01:00
Nabin Hait
acb28954ff
[fix][report] Show group rows with zero values if there are values against children
2016-03-04 12:32:44 +05:30
Rushabh Mehta
d3c04a3eda
bumped to version 6.24.5
2016-03-03 17:18:45 +06:00
Rushabh Mehta
0c1b8f4334
[fix] [minor] autoload chart of accounts
2016-03-03 16:47:36 +05:30
Rushabh Mehta
571a9d0f19
[fix] [tests]
2016-03-03 15:03:40 +05:30
Rushabh Mehta
563f023c11
bumped to version 6.24.4
2016-03-03 14:27:45 +06:00
Rushabh Mehta
1396b776bc
[fix] print hide for submit_on_creation
2016-03-03 13:57:15 +05:30
Rushabh Mehta
369b9cf928
bumped to version 6.24.3
2016-03-03 13:43:21 +06:00
Rushabh Mehta
7114b7786e
[fix] print hide for submit_on_create
2016-03-03 13:12:21 +05:30
Rushabh Mehta
a8d04b11c3
bumped to version 6.24.2
2016-03-03 13:32:23 +06:00
Rushabh Mehta
756e518bc1
[fix] recurring
2016-03-03 13:00:30 +05:30
Rushabh Mehta
c72267b98b
Merge pull request #4919 from agusputra/patch-24
...
Update item-price.md
2016-03-03 11:30:01 +05:30
Rushabh Mehta
526f042bb7
Merge pull request #4915 from jayala/patch-1
...
Update concepts-and-terms.md
2016-03-03 11:29:54 +05:30
Rushabh Mehta
14b83cf391
bumped to version 6.24.1
2016-03-03 11:57:42 +06:00
Rushabh Mehta
d627af2c97
[translations]
2016-03-03 11:25:46 +05:30
Rushabh Mehta
cf6b786950
bumped to version 6.24.0
2016-03-03 11:35:22 +06:00
Rushabh Mehta
a12eb686a5
[change-log] 6.24.0
2016-03-03 11:03:38 +05:30
Rushabh Mehta
07263462f6
[minor] add translated get_formatted
2016-03-03 10:48:45 +05:30
Rushabh Mehta
69cfab8559
[fix] [patch] recurring
2016-03-03 10:37:45 +05:30
Agus Syahputra
32362f14f4
Update item-price.md
2016-03-03 08:03:59 +07:00
Jesús Ayala
18bfad5a66
Update concepts-and-terms.md
2016-03-02 10:05:45 -03:00
Rushabh Mehta
5839a8d7f0
[fixes] usability cleanup of recurring document and added explicit submit_on_creation
2016-03-02 17:51:52 +05:30
Rushabh Mehta
f1ad694356
Merge pull request #4912 from ShashaQin/patch-31
...
minor improvement on item query
2016-03-02 16:19:21 +05:30
Rushabh Mehta
aac4dcedc8
[fix] print language and contact_email fields and removed translations
2016-03-02 15:45:09 +05:30
Rushabh Mehta
b0f0aaf5b1
[minor] added chart of accounts, cost centers buttons on Company
2016-03-02 13:08:40 +05:30
Rushabh Mehta
fe6eadfe22
[cleanup] job opening and job applicant
2016-03-02 12:53:19 +05:30
ShashaQin
425ab6bb1e
Update queries.py
2016-03-02 13:07:58 +08:00
Rushabh Mehta
cbed331047
Merge pull request #4909 from rohitwaghchaure/multilingual_print_format_test
...
Multilingual print format test
2016-03-01 17:10:50 +05:30
rohitwaghchaure
4151e3dc92
[enhancement] Multi-lingual print format
2016-03-01 16:33:08 +05:30
Rushabh Mehta
6020e9ceb3
Merge pull request #4906 from smorele/doc_fixes
...
fixe broken links
2016-03-01 16:15:56 +05:30
Rushabh Mehta
5b9d6494a6
Merge pull request #4900 from rmehta/minor-fixes
...
[minor] fix notification for material request, splash icon, cleanup project form layout
2016-03-01 16:15:25 +05:30
Rushabh Mehta
e670525c55
Merge pull request #4899 from nabinhait/seriailized_stock_valuation
...
Seriailized stock valuation
2016-03-01 16:13:09 +05:30
Rushabh Mehta
39a6f804bf
Merge pull request #4871 from ShashaQin/patch-27
...
Improvements about recurring documents
2016-03-01 16:06:33 +05:30
Rushabh Mehta
ddeb576d52
Merge pull request #4849 from rasos/patch-1
...
Create at_austria_chart_Einheitskontenrahmen.json
2016-03-01 16:05:13 +05:30
smorele
0a58d9e0f4
fixe broken links
2016-03-01 09:53:23 +01:00
Kanchan Chauhan
1f3d5b7ee9
[fix] added web form fixtures
2016-03-01 11:33:49 +05:30
Rushabh Mehta
45fd073094
Merge pull request #4897 from agusputra/patch-23
...
Update withdrawing-salary-from-owners-equity-account.md
2016-02-29 17:35:18 +05:30
Rushabh Mehta
980a00d9d7
Merge pull request #4892 from agusputra/patch-22
...
Update update-stock-option-in-sales-invoice.md
2016-02-29 17:34:54 +05:30
Rushabh Mehta
95ffe3bc7b
[docs] added work-in-progress for Spanish manual
2016-02-29 17:22:25 +05:30
paulocoronado
18d465dc0d
Adding WORK IN PROGRESS
2016-02-29 17:22:25 +05:30
paulocoronado
23ef60a467
work in progress
...
Spanish Transalation
2016-02-29 17:22:24 +05:30
paulocoronado
8f6b1e0549
Páginas de inicio de la traducción al español.
...
First commit of Spanish translation
2016-02-29 17:22:24 +05:30
Rushabh Mehta
ae7dc31d14
Merge pull request #4846 from KanchanChauhan/job-applicant
...
Added feature to allow people to apply for job from website
2016-02-29 17:22:01 +05:30
Rushabh Mehta
6fa497c87a
bumped to version 6.23.7
2016-02-29 15:20:54 +06:00
Rushabh Mehta
a4decc2c59
[minor] [test] fix for leap year
2016-02-29 14:44:20 +05:30
Rushabh Mehta
f1083c9a74
[minor] fix messages in material request
2016-02-29 14:38:25 +05:30
Nabin Hait
94a1f3eb90
[fix] Time Log overlap validation and test cases
2016-02-29 13:15:27 +05:30
Nabin Hait
5a4c7d3b62
[patch] repost valuation rate for serialized items
2016-02-29 12:07:42 +05:30
Nabin Hait
2620bf402f
[fix] Stock Valuation for serialized items
2016-02-29 12:07:42 +05:30
Agus Syahputra
1b28f58829
Update withdrawing-salary-from-owners-equity-account.md
2016-02-29 08:04:02 +07:00
Agus Syahputra
034fcb3410
Update update-stock-option-in-sales-invoice.md
2016-02-28 11:49:00 +07:00
Rushabh Mehta
4403853828
[minor] fix notification for material request, splash icon, cleanup project form layout
2016-02-27 16:24:34 +05:30
ShashaQin
8d1dea6aad
Update recurring_document.py
2016-02-27 14:00:58 +08:00
Nabin Hait
f34e63123f
Merge pull request #4877 from agusputra/patch-18
...
Update period-closing-voucher.md
2016-02-27 10:11:20 +05:30
Nabin Hait
598c9c4679
Merge pull request #4884 from umairsy/feb-2nd
...
updated manual
2016-02-27 10:10:34 +05:30
Nabin Hait
2174790545
Merge pull request #4886 from saurabh6790/add_projected_qty_on_quotation
...
[fixes] set projected qty in Quotaion Item table
2016-02-27 10:04:20 +05:30
Nabin Hait
f9103b1b0b
Merge pull request #4887 from sbkolate/patch-3
...
enable uom in BOM Table View
2016-02-27 10:02:59 +05:30
Nabin Hait
e0cc597f70
Merge pull request #4888 from agusputra/patch-19
...
Update freeze-accounting-entries.md
2016-02-27 10:02:24 +05:30
Agus Syahputra
8fa6f79f7e
Update managing-transactions-in-multiple-currency.md
2016-02-27 07:22:50 +07:00
Agus Syahputra
f7face6384
Update freeze-accounting-entries.md
2016-02-27 07:08:20 +07:00
Anand Doshi
18e988e4ce
bumped to version 6.23.6
2016-02-26 21:28:26 +06:00
Anand Doshi
7b52dc9f32
[hotfix] added back comment_feed_communication patch
2016-02-26 20:51:33 +05:30
sbkolate
a897882434
enable uom in BOM Table View
...
reference
https://discuss.erpnext.com/t/uom-in-item-tables/10733/4
2016-02-26 19:32:11 +05:30
Saurabh
cc7132763f
[fixes] set projected qty in Quotaion Item table
2016-02-26 18:33:53 +05:30
Nabin Hait
658b3260c2
bumped to version 6.23.5
2016-02-26 18:04:46 +06:00
Umair Sayyed
d1029b54c2
updated manual
2016-02-26 17:32:44 +05:30
Nabin Hait
56f7fa66ad
[fix] Time log overlap validation
2016-02-26 17:19:11 +05:30
Nabin Hait
bdf0f0a08d
[fix] Show debit note button in purchase invoice
2016-02-26 16:26:28 +05:30
Nabin Hait
eb0c08f328
bumped to version 6.23.4
2016-02-26 15:51:02 +06:00
Nabin Hait
0f6eac3b35
[fix] Show credit note button in sales invoice
2016-02-26 13:01:32 +05:30
Agus Syahputra
91bd4ce3e1
Update period-closing-voucher.md
2016-02-26 07:45:14 +07:00
Nabin Hait
cd3b37dcfe
bumped to version 6.23.3
2016-02-25 19:43:31 +06:00
Nabin Hait
55f0834e99
[fix] Show payment button in purchase invoice
2016-02-25 19:12:37 +05:30
Nabin Hait
6107ccd5ea
bumped to version 6.23.2
2016-02-25 15:48:42 +06:00
Nabin Hait
737849a0f5
[patch] Update stopped status to close
2016-02-25 15:16:02 +05:30
ShashaQin
ed71e6cea6
Update test_recurring_document.py
2016-02-25 15:47:25 +08:00
ShashaQin
5afca21571
Update test_recurring_document.py
2016-02-25 15:21:14 +08:00
Nabin Hait
6c7c1223c3
bumped to version 6.23.1
2016-02-25 12:29:39 +06:00
Nabin Hait
a1d5494fb3
Merge pull request #4867 from KanchanChauhan/item-group
...
Added pagination to Products web page
2016-02-25 11:56:30 +05:30
Nabin Hait
e9065677c6
Merge pull request #4866 from neilLasrado/develop
...
Fixes in Setup Wizard
2016-02-25 11:06:14 +05:30
Nabin Hait
1a9c1c4243
Merge pull request #4868 from nabinhait/bom_fix
...
[fix] validate BOMs in BOM Replace Tool
2016-02-25 10:41:38 +05:30
ShashaQin
6071ddc3dd
Update recurring_document.py
2016-02-25 11:25:24 +08:00
ShashaQin
73c71f9dd5
Update sales_order.json
2016-02-25 11:22:27 +08:00
ShashaQin
2f0a14bda0
Update purchase_order.json
2016-02-25 11:19:56 +08:00
ShashaQin
ae629ad29f
Update purchase_invoice.json
2016-02-25 11:17:13 +08:00
ShashaQin
02a38e8b5e
Update sales_invoice.json
...
Add 'Notify by Email' check box and set next_date can be changed by user
2016-02-25 11:13:19 +08:00
sbkolate
f9a9754dab
opportunities status fix in Sales Funnel report
...
reference https://discuss.erpnext.com/t/sales-funnel-not-showing-updated-opportunities/10702/4
2016-02-24 19:25:35 +05:30
Nabin Hait
baa6d96a82
[fix] validate BOMs in BOM Replace Tool
2016-02-24 18:51:13 +05:30
Nabin Hait
ed08e88de4
bumped to version 6.23.0
2016-02-24 18:49:22 +06:00
Nabin Hait
40505dcfb1
[change-log]
2016-02-24 18:17:14 +05:30
Neil Trini Lasrado
3c0d5cbab5
Fixes in Setup Wizard
2016-02-24 18:02:08 +05:30
Kanchan Chauhan
0d6db633f7
Added pagination to Products web page
2016-02-24 17:29:25 +05:30
Saurabh
00212a23e1
[fixes] removed base_grand_total from payment request
2016-02-24 16:50:19 +05:30
Saurabh
6d1dbd6384
[fixes] currency exchange rate and payment gateway account fixes for multicurrency
2016-02-24 15:07:26 +05:30
Saurabh
4a6bbf9b72
[fixes] added filters company and currency to get account, removed account name wise comparison
2016-02-24 15:07:26 +05:30
Saurabh
f54be2c7f0
[fixes] test case fixes for multi-currency check
2016-02-24 15:07:25 +05:30
Saurabh
1864879b91
[fixes] fix grand total calculation for Payment Request and set visibility of Resend Payment Email button
2016-02-24 15:07:25 +05:30
Saurabh
3a2682919a
[enhance] set customer payable account to new customer as per payment gateway account currency via cart if cart and checkout is enable
2016-02-24 15:07:25 +05:30
Saurabh
2dc2d671da
[clean-up]
2016-02-24 15:07:25 +05:30
Saurabh
7d5b47e113
[fixes] minor fix in test-case
2016-02-24 15:07:25 +05:30
Saurabh
fa32588e72
[fixes] minor fix in test-case
2016-02-24 15:07:25 +05:30
Saurabh
1e800a9ef0
[fixes] multi-currency via payment request
2016-02-24 15:07:25 +05:30
Saurabh
da9e9cdb13
[fixes] minor get_payment_gateway_account
2016-02-24 15:07:24 +05:30
Saurabh
dca6302e15
[fixes] field renaming, cart checkout fixes, JE fixes for multi-currency payment
2016-02-24 15:07:24 +05:30
Saurabh
883cc04701
[fixes] compare attributes in lower case
2016-02-24 15:07:24 +05:30
Nabin Hait
da297dcfc5
[translations]
2016-02-24 14:37:38 +05:30
Anand Doshi
acd1bcffde
[fix] changed field type to Code
2016-02-24 12:38:08 +05:30
Nabin Hait
57b30430e4
Merge pull request #4695 from neilLasrado/develop
...
Material Request of type Manufcture
2016-02-24 12:30:53 +05:30
Nabin Hait
d2d261dc87
Merge pull request #4854 from patilsangram/develop
...
Removed Stop Button from SO and PO
2016-02-24 11:21:17 +05:30
Nabin Hait
38f470288f
Merge pull request #4806 from creador30/productbundle_improvement
...
Product Bundle improvement
2016-02-24 11:12:47 +05:30
Nabin Hait
1a16a4f394
Merge pull request #4863 from agusputra/patch-17
...
Update opening-accounts.md
2016-02-24 11:11:06 +05:30
Agus Syahputra
6338f407d9
Update opening-accounts.md
2016-02-24 07:28:46 +07:00
Agus Syahputra
eeda0460d4
Update multi-currency-accounting.md
2016-02-24 07:26:06 +07:00
creador
4b6b6fe5a8
[fix] unify packing description and packed item description
2016-02-23 22:12:02 +02:00
saurabh
64ec677cf7
deleted extra doctype
2016-02-24 01:07:49 +05:30
patilsangram
a812d67837
[fixes]
2016-02-23 19:04:29 +05:30
Neil Trini Lasrado
f79760ce2d
Mumtiple fixes
2016-02-23 18:35:45 +05:30
Neil Trini Lasrado
0dd8500393
Fixed Documentation
2016-02-23 18:35:44 +05:30
Neil Trini Lasrado
d5e15eaadf
Added test cases
2016-02-23 18:35:44 +05:30
Neil Trini Lasrado
fd9dc5e9f5
refactor code in Production Planning Tool
2016-02-23 18:35:44 +05:30
Neil Trini Lasrado
877e2ebff8
Fixed Production PLanning Tool
2016-02-23 18:35:44 +05:30
Neil Trini Lasrado
43114bab71
renamed label of Quantity Requested for Purchase to Requested Quantity in Bin
2016-02-23 18:35:44 +05:30
Neil Trini Lasrado
dddf42560f
Added code to update Material Request on Submission of Production Order
2016-02-23 18:35:44 +05:30
Neil Trini Lasrado
abd9248ba6
Rename sales_order_no to sales_order in Material Request Item
2016-02-23 18:35:43 +05:30
Neil Trini Lasrado
0b40ccc43c
Removed unwanted code
2016-02-23 18:35:43 +05:30
Neil Trini Lasrado
695bf47a1d
changed image feild (type attach) to attach image, removed Image view
2016-02-23 18:35:43 +05:30
Neil Trini Lasrado
e9cd22aff9
Fixed make Prod_order from Material Request
2016-02-23 18:35:43 +05:30
Neil Trini Lasrado
9739dc3639
Added make Production Order button against Material Request
2016-02-23 18:35:42 +05:30
Neil Trini Lasrado
cc23bc0549
Removed Material Request type validation
2016-02-23 18:35:42 +05:30
Neil Trini Lasrado
966e5643c9
Added Material Request Link to Production Order
2016-02-23 18:35:42 +05:30
Neil Trini Lasrado
3353b5ee62
Added material request type Manufacture
2016-02-23 18:35:42 +05:30
Saurabh
ac33724656
[fixes] removed no copy for warehouse field
2016-02-23 18:18:04 +05:30
Saurabh
3724448cd3
[fixes] typo-fixes and fix in balance qty fetching
2016-02-23 18:18:04 +05:30
Saurabh
dcb72c6be7
[enhance] Displaying stock balance while creating quotation
2016-02-23 18:18:04 +05:30
Nabin Hait
8a59c33e2f
[fix] Sales Person target variance report: based on lft and rgt of item group
2016-02-23 15:23:24 +05:30
saurabh
42d5d8390d
Resolved conflicts
2016-02-23 13:15:02 +05:30
saurabh
fb71f32ebf
conflicts resolved
2016-02-23 02:26:37 +05:30
saurabh
2e2dd0fb42
Documentation of multilingual print format and minor fixes
2016-02-23 02:17:04 +05:30
rohit waghchaure
da321b44cb
removed translator
2016-02-23 02:17:04 +05:30
saurabh
9364f35a2c
fixed issue of stock_uom translator
2016-02-23 02:17:04 +05:30
saurabh
724b4b17a5
changed method to set code of language
2016-02-23 02:17:03 +05:30
saurabh
fbcf44657c
test case for translation doctype
2016-02-23 02:17:03 +05:30
saurabh
c422c23813
import method to load all languages in language field on customer form
2016-02-23 02:17:03 +05:30
saurabh
f703198082
replaced methd
2016-02-23 02:17:03 +05:30
saurabh
ca3e7152d6
removed add fetch method
2016-02-23 02:17:03 +05:30
saurabh
8e49951821
fetch customer or supplier language and set on sales and purchase flow's form
2016-02-23 02:17:03 +05:30
saurabh
65820ed013
added new field language for users
2016-02-23 02:17:03 +05:30
saurabh
533a0f6527
created new file
2016-02-23 02:17:03 +05:30
saurabh
60def66644
added translator into print format
2016-02-23 02:17:02 +05:30
saurabh
24358db7bf
changed fieldname from print_language to language
2016-02-23 02:17:02 +05:30
saurabh
648fd33576
removed languages filled methods, added this methods into new file
2016-02-23 02:17:02 +05:30
saurabh
5265aa43e4
added add_fetch method
2016-02-23 02:17:02 +05:30
saurabh
4db3b3cf1e
removed add_fetch method
2016-02-23 02:17:02 +05:30
saurabh
29d77be648
pulled languages into the field print language
2016-02-23 02:17:02 +05:30
saurabh
cc7c9e4d0f
on selection of supplier pulled default print language
2016-02-23 02:17:02 +05:30
saurabh
b1efceccd4
added field print languages
2016-02-23 02:17:02 +05:30
sbkolate
b17d4035c1
better validation example for developer
...
throw "past date selected" will freeze the form and user can not correct value of from_date.
but validated false will just throw the pop-up and user can correct value of from_date and save the form.
Example changed from Event to Task because same is available in Custom Script Help for desk user
2016-02-22 17:16:34 +05:30
Nabin Hait
22230afa0a
Merge pull request #4852 from nabinhait/fixes72
...
Fixes
2016-02-22 16:51:20 +05:30
Nabin Hait
e32f9c3a24
Update reorder_item.py
2016-02-22 16:50:13 +05:30
patilsangram
bf2b511988
[Removed Stop Button from SO and PO]
2016-02-22 16:24:23 +05:30
Nabin Hait
38be62c7e3
[fix] Allow auto reorder based on reorder qty, even if reordeer level is zero
2016-02-22 16:24:23 +05:30
Nabin Hait
7736e092e7
Merge branch 'reorder_level_zero' of https://github.com/creador30/erpnext into creador30-reorder_level_zero
2016-02-22 16:19:33 +05:30
Nabin Hait
db746f5bc7
[fix] Condition for Payment and Return button visibility
2016-02-22 16:17:10 +05:30
Nabin Hait
68eb689450
[fix] UOM fixed in Item-wise Purchase History report
2016-02-22 16:17:10 +05:30
Roland
ed2849adf9
Create at_austria_chart_Einheitskontenrahmen.json
...
Austrian Chart of Accounts compiled by fairkom.eu from various sources, among them the official "Österreichishcer Kontenrahmen" published by ÖPWZ - Fachsenat für Betriebswirtschaft und Organisation der Kammer der Wirtschaftstreuhänder Version May 2014. Numbering scheme has been slightly adapted to fit best with ERPnext setup of a company, where the most important accounts are automatically assigned. When using this chart of accounts, feel free to reduce / adapt the accounts - it is not legally binding.
2016-02-22 09:26:54 +01:00
Kanchan Chauhan
49c4aa6ce3
Minor fix
2016-02-19 17:36:52 +05:30
Kanchan Chauhan
2e8cc89e34
Added webform for Job Opening
2016-02-19 17:31:13 +05:30
Nabin Hait
ddcd8c58bf
minor fix
2016-02-19 16:09:11 +05:30
Anand Doshi
8fc643a815
bumped to version 6.22.1
2016-02-19 13:43:01 +06:00
Anand Doshi
626e8fc03b
[change-log]
2016-02-19 13:11:02 +05:30
Anand Doshi
52780cb937
Merge pull request #4841 from nabinhait/escape
...
[fix] Escaping strings with percentage
2016-02-19 13:01:00 +05:30
Anand Doshi
3bce3f412a
Merge pull request #4838 from nabinhait/rounding_gle
...
[fix] GLE for Rounding loss allowed upto 1 for all transactions except JE
2016-02-19 12:59:54 +05:30
Nabin Hait
1a99cb8bfe
[fix] Escaping strings with percentage
2016-02-19 12:45:57 +05:30
rohit waghchaure
ff321763cf
removed translator
2016-02-19 12:02:02 +05:30
saurabh
5a265408a3
fixed issue of stock_uom translator
2016-02-19 11:46:29 +05:30
saurabh
c26c6c368c
changed method to set code of language
2016-02-19 11:46:29 +05:30
saurabh
f1949781d6
test case for translation doctype
2016-02-19 11:46:29 +05:30
saurabh
755fefbfd4
import method to load all languages in language field on customer form
2016-02-19 11:46:29 +05:30
saurabh
3c2a10bf9f
replaced methd
2016-02-19 11:46:28 +05:30
saurabh
49c9746816
removed add fetch method
2016-02-19 11:46:28 +05:30
saurabh
c2dae35966
fetch customer or supplier language and set on sales and purchase flow's form
2016-02-19 11:46:28 +05:30
saurabh
a1c3ea2f86
added new field language for users
2016-02-19 11:46:28 +05:30
saurabh
3dcd4f3682
created new file
2016-02-19 11:46:28 +05:30
saurabh
a6f57e1c4b
added translator into print format
2016-02-19 11:46:28 +05:30
saurabh
2192ffe5af
changed fieldname from print_language to language
2016-02-19 11:46:28 +05:30
saurabh
6b6977a090
removed languages filled methods, added this methods into new file
2016-02-19 11:46:28 +05:30
saurabh
c14f2c29b9
added add_fetch method
2016-02-19 11:46:27 +05:30
saurabh
5d45176a1d
removed add_fetch method
2016-02-19 11:46:27 +05:30
saurabh
b4079095fb
pulled languages into the field print language
2016-02-19 11:46:27 +05:30
saurabh
3ec7649bae
on selection of supplier pulled default print language
2016-02-19 11:46:27 +05:30
saurabh
844cb5c810
added field print languages
2016-02-19 11:46:27 +05:30
Anand Doshi
6e8eaf097a
[fix] test case of Leave Application
2016-02-19 00:27:02 +05:30
Neil Trini Lasrado
f5a39d628f
Typo Fixes
2016-02-18 19:19:07 +05:30
Nabin Hait
fb24a27201
[fix] GLE for Rounding loss allowed upto 1 for all transactions except JE
2016-02-18 19:18:07 +05:30
Nabin Hait
fa413bbab2
Update accounts_controller.py
2016-02-18 18:23:31 +05:30
Anand Doshi
d843ec5fee
Merge pull request #4831 from neilLasrado/typos
...
Typo fixes in Accounts Module
2016-02-18 17:24:17 +05:30
Nabin Hait
67f40775ff
Update accounts_controller.py
2016-02-18 17:10:42 +05:30
Nabin Hait
7209cff29a
Merge pull request #4832 from revant/patch-1
...
Need to use set_balance_in_account_currency
2016-02-18 17:02:43 +05:30
Revant Nandgaonkar
78a62fe123
change args of set_balance_in_account_currency
...
https://github.com/frappe/erpnext/pull/4832
2016-02-18 16:48:35 +05:30
Anand Doshi
d9dc9e4616
Merge pull request #4827 from anandpdoshi/fix/bank-reconciliation-grid
...
[fix] Show Debit/Credit in Bank Reconciliation table
2016-02-18 16:14:56 +05:30
Revant Nandgaonkar
5da941b82c
Need to use set_balance_in_account_currency
...
b9ad5178e4
2016-02-18 16:02:05 +05:30
Anand Doshi
bd0086c1c7
Merge pull request #4826 from anandpdoshi/fix/return-warehouse-mandatory
...
[fix] Warehouse not mandatory for Purchase Invoice or a Sales Invoice without Update Stock
2016-02-18 15:02:11 +05:30
Neil Trini Lasrado
8e7240a556
Typo fixes in Accounts Module
2016-02-18 14:38:36 +05:30
Anand Doshi
828d5ffaab
[fix] Show Debit/Credit in Bank Reconciliation table
2016-02-17 18:31:58 +05:30
Anand Doshi
ed8d9dadfa
[fix] Warehouse not mandatory for Purchase Invoice or a Sales Invoice without Update Stock
2016-02-17 17:14:11 +05:30
Valmik Jangla
7ae844f0a0
Minor fix
2016-02-17 15:06:30 +05:30
Valmik Jangla
b7ae1c1076
Inactive employees show up in report
2016-02-17 15:05:35 +05:30
Anand Doshi
5136a64d12
Merge pull request #4822 from neilLasrado/hr-fix
...
[minor] - fixed image view issues in Employee master.
2016-02-17 13:27:25 +05:30
Anand Doshi
1d77452fe0
bumped to version 6.22.0
2016-02-17 13:32:25 +06:00
Neil Trini Lasrado
25ab93a881
Changed image in employee from Attach to Attach Image, removed image view
2016-02-17 13:00:37 +05:30
Anand Doshi
9c0983f1b6
[translations]
2016-02-17 12:59:54 +05:30
Anand Doshi
9aaa6e3ea0
[change-log]
2016-02-17 12:26:28 +05:30
Anand Doshi
870d0441a8
[minor] moved make_employee from Employee to Offer Letter
2016-02-16 15:53:09 +05:30
Valmik Jangla
5e771c5678
Changed doclist to doc
2016-02-16 15:33:35 +05:30
Valmik Jangla
93b1072cba
Improved code
2016-02-16 15:33:35 +05:30
Valmik Jangla
bddc80bc66
Make Employee from Offer Letter
2016-02-16 15:33:35 +05:30
Anand Doshi
9a933788be
[cleanup] Compact Item Print
2016-02-16 15:30:17 +05:30
ShashaQin
541abf5687
Update item_table_description.html
2016-02-16 15:07:09 +05:30
ShashaQin
fd08750e1c
Update print_settings.py
2016-02-16 15:07:09 +05:30
ShashaQin
426bf4b5bb
Update features_setup.json
2016-02-16 15:07:09 +05:30
ShashaQin
2331d4f9a1
Update features_setup.json
2016-02-16 15:07:09 +05:30
ShashaQin
c77669f3d1
Update item_table_description.html
2016-02-16 15:07:09 +05:30
ShashaQin
429ab205d4
Update print_settings.py
2016-02-16 15:07:09 +05:30
Javier Wong
3d1f01ffc1
Fixed Get Open Sales Orders with Item Filter
...
Previously Get Open Sales Orders with Item Filter does not filter properly and instead returns Sales Orders with all Items.
2016-02-16 14:40:18 +05:30
Anand Doshi
1d866e8ae0
Merge pull request #4815 from makeen/fix_add_subscribers
...
[fix] add subscribers even though some emails are invalid
2016-02-16 14:36:31 +05:30
Anand Doshi
d4069fa634
Merge pull request #4814 from rmehta/exclude-bom-from-delete-company
...
[fix] exclude BOM from delete company records and unset company in others
2016-02-16 14:33:21 +05:30
Anand Doshi
a8ad388fba
Merge pull request #4811 from anandpdoshi/fix/trial-balance-fiscal-year
...
[fix] validate Fiscal Year in Trial Balance
2016-02-16 14:31:57 +05:30
Anand Doshi
c83802fae1
[fix] Setup Wizard: use correct customer, supplier name in create contact. Fixes #4804 .
2016-02-16 13:30:17 +05:30
Anand Doshi
efef236fdf
Merge pull request #4800 from agusputra/patch-15
...
Update payment-request.md
2016-02-16 13:18:29 +05:30
Anand Doshi
561e6cd27b
[fix] Trial Balance to General Ledger: use data.from_date and data.to_date
2016-02-16 11:56:53 +05:30
Anand Doshi
5f72504de1
[enhancement] Expense Claim - View Bank Entries
2016-02-15 18:02:38 +05:30
makeen
4741182b25
[fix] add subscribers even though some emails are invalid
2016-02-15 10:58:12 +01:00
Rushabh Mehta
771568f42a
[fix] exclude BOM from delete company records and unset company in others
2016-02-15 15:17:34 +05:30
Anand Doshi
620252cadb
[fix] validate Fiscal Year in Trial Balance
2016-02-15 12:03:04 +05:30
Anand Doshi
0e553aa6b8
bumped to version 6.21.6
2016-02-15 12:23:57 +06:00
Anand Doshi
39a289145c
[fix] fetch price list rate
2016-02-15 11:42:18 +05:30
creador
e156cd6379
Product Bundle improvement
...
This change allows addition of multiple instances of the same product
inside a product bundle, if each has a different description in the
bundle list (thus no duplicates).
We use product bundles to include scrap material into our stock
calculations. Here we need to enter the same product with different
quantities into the same bundle. We explicitly specify scrap in the
description of each line in product bundle.
2016-02-14 12:22:10 +02:00
creador
e71fa9210f
Allow reorder_level to be set to 0
...
For items you don’t want to keep in stock, you can set the
reorder_level to 0 and define reorder_qty.
If there is e.g. a sales order for that item, the projected quantity
will fall below 0, which will trigger an automatic material request.
2016-02-14 11:58:21 +02:00
Agus Syahputra
e9a1f1c5d8
Update payment-request.md
2016-02-13 10:35:42 +07:00
Rushabh Mehta
2e9f10934f
bumped to version 6.21.5
2016-02-12 13:42:48 +06:00
Anand Doshi
4b249fe8ec
[optimization] stock balance report - force index + improve memory usage
2016-02-11 20:38:01 +05:30
Rushabh Mehta
eab1671214
[fix] [pos] refresh party field, fixes #4789
2016-02-11 18:35:59 +05:30
Rushabh Mehta
6f574cd60f
[minor] do not commit pay-to-recd from in journal entry
2016-02-11 14:27:28 +05:30
Rushabh Mehta
580933998e
bumped to version 6.21.4
2016-02-11 13:11:22 +06:00
Rushabh Mehta
adee283caf
[minor] map custom fields from delivery note to packing slip
2016-02-11 11:58:50 +05:30
Rushabh Mehta
f2763d7abe
[cleanup] warranty claim form
2016-02-11 11:06:15 +05:30
Rushabh Mehta
1652839086
[minor] [fix] address trigger in warranty claim
2016-02-11 11:06:15 +05:30
Nabin Hait
1ec626f39b
bumped to version 6.21.3
2016-02-10 16:41:58 +06:00
Nabin Hait
7e02831897
[fix] Test case fixed
2016-02-10 15:54:52 +05:30
Rushabh Mehta
c54d7ec445
Merge pull request #4768 from umairsy/feb-1st-week
...
Updated help on manufacturing module.
2016-02-10 15:44:42 +05:30
Rushabh Mehta
a4faffb813
Merge pull request #4783 from nabinhait/fixes54
...
[fix] call get_party_account only if party is set
2016-02-10 15:24:03 +05:30
Umair Sayyed
4715df1518
Removed current directory
2016-02-10 15:19:35 +05:30
Umair Sayyed
fc8d0f6ac7
help on manufacturing module
2016-02-10 15:19:35 +05:30
Rushabh Mehta
477ddf9119
bumped to version 6.21.2
2016-02-10 15:21:18 +06:00
Nabin Hait
ef864403a1
[fix] call get_party_account only if party is set
2016-02-10 14:47:25 +05:30
Anand Doshi
4fcf7bf01a
[minor] Setup Wizard sample data: Clear Fiscal Year Error message
2016-02-10 14:35:48 +05:30
Anand Doshi
bec7e79ee8
bumped to version 6.21.1
2016-02-10 13:49:17 +06:00
Anand Doshi
247a8eedce
[minor] fix add_comment
2016-02-10 13:17:40 +05:30
Rushabh Mehta
cc35f62514
Merge pull request #4781 from nabinhait/develop
...
Payment Request Fixes
2016-02-10 13:13:27 +05:30
Rushabh Mehta
8d1c7a2524
[fix] call get_party_account only if party is set
2016-02-10 13:08:42 +05:30
Nabin Hait
3070deb295
Packing Slip layout changes
2016-02-10 13:07:42 +05:30
Nabin Hait
e1f6e60cea
[fix] Payment Request Fixes
2016-02-10 13:07:42 +05:30
Rushabh Mehta
3aa14f54b7
[fix] installation note item description to Text Editor
2016-02-10 11:56:05 +05:30
Rushabh Mehta
826900822c
bumped to version 6.21.0
2016-02-09 13:15:24 +06:00
Rushabh Mehta
6584240277
[change log]
2016-02-09 12:35:51 +05:30
Rushabh Mehta
dd408d82da
[translations]
2016-02-09 12:24:56 +05:30
Rushabh Mehta
5ddb8ea124
Merge pull request #4773 from agusputra/patch-14
...
Update search-record-by-specific-field.md
2016-02-09 11:20:19 +05:30
Rushabh Mehta
7f3983a3d6
Merge pull request #4769 from rmehta/pricing-rule-on-variant
...
[fix] pricing rule for variant, if rule for template available, use it
2016-02-09 11:20:00 +05:30
Nabin Hait
adc0923c7e
[fix] validate advance only if invoice total is positive
2016-02-09 10:32:41 +05:30
Agus Syahputra
cb7337f466
Update search-record-by-specific-field.md
2016-02-09 09:20:26 +07:00
Agus Syahputra
68e6919d41
Update managing-dynamic-link-fields.md
2016-02-09 01:04:01 +07:00
Rushabh Mehta
57ebde2b9e
Merge pull request #4765 from agusputra/patch-12
...
Update allow-fields-to-be-changed-after-submit.md
2016-02-08 18:53:51 +05:30
Rushabh Mehta
10663ab37f
Merge pull request #4762 from nabinhait/multifixes3
...
Advance adjustment in invoice cannot be greater than grand total
2016-02-08 18:53:27 +05:30
Rushabh Mehta
0a67c9715c
Merge pull request #4766 from nabinhait/permlevel1
...
[fix] Read permission to All for permlevel 1 fields
2016-02-08 18:52:03 +05:30
Rushabh Mehta
c403ce3b4f
Merge pull request #4763 from rmehta/leave-app-cleanup
...
[cleanup] leave application
2016-02-08 18:51:29 +05:30
Rushabh Mehta
3cdf3544fb
[enhancement] default warehouse not mandatory in time, re-order level and re-order qty must always be set per warehosue
2016-02-08 18:50:40 +05:30
Rushabh Mehta
faf9b589c4
[fix] pricing rule for variant, if rule for template available, use it
2016-02-08 18:49:27 +05:30
Rushabh Mehta
060f32d452
[fix] [minor] reset naming series in delete_company_transactions.py
2016-02-08 17:57:14 +05:30
Nabin Hait
4c6af87ad0
[fix] Read permission to All for permlevel 1 fields
2016-02-08 16:56:19 +05:30
Rushabh Mehta
a064e3a200
[minor] validate address template before saving
2016-02-08 14:51:14 +05:30
Anand Doshi
1106524121
Merge pull request #4644 from anandpdoshi/enhancement/comment-feed-communication-merge
...
[enhancement] Merge Comment and Feed into Communication 💥
2016-02-08 13:54:48 +05:30
Agus Syahputra
451ee87e9f
Update allow-fields-to-be-changed-after-submit.md
2016-02-08 15:16:42 +07:00
Anand Doshi
17d4fc4fa7
[enhancement] Merge Comment and Feed into Communication 💥
...
Depends on frappe/frappe#1532
2016-02-08 13:06:56 +05:30
Rushabh Mehta
6bd9f7f5f0
[minor] catch duplicate entry error in bank account creation
2016-02-08 12:09:01 +05:30
Nabin Hait
289ffb788c
[fix] Advance adjustment in invoice cannot be greater than grand total
2016-02-08 11:07:00 +05:30
Nabin Hait
45805622e4
[fix] Serial no query in Quality Inspection
2016-02-08 11:06:59 +05:30
Rushabh Mehta
467f5c7a75
Merge pull request #4751 from agusputra/patch-11
...
Update calendar.md
2016-02-08 10:59:06 +05:30
Rushabh Mehta
ca2ce13817
Merge pull request #4748 from vjFaLk/Monthly-attendance-fix
...
Employees with no attendance show up as blank now
2016-02-08 10:58:45 +05:30
Rushabh Mehta
57fb74f262
Merge pull request #4742 from nabinhait/multifixes1
...
Multi fixes
2016-02-08 10:55:48 +05:30
Rushabh Mehta
cde997edfa
[cleanup] leave application
2016-02-08 10:53:22 +05:30
Nabin Hait
2b8472fe54
Merge pull request #4744 from ccfiel/develop
...
undo bank recon.
2016-02-08 10:45:55 +05:30
Rushabh Mehta
65ade073a9
Merge pull request #4733 from ShashaQin/patch-15
...
Update leave_application.py
2016-02-08 10:22:09 +05:30
Rushabh Mehta
e881b40ab2
Merge pull request #4759 from Tropicalrambler/patch-2
...
Corrected typo while translating
2016-02-08 10:10:57 +05:30
Tropicalrambler
3ebd956090
Duplicate last line delete
...
Deleted the last line which was duplicated. Both read exactly the same. Only one line is necessary.
2016-02-07 18:56:44 -06:00
Tropicalrambler
b01f1d2486
Corrected typo while translating
...
Found a switch of letters: "wrokstation" instead of "workstation". Corrected the item appropriately. Found this while translating my fork of this page to spanish.
2016-02-07 16:39:12 -06:00
Agus Syahputra
4c0c69b388
Update calendar.md
2016-02-07 11:45:10 +07:00
Rushabh Mehta
16d58560a0
Merge pull request #4750 from agusputra/patch-10
...
Update wesite-home-page.md
2016-02-06 09:40:05 +05:30
Agus Syahputra
12acd11814
Update wesite-home-page.md
2016-02-06 08:13:29 +07:00
Agus Syahputra
c4d3283879
Update blogger.md
2016-02-06 07:21:42 +07:00
Valmik Jangla
de7e760788
Employees with no attendance show up as blank
2016-02-05 17:46:14 +05:30
Nabin Hait
c2268caaf7
Merge pull request #4740 from vjFaLk/holiday-report-improvements
...
Added From and To date to Holiday Report
2016-02-05 15:13:11 +05:30
Valmik Jangla
235de6566e
Minor fix
2016-02-05 15:07:16 +05:30
Agus Syahputra
e24cfdc556
Update overwriting-data-from-data-import-tool.md
2016-02-05 08:27:20 +07:00
Chris Ian Fiel
af667f77e6
Update bank_reconciliation.py
...
set to null if clearance_date is blank because if not it will set it just 0000-00-00.
2016-02-04 22:10:36 +08:00
Nabin Hait
ce4e8ec178
Merge pull request #4737 from ShashaQin/patch-18
...
Gross Profit report improvement
2016-02-04 17:26:20 +05:30
Nabin Hait
4129ae5395
[fix] Translations in Stock balance report
2016-02-04 17:22:57 +05:30
Nabin Hait
92c6c617de
[fix] Remove filters on item group in territory and sales person target settings
2016-02-04 17:22:57 +05:30
Nabin Hait
a731ad4433
[fix] Set party account on chnage of company
2016-02-04 17:22:57 +05:30
Nabin Hait
3110c4a772
[fix] Make bank entry from expense claim
2016-02-04 17:22:57 +05:30
Rushabh Mehta
d50356dbab
[docs] remove /docs/current from repo, they are re-built anyways
2016-02-04 17:10:24 +05:30
Rushabh Mehta
d1ba86a952
Merge branch 'develop' of github.com:frappe/erpnext into develop
2016-02-04 17:09:18 +05:30
ShashaQin
8c63697f41
Update item_wise_purchase_history.json
2016-02-04 16:46:46 +08:00
ShashaQin
e7dccca782
Update item_wise_sales_history.json
2016-02-04 16:44:18 +08:00
Valmik Jangla
8d0ed21c04
Added From and To date to Holiday Report
...
Changed HD to H in Monthly Attendance Report
2016-02-04 12:18:55 +05:30
ShashaQin
bcc56a4557
Update gross_profit.py
...
Gross Profit report improvement
2016-02-04 11:45:00 +08:00
Rushabh Mehta
7bb2f3a27b
[fix] newsletter priority
2016-02-03 16:20:59 +05:30
Nabin Hait
fba61abd2a
bumped to version 6.20.0
2016-02-03 15:53:56 +06:00
Nabin Hait
94bfe8ea0d
[change-log]
2016-02-03 15:14:17 +05:30
