Nabin Hait
7eea52d4e9
Merge branch 'develop'
2017-04-04 11:46:47 +05:30
Nabin Hait
93a990f006
bumped to version 8.0.7
2017-04-04 12:16:47 +06:00
Nabin Hait
099163b16d
Merge pull request #8296 from netchampfaris/customer-list-fix
...
Add `image` field to fetch in Customer List
2017-04-04 09:39:22 +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
9bfa0ab7eb
Merge branch 'develop'
2017-04-03 13:18:14 +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
e6b5843a1f
Merge branch 'develop'
2017-04-01 19:02:55 +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
ed0422a8d9
Merge branch 'develop'
2017-03-31 18:19:57 +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
9f84a99158
Merge pull request #8258 from rohitwaghchaure/gross_profit_issue_v_8
...
[fix] get_valuation_rate takes 4 arguments 3 given in gross profit report
2017-03-31 17:39:58 +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
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
Nabin Hait
b596deb57d
Merge branch 'hotfix'
2017-03-30 23:50:27 +05:30
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
e64b75153a
Merge branch 'hotfix'
2017-03-30 19:52:42 +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
a8b2cdf65a
Merge branch 'hotfix'
2017-03-30 19:35:51 +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
80b3cf22eb
Merge branch 'develop'
2017-03-30 18:28:22 +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
c4894a5287
Merge branch 'hotfix'
2017-03-30 13:14:34 +05:30
Nabin Hait
a9bef56a94
bumped to version 7.2.32
2017-03-30 13:44:34 +06:00
Nabin Hait
f90a3295c4
Merge pull request #8213 from KanchanChauhan/update-disbursment-date
...
Disbursement Date fetched from JV - Employee Loan
2017-03-30 13:06:40 +05:30
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
Nabin Hait
11812db5e8
Merge pull request #8183 from neilLasrado/minor-fix
...
Fixed issue with misleading error message on Stock Entry creation of Serialized Items
2017-03-28 18:08:42 +05:30
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
rohitwaghchaure
e313c09fd7
Merge pull request #8182 from frappe/netchampfaris-patch-1
...
Update POS screenshot
2017-03-28 16:35:16 +05:30
Faris Ansari
49a3d6d8f6
Update POS screenshot
2017-03-28 16:17:30 +05:30
Nabin Hait
580682d6a2
Merge pull request #8136 from dottenbr/customs_tariff_number
...
Add Customs Tariff Number
2017-03-28 13:51:52 +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
95db9f9e09
Merge pull request #8175 from rohitwaghchaure/production_planning_issue
...
[fix] sales order with status closed fetching on production planning tool
2017-03-28 13:48:42 +05:30
Nabin Hait
621dcc3c84
Patch order changed for multiple uoms in sales cycle
2017-03-28 13:45:56 +05:30
Nabin Hait
010d9cd796
Merge branch 'dottenbr-manufacturer_childtable' into develop
2017-03-28 13:39:43 +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
46e108b34e
Merge pull request #8166 from nabinhait/pro_order_multi_level_bom_operations
...
Fetch operations from all sub-assembly BOMs in Pro Order if multi-level BOM is checked
2017-03-27 21:36:28 +05:30
Rushabh Mehta
fe5c95e360
Update CONTRIBUTING.md
2017-03-27 20:41:51 +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
3e43f275a0
Merge branch 'hotfix'
2017-03-27 12:27:38 +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
Nabin Hait
a4f838b6b4
Merge pull request #8135 from dottenbr/de_translation_fix
...
Fix German Translation
2017-03-27 12:24:20 +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
Nabin Hait
b40efe34e3
Merge pull request #8067 from KanchanChauhan/issue-webview-fixed
...
[Fix] Issue web view fixed
2017-03-23 17:00:47 +05:30
Nabin Hait
691a34c924
Merge branch 'develop' into issue-webview-fixed
2017-03-23 17:00:30 +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
Nabin Hait
a90ff97782
Merge pull request #8096 from frappe/netchampfaris-documentation
...
Update Workflows
2017-03-23 16:15:40 +05:30
Nabin Hait
1775a3db38
Merge pull request #8115 from rohitwaghchaure/setup_wizard_unpickle_issue
...
[fix] UnpickleError, removed _ method from the argument of the function
2017-03-23 16:14:52 +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
Kanchan Chauhan
6514e051be
[Fix] Issue web view fixed
2017-03-20 15:31:54 +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
Nabin Hait
c26ae0036d
Merge pull request #8033 from manassolanki/student_applicant
...
[Fix] Enrolling the student
2017-03-15 19:40:46 +05:30
Nabin Hait
f494626ce4
Merge pull request #8034 from mbauskar/hotfix
...
[minor] make item code mandatory if update_stock is selected
2017-03-15 19:40:20 +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
c1a5b348b5
Merge branch 'hotfix'
2017-03-15 11:28:06 +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
Nabin Hait
f86d73fdc8
Merge pull request #8015 from rohitwaghchaure/gross_profit_issue
...
[fix] Gross profit report permission issue
2017-03-14 17:24:18 +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
Nabin Hait
468726320c
Merge pull request #8013 from manassolanki/shishuv
...
[Fix] Student attendance tool- Handling double-click on button
2017-03-14 14:28:58 +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
0afbee9441
Merge pull request #7988 from nabinhait/develop
...
Multiple version 8 fixes
2017-03-12 17:41:17 +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
Nabin Hait
3e22a11a16
Merge pull request #7985 from mbauskar/develop
...
[minor] ignore lead addresses delete query if address against lead no…
2017-03-12 15:16:01 +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
Nabin Hait
e7e82fe477
Merge pull request #7970 from rmehta/sample-tasks
...
Descriptions on sample tasks
2017-03-10 14:58:52 +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
Nabin Hait
1fde71b3c0
Merge pull request #7959 from KanchanChauhan/expense-claim-fix
...
[Minor] Label change in Expense Claim
2017-03-09 10:53:13 +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
89d494fbf5
Merge branch 'hotfix'
2017-03-08 14:30:12 +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
Nabin Hait
842d4fcf53
Merge pull request #7954 from mbauskar/hotfix
...
removed the test_clear_blank_rows test case from JE
2017-03-08 14:19:04 +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
40f5d1845f
Merge branch 'hotfix'
2017-03-08 11:16:00 +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
229764b7bf
Merge pull request #7939 from hereabdulla/patch-2
...
Only enabled user to be fetched
2017-03-07 17:16:31 +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
Nabin Hait
44bc6ab242
Merge pull request #7937 from mbauskar/hotfix
...
[minor] allowed the credit and debit amount to be 0 in JE
2017-03-07 12:56:02 +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
Nabin Hait
1a735f2f5a
Merge pull request #7933 from rohitwaghchaure/minor_fix_patch
...
minor fix in patch
2017-03-06 20:32:47 +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
439a39bbbb
Merge pull request #7922 from nabinhait/uom-conversion-in-selling
...
Uom conversion in selling
2017-03-06 17:28:41 +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
Nabin Hait
8981ecf170
Merge pull request #7926 from svigneux/patch-2
...
Update batch.md
2017-03-06 14:37:39 +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
Nabin Hait
feb45727e5
Merge pull request #7912 from mbauskar/develop
...
[minor] fixes contact field set query for opportunity
2017-03-04 18:31:09 +05:30
Nabin Hait
9e6e718ee1
Merge pull request #7913 from rohitwaghchaure/minor_fix
...
Removed fiscal year and month from the print of monthly salary register
2017-03-04 18:30:44 +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
Nabin Hait
17cf220cbc
Merge pull request #7908 from KanchanChauhan/removed-paid-status
...
[Minor] Removed Paid status from Salary Slip
2017-03-02 14:12:34 +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
c99f85d84c
Merge branch 'hotfix'
2017-03-02 12:38:14 +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
e95b6e75ac
Merge pull request #7905 from saurabh6790/demo_data_setup_fix
...
[fix] add from date field to salary structure in setup demo data
2017-03-02 08:53:27 +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
093eba2336
Merge branch 'hotfix'
2017-02-28 18:56:25 +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
8312f1cd64
Merge pull request #7671 from bcornwellmott/link_mrs
...
Created button to link buying items to material requests
2017-02-28 15:56:06 +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
d39b012981
Merge branch 'hotfix'
2017-02-27 15:41:43 +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
afd0d086a7
Merge pull request #7872 from rohitwaghchaure/delivery_note_serail_no_issue
...
[Fix] Serial nos not pulling on the delivery note, for spanish language add serial no button is not working
2017-02-27 14:11:30 +05:30
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
Nabin Hait
7e15afbf45
Merge pull request #7868 from RobertSchouten/patch-34
...
[fix] typo on get product bundle
2017-02-27 12:27:03 +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
Nabin Hait
7553e72014
Merge pull request #7860 from nabinhait/develop
...
Leave application overlap validation for half day and test cases
2017-02-25 11:02:53 +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
Nabin Hait
a8d02bfd4a
Merge pull request #7850 from manassolanki/shishuvan
...
Patch for making All Assessment Group parent in assessment group tree
2017-02-24 17:01:05 +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
Nabin Hait
8ad26c7d26
Merge pull request #7848 from manassolanki/neilLasrado-ass-redesign
...
Neil lasrado assessment redesign
2017-02-24 14:14:22 +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
d3d2daab4b
Merge pull request #7838 from manassolanki/shishuvan
...
[Fix] Student Doctype
2017-02-24 12:53:21 +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
Nabin Hait
4c27ec5618
Merge pull request #7839 from KanchanChauhan/holiday-cal-fix
...
[Fix] Holiday Calendar Fix
2017-02-23 16:36:35 +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
10ec553859
Merge branch 'hotfix'
2017-02-22 15:05:27 +05:30
Nabin Hait
633698affc
bumped to version 7.2.23
2017-02-22 15:35:27 +06:00
Nabin Hait
1965949c67
Merge pull request #7816 from mbauskar/hotfix
...
[minor] minor fixes for journal entry get_exchange_rate trigger
2017-02-22 15:03:32 +05:30
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
79dd816359
Merge branch 'manassolanki-shishu' into develop
2017-02-22 13:06:01 +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
8c9bc8edbb
Merge pull request #7807 from nabinhait/hotfix
...
Company, Currency, Conversion Rate fields are mandatory in BOM
2017-02-21 16:06:20 +05:30
Nabin Hait
293158db6e
Merge pull request #7808 from KanchanChauhan/attendance-rename-field
...
[Patch] Attendance Date field renamed
2017-02-21 16:01:50 +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
16a4b58676
Merge branch 'pratu16x7-bom-view' into develop
2017-02-20 19:38:36 +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
6cbe02400a
Merge pull request #7672 from KanchanChauhan/remove-joining-datep-validation
...
From date, to date moved from Salary Structure to Salary Structure Employee
2017-02-20 19:31:49 +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
de7d7ba7d9
Merge pull request #7768 from mbauskar/develop
...
[minor] auto close opportunity after 7 days
2017-02-20 19:23:22 +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
af6e41b637
Merge pull request #7467 from suyashphadtare/develop
...
[minor] Show Actual Item quantity in warehouse set query
2017-02-20 19:10:43 +05:30
Nabin Hait
cd837ecbac
Merge branch 'develop' into develop
2017-02-20 19:09:20 +05:30
Nabin Hait
5422329b84
Merge branch 'KanchanChauhan-accrual-payroll-system' into develop
2017-02-20 19:01:27 +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
78ef086b00
Merge branch 'bcornwellmott-prod_ana' into develop
2017-02-20 17:42:07 +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
b44ae54813
Merge pull request #7785 from nabinhait/in_global_search
...
Added fields in global search
2017-02-20 15:05: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
f8cff128b3
Merge branch 'hotfix'
2017-02-20 14:52:01 +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
83ba5c1319
Merge pull request #7770 from rohitwaghchaure/minor_issue_develop
...
[Fix] Payment entry fields issue, added total billed hours in timesheet
2017-02-17 15:20:06 +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
Nabin Hait
a6eb1434b3
Merge pull request #7771 from rmehta/item-name
...
[minor] item name not mandatory and item price with quick edit
2017-02-17 15:17:24 +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
1b59b624c3
Merge branch 'hotfix'
2017-02-16 15:59:58 +05:30
Nabin Hait
a7d6b68bc0
bumped to version 7.2.21
2017-02-16 16:29:58 +06:00
Nabin Hait
c70a4d2037
Merge pull request #7760 from rmehta/add-activation-1
...
[add] site activation level
2017-02-16 15:51:04 +05:30
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
d5d0b36973
Merge branch 'hotfix'
2017-02-16 14:37:49 +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
Nabin Hait
6a2e138021
Merge pull request #7731 from nabinhait/hotfix
...
Check existing SO, PO and MR for enabling / disabling 'Is Stock Item' checkbox
2017-02-15 17:25:56 +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
Nabin Hait
d8812020aa
Merge pull request #7735 from mbauskar/develop
...
[minor] fetched tickets to closed using sql instead of get_all
2017-02-14 11:35:37 +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
7877b0ec1b
Merge pull request #7730 from KanchanChauhan/minor-enhancement
...
[Minor] List of Contacts
2017-02-13 16:09:43 +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
Nabin Hait
ec07d18222
Merge pull request #7716 from KanchanChauhan/apply-now-job
...
[Fix] Apply Now button redirect fixed for Job Opening
2017-02-13 15:42:02 +05:30
Neil Trini Lasrado
a388352171
Merge pull request #7719 from neilLasrado/student-left
...
Removed Nationality in Student Applicant as a link field to Country
2017-02-12 01:31:02 +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
b2fdc131e8
Merge pull request #7718 from neilLasrado/student-left
...
Added Exit Section to Student master
2017-02-12 01:19:39 +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
Nabin Hait
eee23eaf5c
Merge pull request #7702 from mbauskar/hotfix
...
[minor] payment entry company trigger
2017-02-09 13:48:09 +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
Nabin Hait
fafa3748f1
Merge pull request #7696 from khatrijitendra/patch-1
...
[Fix] "type" and "rate" fields
2017-02-08 16:26:08 +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
efd5eadfea
Merge branch 'hotfix'
2017-02-08 11:32:47 +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
Nabin Hait
ccd2e00331
Merge pull request #7676 from nabinhait/missing_val_rate
...
Get standard/historical valuation rate where missing, if item is not a sample item
2017-02-08 11:05:06 +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
401ac7a5e5
Merge pull request #7686 from mbauskar/fixes
...
[minor] auto close issue using ORM (document save method)
2017-02-07 13:26:14 +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
Nabin Hait
8200485baa
Merge pull request #7675 from mbauskar/hotfix
...
[minor] index out of range fixes for JE
2017-02-06 19:23:33 +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
KanchanChauhan
ed94aa4798
Merge pull request #7624 from neilLasrado/eval-group
...
Code Refractor.
2017-02-02 17:39:08 +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
Saurabh
10eb123b49
Merge pull request #7645 from rohitwaghchaure/pos_minor_fix
...
Minor fix
2017-02-01 19:26:47 +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
98595dff0b
Merge pull request #7642 from frappe/revert-7641-employee-loan-fix
...
Revert "[Fix] Rate of Interest Fix"
2017-02-01 18:17:18 +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
455824235a
Merge pull request #7613 from neilLasrado/assessment-validations
...
Patch fix for Update Assessment Module Patch
2017-01-30 16:41:46 +05:30
Neil Trini Lasrado
ab1ee1e6fc
Patch fix for Update Assessment Module Patch
2017-01-30 16:40:14 +05:30
Neil Trini Lasrado
dbd95936ea
Merge pull request #7610 from neilLasrado/assessment-validations
...
Validations for Assessment Plan
2017-01-30 15:51:08 +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
rohitwaghchaure
0bdffa8130
Merge pull request #7533 from mbauskar/minor-fixes
...
[WIP] Address and Contact Fixes
2017-01-30 11:13:10 +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
bf667a6540
Merge branch 'hotfix'
2017-01-28 14:14:32 +05:30
Rohit Waghchaure
ce4a0b20ab
bumped to version 7.2.18
2017-01-28 14:44:32 +06:00
Nabin Hait
68fd31ca0e
Merge pull request #7599 from KanchanChauhan/stock-controller-urgent-fix
...
[URGENT][FIX]Stock Controller fix
2017-01-28 14:11:14 +05:30
Kanchan Chauhan
b77eaf7053
[URGENT][FIX]Stock Controller fix
2017-01-28 13:26:46 +05:30
KanchanChauhan
ecc44e506b
Merge pull request #7597 from neilLasrado/guarding-name
...
Fixes to update student guardian name patch
2017-01-27 17:45:57 +05:30
Neil Trini Lasrado
6d0da98a78
Fixes to update student guardian name patch
2017-01-27 17:44:28 +05:30
KanchanChauhan
4db5dd3cc2
Merge pull request #7591 from neilLasrado/guarding-name
...
Added Guardian Name to Student Master
2017-01-27 17:31:22 +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
245c2e885a
Merge branch 'hotfix'
2017-01-27 16:18:26 +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
73bf1bc4b0
Merge branch 'hotfix'
2017-01-27 16:03:29 +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
83cc7c9382
Merge branch 'hotfix'
2017-01-27 15:46:07 +05:30
Rushabh Mehta
149c033c8f
bumped to version 7.2.15
2017-01-27 16:16:07 +06:00
KanchanChauhan
173fe24ef4
Merge pull request #7594 from neilLasrado/student-batch
...
Added 'Active' checkbox in list view for Student Batch and Student Group
2017-01-27 14:56:58 +05:30
Neil Trini Lasrado
7326217ab5
Added 'Active' checkbox in list view for Student Batch and Student Group
2017-01-27 14:50:48 +05:30
KanchanChauhan
6c85ad9726
Merge pull request #7593 from neilLasrado/student-batch
...
Fix- Student batch strength in Batch Wise attendance report
2017-01-27 14:18:40 +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
rohitwaghchaure
8452e60204
Merge pull request #7566 from KanchanChauhan/naming-series-fix
...
[Fix] Naming series issue fix
2017-01-24 10:31:33 +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
KanchanChauhan
d825409226
Merge pull request #7564 from neilLasrado/patch-fix
...
Fix for update assessment modules patch
2017-01-23 15:46:57 +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
2a660fb695
Merge pull request #7551 from neilLasrado/assessment
...
Added ability to disable a student in student group/student batch
2017-01-20 20:10:38 +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
b736aafb8b
Merge branch 'hotfix'
2017-01-20 15:40: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
Nabin Hait
188f9da160
Merge pull request #7530 from KanchanChauhan/website-default-warehouse
...
[Minor] Set website warehouse as default warehouse
2017-01-20 12:11:42 +05:30
Nabin Hait
78966fe03b
Merge pull request #7524 from KanchanChauhan/date-fixes
...
Date fixes in Production Order
2017-01-20 12:09:46 +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
e2f4b35b11
Merge pull request #7521 from rohitwaghchaure/discount_issue
...
[Fix] Sales return discount issue
2017-01-18 17:05:01 +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
Nabin Hait
461e9c1e09
Merge pull request #7519 from rohitwaghchaure/print_issue
...
[Fix] POS print issue
2017-01-18 13:24:16 +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
b70767b08e
Merge branch 'hotfix'
2017-01-17 15:52:25 +05:30
Nabin Hait
aff2b9479d
bumped to version 7.2.13
2017-01-17 16:22:25 +06:00
Nabin Hait
a987b35b72
Merge pull request #7514 from KanchanChauhan/fix-payroll
...
[Minor] Payroll Fix
2017-01-17 14:59:59 +05:30
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
2f2b6df781
Merge pull request #7411 from KanchanChauhan/fleet-moved-to-hr
...
Fleet management moved to HR
2017-01-17 11:06:00 +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
2bbf784fd8
Merge branch 'hotfix'
2017-01-16 13:04:53 +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
5d69900f66
Merge branch 'hotfix'
2017-01-13 17:30:45 +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
ca7c5275c0
Merge branch 'hotfix'
2017-01-13 17:10:51 +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
74c56aff90
Merge branch 'hotfix'
2017-01-13 14:33:56 +05:30
Nabin Hait
45cad45420
bumped to version 7.2.9
2017-01-13 15:03:56 +06:00
Nabin Hait
90350dfb86
Merge pull request #7476 from rohitwaghchaure/draft_status_issue_after_amend
...
[Fix] After amend the status become cancelled even if docstatus is zero
2017-01-13 13:14:43 +05:30
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
Nabin Hait
02b6fe0fcb
Merge pull request #7443 from nabinhait/hotfix
...
Fetch bin details after setting warehouse based on POS Profile
2017-01-13 11:32:57 +05:30
Nabin Hait
4440ac037f
Merge pull request #7470 from frappe/forellana-digithinkit-patch-1
...
[FIX] Contact form breaks on existing lead
2017-01-13 11:29:10 +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
bcornwellmott
5dfffe7586
Merge pull request #7449 from RicardoJohann/rename_ss
...
allowed rename salary structure
2017-01-11 09:15:03 -08:00
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
ffa5ffe607
Merge pull request #7442 from nabinhait/hotfix
...
Fix for Budget against Project
2017-01-11 10:30:44 +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
b8350353ea
Merge branch 'hotfix'
2017-01-10 12:30:10 +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
b083591164
Merge pull request #7418 from frappe/revert-7409-daterangecontrol
...
Revert "proposed usage of daterange picker"
2017-01-10 12:20:14 +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
21544ca978
Merge branch 'hotfix'
2017-01-09 16:57:11 +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
07b524ee50
Merge pull request #7398 from nabinhait/filter_dashboard
...
Reload in_standard_filter property
2017-01-09 15:43:30 +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
7b4bdffea2
Merge pull request #7385 from bhupennewalkar1337/quot
...
Fix#6590 Now you can make quotation from supplier quotation
2017-01-05 14:58:52 +05:30
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
c657cceffc
Merge branch 'hotfix'
2017-01-02 17:26:54 +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
3cae3a5190
Merge branch 'hotfix'
2016-12-30 15:54:31 +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
257ecf71ac
Merge branch 'hotfix'
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
Nabin Hait
494a4d9ba1
Merge pull request #7360 from KanchanChauhan/salary-register-repprt
...
[Fix] Monthly Salary Register Fix
2016-12-30 12:38:46 +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
ae25e0da88
Merge branch 'hotfix'
2016-12-29 11:04:05 +05: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
Nabin Hait
392806c0d4
Merge pull request #7342 from neilLasrado/develop
...
Added Guardian to school module
2016-12-28 16:26:16 +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
Nabin Hait
340c9d327a
Merge pull request #7339 from neilLasrado/develop
...
[Fix] Student Monthly Attendance Sheet
2016-12-28 13:42:18 +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
a6be7c71ed
Merge branch 'hotfix'
2016-12-27 14:27:19 +05:30
Nabin Hait
89c8b4d6ae
bumped to version 7.2.2
2016-12-27 14:57:19 +06:00
Nabin Hait
e5f5017973
Merge pull request #7333 from rmehta/variant-website-fix
...
[fix] item variants not directly shown in website due to route clash
2016-12-27 13:31:30 +05:30
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
Nabin Hait
9007815ddc
Merge pull request #7326 from neilLasrado/develop
...
Improved Student Dashboard
2016-12-26 18:33:19 +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
Nabin Hait
0d49cdf024
Merge pull request #7324 from nabinhait/lcv_testcase
...
[test] Fixed test cases for LCV
2016-12-26 15:52:40 +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
3322fafdbe
Merge branch 'hotfix'
2016-12-24 11:01:25 +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
c1d31baece
Merge branch 'hotfix'
2016-12-23 16:45:08 +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
Nabin Hait
a216f50114
Merge pull request #7287 from rohitwaghchaure/pos_issue_for_serialized_item
...
[Fix] POS issue for serialized items
2016-12-21 18:05:18 +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
Nabin Hait
ffcf0ca3a6
Merge pull request #7285 from rohitwaghchaure/packed_items_issue
...
[Fix] Warehouse is mandatory for packing materials on the sales invoice
2016-12-21 14:12:00 +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
8650855926
Merge branch 'hotfix'
2016-12-21 12:18:37 +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
0c10e3b210
Merge branch 'hotfix'
2016-12-20 11:39:46 +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
Nabin Hait
6c433a3012
Merge pull request #7264 from rmehta/sms-fix
...
[fix] https for SMS gateway, now using requests fixes #5404
2016-12-20 11:31:17 +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
a320b1a494
Merge branch 'v7.2.0-beta' into develop
2016-12-19 12:32:44 +05:30
Rushabh Mehta
c3d8479443
[minor] allow website user to be selected as employee
2016-12-19 12:32:11 +05:30
Rushabh Mehta
e80208e6e5
Merge branch 'v7.2.0-beta' into develop
2016-12-19 12:02:14 +05:30
Rushabh Mehta
6fc6670a25
Delete zh-tw.csv ( #7260 )
2016-12-19 11:57:59 +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
Nabin Hait
76d1ec8ca7
Merge pull request #7245 from rohitwaghchaure/salary_test_case
...
[Fix] Test case
2016-12-16 12:41:19 +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
b628971a80
Merge branch 'hotfix'
2016-12-15 16:35:32 +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
b08aaa5e20
Merge branch 'aruizramon-status-updates-crm' into develop
2016-12-15 11:52:18 +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
7ac0d294e1
Merge branch 'hotfix'
2016-12-14 14:33:06 +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
Nabin Hait
450a94c6b4
Merge pull request #7214 from rohitwaghchaure/pricing_rule_issue_latest
...
[Fix] Pricing rule issue
2016-12-14 14:31:34 +05:30
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
Nabin Hait
4b5ab6a0d0
Merge pull request #7205 from nabinhait/hotfix
...
Address naming if multiple address for same type
2016-12-14 12:50:01 +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
3bfe01d1e0
Merge branch 'hotfix'
2016-12-13 14:22:15 +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
403bab07a0
Merge pull request #7204 from frappe/revert-7199-email_cc_dev
...
Revert "email cc test fixes for frappe/frappe#2441"
2016-12-13 14:12:12 +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
c7b32e84d0
Merge pull request #7200 from nabinhait/hotfix
...
Fixed test cases for item / warehouse renaming
2016-12-13 11:07:09 +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
Nabin Hait
f93cbe9a51
Merge pull request #7180 from rohitwaghchaure/pos_profile_issue
...
[Fix] Item group missing in the POS profile
2016-12-12 17:23:15 +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
Nabin Hait
a188af9f62
Merge pull request #7174 from saurabh6790/tax_rate_field_fix
...
[minor][fix] show tax rate if account type is tax
2016-12-09 18:09:28 +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
67b6e2fbba
Merge branch 'hotfix'
2016-12-09 15:45:45 +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
e70a284f8e
Merge pull request #7167 from webonyx/fix_v7_1_20_patch
...
Fix patch update_status_of_po_so.py
2016-12-09 11:51:30 +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
Nabin Hait
380105e0c1
Merge pull request #7163 from KanchanChauhan/test-cases-salary-slip
...
[Fix] Salary Slip Test cases fix
2016-12-08 17:35:49 +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
eb879556ed
Merge pull request #7161 from frappe/nabinhait-patch-7
...
Update set_budget_against_as_cost_center.py
2016-12-08 14:42:15 +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
5ae9428f37
Merge pull request #7160 from nabinhait/develop
...
[fix][tests] Fetching serial nos via get item details
2016-12-08 13:51:24 +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
7b91181fa0
Merge branch 'hotfix'
2016-12-08 12:33:53 +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
Nabin Hait
cfe6182798
Merge pull request #7158 from rohitwaghchaure/timesheet_issue_po
...
minor issue
2016-12-08 12:15:44 +05:30
Rohit Waghchaure
86ed030b5c
minor issue
2016-12-07 19:17:01 +05:30
Nabin Hait
07e4fd17af
Merge pull request #7157 from rohitwaghchaure/timesheet_po_issue
...
[fix] Timesheet datetime issue
2016-12-07 18:37:02 +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
5c3564143b
Merge branch 'hotfix'
2016-12-06 16:14:44 +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
Nabin Hait
b9ebbf18f2
Merge pull request #7143 from rohitwaghchaure/customer_credit_issue
...
[fix] test cases for customer credit
2016-12-06 15:36:18 +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
Nabin Hait
cc43c2f5aa
Merge pull request #7142 from neilLasrado/develop
...
Updated schools.py in Config
2016-12-05 17:56:45 +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
Nabin Hait
df63c372b3
Merge pull request #7140 from neilLasrado/develop
...
Updated schools.py in Config
2016-12-05 17:32:25 +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
Nabin Hait
84694d0b0d
Merge pull request #7119 from neilLasrado/reports
...
Code Cleanup
2016-12-02 12:13:00 +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
Nabin Hait
5bd8eb8d01
Merge pull request #7115 from neilLasrado/reports
...
Fixes for Absent Student Report
2016-12-01 17:02:10 +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
Nabin Hait
6e9a587463
Merge pull request #7114 from neilLasrado/reports
...
Fixes for Student Batch-Wise Attendance report
2016-12-01 16:07:44 +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
Nabin Hait
79f0a97431
Merge pull request #7112 from KanchanChauhan/salary-slip-issue
...
[Fix] Fixed condition and formula issue in Salary Slip
2016-12-01 15:56:52 +05:30
Kanchan Chauhan
faa525e4f1
[Fix] Fixed condition and formula issue in Salary Slip
2016-12-01 15:31:38 +05:30
Nabin Hait
f129fd4695
Merge pull request #7092 from neilLasrado/reports
...
Updates to Student Attendance Module
2016-12-01 15:21:43 +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
de932911b5
Merge branch 'hotfix'
2016-11-28 14:22:54 +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
1d656f40ad
Merge pull request #7074 from KanchanChauhan/added-account-type
...
Added account types to Add Child option of COA
2016-11-28 12:39:40 +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
1880fc46d3
Merge pull request #7084 from nabinhait/hotfix
...
Multiple minor fixes
2016-11-28 12:38:48 +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
Nabin Hait
14823d0d0f
Merge pull request #7066 from rohitwaghchaure/pos_barcode_search_issue
...
[fix] Barcode and special character issue in the search box of the POS
2016-11-25 11:20:55 +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
2ada1600ed
Merge pull request #7069 from frappe/nabinhait-patch-6
...
Update patches.txt
2016-11-25 11:15:46 +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
Nabin Hait
1e3d14fda7
Merge pull request #7051 from rohitwaghchaure/v7_timesheet_cleanup
...
cleanup timesheet and fix sales invoice total timesheet billing amount
2016-11-24 13:06:04 +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
6fc850d071
Merge branch 'hotfix'
2016-11-23 16:00:22 +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
b8a7926464
Merge branch 'hotfix'
2016-11-23 14:53:42 +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
b439afb5e5
Merge pull request #7045 from saurabh6790/root_type_fix_and_other
...
[fix] Root type fix
2016-11-23 14:46:05 +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
b91aed807a
Merge pull request #7042 from RobertSchouten/naming_series
...
[fix] naming series only show non disabled role doctypes
2016-11-23 13:26:19 +05:30
Nabin Hait
a748849fa3
Merge pull request #7043 from nabinhait/dn_qa_fix
...
delivery note dashboard fix for quality inspection
2016-11-23 11:47:59 +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
8685225644
Merge branch 'hotfix'
2016-11-22 23:18:28 +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
Nabin Hait
c381327e6e
Merge pull request #7032 from rohitwaghchaure/patch_issue
...
fix patch
2016-11-22 13:51:51 +05:30
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
8132be288f
Merge branch 'hotfix'
2016-11-21 19:10:05 +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
c16b373969
Merge pull request #6994 from nabinhait/manual_depreciation
...
Manual Depreciation Schedule for Asset
2016-11-21 14:49:58 +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
Nabin Hait
e3649ec43c
Merge pull request #7005 from rmehta/ux-fixes-for-daily-works-summary
...
[minor] UX fixes for Daily Work Summary
2016-11-21 12:42:32 +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
Nabin Hait
05d0cd9574
Merge pull request #6982 from rohitwaghchaure/pos_is_pos_default_issue
...
[Fix] Onload pull pos profile data for IS POS invoice
2016-11-17 18:29:22 +05:30
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
d79cca3ba7
Merge branch 'hotfix'
2016-11-17 16:41:51 +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
29570d1ecb
Merge branch 'hotfix'
2016-11-17 15:54:07 +05:30
Nabin Hait
f2b7ec919a
bumped to version 7.1.14
2016-11-17 16:24:07 +06:00
Nabin Hait
f76aab6021
Merge pull request #6976 from saurabh6790/advance_payment_entry_cancellation_fix
...
[fix] on advance payment entry cancellation delink invoice and pyamen…
2016-11-17 15:41:31 +05:30
Neil Trini Lasrado
d9bc5598b6
Added ability to mark attendance against a Student Batch
2016-11-17 15:36:14 +05:30
robert schouten
2b63e14089
dh drop guest from student attendance so disabling acedemic user disables all school doctypes ( #6974 )
2016-11-17 15:23:38 +05:30
Saurabh
1d210968de
[fix] on advance payment entry cancellation delink invoice and pyament entry references
2016-11-17 15:21:46 +05:30
Nabin Hait
d4e8b297cd
Merge pull request #6784 from RobertSchouten/calendar_fix
...
[fix] calendar range fixes
2016-11-17 14:45:59 +05:30
shreyas
0c93445be0
[Fix] Updated 'FR' translation to prevent setup wizard failure
2016-11-17 14:31:32 +05:30
Nabin Hait
7fc05d6432
Update update_missing_salary_component_type.py
2016-11-17 12:16:52 +05:30
robert schouten
a943535520
[fix] update bank recon statement printing for payment entries
2016-11-17 14:33:28 +08:00
robert schouten
60fb1b8643
[fix] layout for bank reconciliation
2016-11-17 14:30:47 +08:00
ShraddhaRanjane
045bfe641e
Update naming-series.md
2016-11-17 11:22:58 +05:30
Ignatius Cuknoris
6471057df4
fix bugs uom and conversion factor on stock entry
2016-11-17 10:31:19 +07:00
Nabin Hait
aa68058910
Updated modified_datetime in production planning tool
2016-11-16 17:41:08 +05:30
Nabin Hait
8dd859920f
Merge pull request #6960 from KanchanChauhan/thumbnail-in-shoppingcart
...
[Fix]Product thumbnail in Shopping Cart
2016-11-16 17:34:17 +05:30
Nabin Hait
7f6b99aca4
Merge pull request #6962 from KanchanChauhan/payroll-fixes
...
[Fix] Filters to get employee in Payroll
2016-11-16 17:34:00 +05:30
Nabin Hait
01dc2e412d
Merge pull request #6964 from mbauskar/hotfix
...
[minor] fixes in validate selling price
2016-11-16 17:32:11 +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
67bceef1cb
Merge branch 'hotfix'
2016-11-16 12:55:59 +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
d65d67e0a7
Merge branch 'hotfix'
2016-11-16 11:26:42 +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
6261745366
Merge branch 'hotfix'
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
da4689461a
Merge pull request #6926 from nabinhait/hotfix
...
Multiple fixes
2016-11-14 12:37:11 +05:30
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
176577b549
Merge branch 'hotfix'
2016-11-10 11:25:33 +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
Nabin Hait
4430f2f81c
Merge pull request #6878 from saurabh6790/reporting_stock_after_rename_warehouse
...
[fix] repost qty only for bin items
2016-11-09 16:55:58 +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
0f2e3a4e95
Merge branch 'hotfix'
2016-11-09 14:55:29 +05:30
Nabin Hait
549de70fa2
bumped to version 7.1.9
2016-11-09 15:25:29 +06:00
Nabin Hait
9e83b70ea8
Merge pull request #6860 from rohitwaghchaure/status_for_sales_invoice
...
Added status field in sales invoice and purchase invoice
2016-11-09 14:53:03 +05:30
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
cefcf165c4
Merge branch 'hotfix'
2016-11-08 15:22:54 +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
ed05a9928b
Merge pull request #6864 from frappe/nabinhait-patch-5
...
Show transaction id in validation message
2016-11-08 13:23:36 +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
090931e667
Merge pull request #6857 from strixaluco/develop
...
[typo] desription → description
2016-11-08 12:06:20 +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
Nabin Hait
7f5089d19d
Merge pull request #6831 from manassolanki/develop
...
[Fix] Notification Count Issue #5987
2016-11-07 15:25:27 +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
dc3d9ac26c
Merge branch 'hotfix'
2016-11-04 16:53:17 +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
44e260b04b
Merge pull request #6818 from nagarajannxweb/patch-2
...
Update salary-and-payroll.md
2016-11-04 16:07:12 +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
4dc263ee12
Merge branch 'hotfix'
2016-11-03 15:17:38 +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
Nabin Hait
cf935a4b42
Merge pull request #6799 from rmehta/minor-01-nov
...
Minor fixes
2016-11-03 10:40:49 +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
Nabin Hait
e0038b428b
Merge pull request #6791 from rohitwaghchaure/documentation_issue
...
[Fix] jinja syntax in documentation
2016-11-01 18:10:18 +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
51eed9a128
Merge branch 'hotfix'
2016-11-01 17:44:43 +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
508ca3a1ab
Merge pull request #6789 from saurabh6790/hotfix
...
[fix] set default value as empty frappe dict
2016-11-01 17:26:16 +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
4dd76f21c9
Merge branch 'hotfix'
2016-11-01 15:05:53 +05:30
Nabin Hait
c538a55a5a
bumped to version 7.1.4
2016-11-01 15:35:53 +06:00
Nabin Hait
aa7a329633
Merge pull request #6783 from rohitwaghchaure/v7_1_issue
...
Hotfix issues
2016-11-01 14:48:06 +05:30
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
b8617cfdf9
Merge pull request #6777 from nabinhait/hotfix
...
[fix] Report GLE for Purchase Invoice with Update Stock option
2016-11-01 12:31:51 +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
Nabin Hait
07fa5f1377
Merge pull request #6769 from frappe/nabinhait-patch-4
...
show relevant warehouses in item dashboard
2016-10-31 17:24:25 +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
6ece870b6e
Merge branch 'hotfix'
2016-10-31 16:37:29 +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
1764da7ba8
Merge pull request #6766 from nabinhait/hotfix
...
repost gle for Purchase Invoice with update stock
2016-10-31 16:34:35 +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
Nabin Hait
e585683db3
Merge pull request #6750 from rohitwaghchaure/country_wise_tax_issue
...
[Fix] country wise tax, country name issue
2016-10-29 14:37:32 +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
6f0897c258
Merge branch 'hotfix'
2016-10-27 19:14:54 +05:30
Nabin Hait
9dcb778f17
bumped to version 7.1.1
2016-10-27 19:44:54 +06:00
Nabin Hait
5ad56ef446
Merge pull request #6727 from saurabh6790/hotfix
...
[enhance] introduce ignore_fields param for _tree and get_query
2016-10-27 19:06:32 +05:30
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
38c1732304
Merge branch 'develop'
2016-10-26 17:56:16 +05:30
Nabin Hait
62616a03b3
bumped to version 7.1.0
2016-10-26 18:26:16 +06:00
Nabin Hait
afa3697c7f
Merge pull request #6717 from frappe/nabinhait-patch-1
...
Update __init__.py
2016-10-26 17:54:58 +05:30
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
4c0a9f420f
Merge branch 'hotfix'
2016-10-26 16:40:45 +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
7d977a243a
Merge pull request #6690 from rohitwaghchaure/v7_pricing_rule_issue
...
[Fix] Pricing rule discount issue
2016-10-24 16:47:33 +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
Nabin Hait
cf397d3190
Merge pull request #6688 from frappe/umairsy-patch-5
...
Update domainify.py
2016-10-24 13:43:57 +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
Nabin Hait
0e75956f81
Merge pull request #6684 from KanchanChauhan/warehouse-based-on-company-MR
...
Warehouse based on selected Company
2016-10-24 11:09:42 +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
44e9195378
Merge branch 'DigiThinkIT-develop' into develop
2016-10-20 17:01:44 +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
Nabin Hait
05aa1712ff
Merge branch 'rohitwaghchaure-stock_entry_total_amount_issue' into develop
2016-10-20 16:39:35 +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
3126c88da2
Merge pull request #6658 from nabinhait/develop
...
Set prefered contact email in Employee
2016-10-20 12:40:03 +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
d5e52bc251
Merge branch 'hotfix'
2016-10-19 16:48:05 +05:30
Nabin Hait
13a07c2029
bumped to version 7.0.62
2016-10-19 17:18:04 +06:00
Nabin Hait
9ef4f0dc30
Merge pull request #6640 from rohitwaghchaure/item_projected_qty_issue
...
[Fix] total projected qty in item master
2016-10-19 16:45:28 +05:30
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
Nabin Hait
184f6d42cc
Merge pull request #6647 from netchampfaris/hotfix
...
[hotfix] print format image size
2016-10-19 13:05:04 +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
b33695138c
Merge branch 'hotfix'
2016-10-18 18:35:18 +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
498cc1b7e1
Merge branch 'hotfix'
2016-10-18 16:18:17 +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
a1099d28b8
Merge branch 'hotfix'
2016-10-18 15:25:31 +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
Nabin Hait
2dcee15e50
Merge pull request #6634 from KanchanChauhan/employee-patch-fixed
...
Patch fixed for Employee
2016-10-18 12:14:16 +05:30
Kanchan Chauhan
dc86964e91
Patch fixed for Employee
2016-10-18 11:29:41 +05:30
Nabin Hait
f5be103d57
Merge branch 'RobertSchouten-pref_email' into develop
2016-10-17 17:43:10 +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
5ea16640fe
Merge branch 'RobertSchouten-unclosed_finance1' into develop
2016-10-17 16:58:25 +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
c48ad8430f
Merge branch 'KanchanChauhan-process-payroll-changes' into develop
2016-10-17 16:43:06 +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
0b1b8afc3c
Merge pull request #6611 from nabinhait/hotfix
...
Always calculate additional discount amount if percentage is mentioned
2016-10-16 14:25:28 +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
Nabin Hait
efd7c3e22b
Merge pull request #6592 from rohitwaghchaure/production_planning_issue
...
[Fix] making of production order from material request with sales order, restirct validation validate_production_order_against_so in production order
2016-10-10 17:10:49 +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
Nabin Hait
1ca7a27b2f
Merge pull request #6587 from rohitwaghchaure/pos_wildcard_search_issue
...
[Fix] wildcard search for pos not working
2016-10-10 11:50:01 +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
8fa2a04024
Merge branch 'hotfix'
2016-10-07 17:08:57 +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
05ba967a45
Merge branch 'hotfix'
2016-10-07 17:04:36 +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
f69edb3fa3
Merge branch 'hotfix'
2016-10-07 16:47:17 +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
cf8438d153
Delete patches.txt
2016-10-07 16:11:21 +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
ee25cf7ead
Merge branch 'rohitwaghchaure-sales_order_status_issue' into hotfix
2016-10-07 14:16:36 +05:30
Nabin Hait
2f75b7b42e
Fixed merge conflict
2016-10-07 14:16:17 +05:30
Nabin Hait
1915214518
Merge pull request #6576 from rohitwaghchaure/item_rename_issue
...
[Fix] Issue in merging duplicate item
2016-10-07 14:11:49 +05:30
Nabin Hait
eb08d632b3
Merge pull request #6565 from saurabh6790/warehouse_group_account_rename_fix
...
[fix] warehouse account rename fix #6526
2016-10-07 14:11:14 +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
bd2a1c3553
Merge pull request #6572 from RobertSchouten/patch-33
...
[fix] update timestamps and relink communication for timesheet
2016-10-07 12:54:54 +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
60a099cd85
Merge pull request #6557 from vrms/patch-3
...
Update product-bundle.md
2016-10-06 15:34:42 +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
Nabin Hait
4eb196905b
Merge pull request #6562 from saurabh6790/hotfix
...
[fix] sales order translation for language code: fr
2016-10-06 15:28:41 +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
2f163ef360
Merge pull request #6552 from nabinhait/hotfix
...
Don't throw expense account validation on fetching item details
2016-10-05 17:17:05 +05:30
Nabin Hait
cccc45edc5
Don't throw expense account validation on fetching item details
2016-10-05 17:15:53 +05:30
Nabin Hait
7b9638c93a
Merge pull request #6551 from nabinhait/hotfix
...
Set warranty claim resolution date as today only if it is not set
2016-10-05 16:45:25 +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
Nabin Hait
55c328348f
Merge pull request #6547 from rohitwaghchaure/pos_issue_for_wildcard_seacrh
...
[Fix] POS wildcard search for customers, items.
2016-10-05 15:43:45 +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
Nabin Hait
4784495db2
Merge pull request #6545 from neilLasrado/develop
...
Field rearrange in student applicant
2016-10-05 12:38:04 +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
09adc10543
Merge pull request #6544 from nabinhait/hotfix
...
Sales Personwise transaction summary - total row
2016-10-05 12:27:21 +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
86da020dcd
Merge pull request #6543 from nabinhait/rate_precision
...
Fixed precision of rate field
2016-10-05 11:59:20 +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
9e64f07540
Merge branch 'hotfix'
2016-10-04 17:26:33 +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
112827ee86
Merge branch 'hotfix'
2016-10-03 18:05:11 +05:30
Nabin Hait
e2b8ae56e1
bumped to version 7.0.53
2016-10-03 18:35:10 +06:00
Nabin Hait
a65c223428
Merge pull request #6533 from nabinhait/hotfix
...
GL Entries for Purchase Invoices with Update Stock option checked and having non-stock items
2016-10-03 18:03:33 +05:30
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
Nabin Hait
5a431127c5
Merge pull request #6532 from netchampfaris/hotfix
...
print format fix
2016-10-03 17:32:55 +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
c9fc091289
Merge branch 'hotfix'
2016-10-03 14:12:54 +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
Nabin Hait
0b7b109c0b
Merge pull request #6528 from saurabh6790/hotfix
...
[minor][fix] for condition maker
2016-10-03 14:04:50 +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
c158ccd884
Merge pull request #6518 from nabinhait/ar_ap_fix
...
Minor fix AR/AP
2016-10-01 17:03:09 +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
Nabin Hait
a7b0ffca1c
Merge pull request #6508 from rohitwaghchaure/account_payble_issue
...
[Fixed] Accounts receivable concat issue
2016-09-30 21:13:54 +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
25e62fc4bb
Merge pull request #6497 from frappe/umairsy-patch-3
...
Update data-import-tool.md
2016-09-29 20:44:36 +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
773d93b628
Merge branch 'hotfix'
2016-09-29 14:16:43 +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
a3ffe530f0
Merge pull request #6493 from nabinhait/ar_issue
...
[fix] Accounts Receivable report if negative write off in invoice
2016-09-29 13:39:16 +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
eba0d83541
Merge pull request #6482 from rohitwaghchaure/cash_flow_fix
...
[Fix] sub-heading is missing in the excel sheet of the cash flow
2016-09-28 16:57:03 +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
Nabin Hait
a82358bb98
Merge pull request #6480 from rohitwaghchaure/patch_fix_timesheet
...
Remove time log, time log batch from Doc Field.
2016-09-28 13:21:08 +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
63552166be
Merge branch 'hotfix'
2016-09-28 10:46:36 +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
2b6cacc799
Merge branch 'hotfix'
2016-09-26 18:02:19 +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
Felipe Orellana
2ade5e02e3
Merge pull request #1 from DigiThinkIT/forellana-digithinkit-patch-1
...
[FIX] Issue with customer doctype not allowing name series past 10
2016-09-23 14:12:14 -04:00
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
5f0aceab19
Merge branch 'hotfix'
2016-09-23 17:23:28 +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
d4321ec18b
Merge branch 'hotfix'
2016-09-23 12:16:02 +05:30
Nabin Hait
84fa3dfac8
bumped to version 7.0.47
2016-09-23 12:46:01 +06:00
Nabin Hait
aca857e708
Merge pull request #6447 from nabinhait/patch_fix_legacy_migration
...
Patch fixed for legacy migration
2016-09-23 12:15:06 +05:30
Nabin Hait
d03087d3ab
Patch fixed for legacy migration
2016-09-23 11:08:02 +05:30
Nabin Hait
4ed0653c7f
Merge pull request #6444 from rohitwaghchaure/supplier_status_issue
...
[fix] Supplier status stuck at Open forever
2016-09-22 18:52:26 +05:30
Rohit Waghchaure
b2382c0b8e
[fix] Supplier status stuck at Open forever
2016-09-22 18:45:24 +05:30
Nabin Hait
f79b3f8c3c
Merge pull request #6443 from rohitwaghchaure/pos_discount_issue
...
[POS] minor fix
2016-09-22 18:00:55 +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
Nabin Hait
0d36862917
Merge pull request #6434 from rohitwaghchaure/net_rate_issue
...
[Fix] Discount copied during making of PO from SO
2016-09-22 12:34:08 +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
0967b17320
Merge branch 'hotfix'
2016-09-22 11:33:32 +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
Nabin Hait
0eb8eddef5
Merge pull request #6427 from KanchanChauhan/salary-slip-indentation
...
[Fix] Indentation fixed
2016-09-21 18:40:21 +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
6835a6fb49
Merge branch 'hotfix'
2016-09-21 13:05:26 +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
Nabin Hait
06131dd0b1
Merge pull request #6420 from nabinhait/sales_reg_fix
...
Fix in Sales Register for multiple mode of payments
2016-09-21 12:54:25 +05:30
Rushabh Mehta
0c4597f7a0
[fix] license to the latest markdown format, github seems to consider this as agpl
2016-09-21 12:10:54 +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
30a25e11f7
Merge branch 'hotfix'
2016-09-20 16:52:10 +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
Nabin Hait
af03de3d00
Merge pull request #6399 from rohitwaghchaure/pos_payment_mode_type_missing_issue
...
[Fix] POS, mode of payment issue
2016-09-20 10:56:54 +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
Nabin Hait
284cc200b7
Merge pull request #6396 from strixaluco/patch-4
...
Update stock-entry.md
2016-09-19 13:27:07 +05:30
strixaluco
71073e1730
Update stock-entry.md
...
Stock Reconciliation hyperlink added
2016-09-19 15:38:38 +08:00
Nabin Hait
79a3e632ed
Merge pull request #6391 from rohitwaghchaure/pos_print_format_new_changes
...
[Fix] Added base_url, print_css in pos
2016-09-19 12:31:15 +05:30
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
Nabin Hait
b1bb1727ff
Merge pull request #6384 from saurabh6790/v7.1_Journal_Entry_Opening_Entry
...
[fix] #5992
2016-09-16 16:58:05 +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
4a121d60db
Merge branch 'hotfix'
2016-09-14 15:44:25 +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
Nabin Hait
9d095dcec2
Merge pull request #6364 from rohitwaghchaure/financial_statements_report_issue
...
[Fix] Financial Statements reports are running very slow
2016-09-14 15:25:26 +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
Nabin Hait
ee3be536cb
Merge pull request #6349 from rohitwaghchaure/so_dn_required_issue
...
[Invoice] Fixed so_dn_required for is pos and update stock
2016-09-12 18:31:30 +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
Nabin Hait
7819744e5b
Merge pull request #6315 from rohitwaghchaure/patch_fix
...
Patch fix
2016-09-08 16:52:32 +05:30
Nabin Hait
fff6e19479
Merge pull request #6318 from neilLasrado/develop
...
Rearranged fields in Student Applicant & Student, Split address field
2016-09-08 16:51:30 +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
d97200cb5a
fixed version conflict
2016-09-07 17:20:45 +05:30
Nabin Hait
a8b8d81e2a
Merge branch 'hotfix'
2016-09-07 17:20:14 +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
1bdffbff57
Merge branch 'hotfix'
2016-09-07 17:01:17 +05:30
Nabin Hait
094d3adba3
bumped to version 7.0.41
2016-09-07 17:31:17 +06:00
Nabin Hait
6a5751e91c
Merge pull request #6311 from nabinhait/patch_hotfix_1
...
Patch fixed
2016-09-07 17:00:29 +05:30
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
75a41a6f75
Merge branch 'hotfix'
2016-09-06 17:55:55 +05:30
Nabin Hait
9b54b78794
bumped to version 7.0.40
2016-09-06 18:25:55 +06:00
Nabin Hait
e5480f4545
Merge pull request #6300 from neilLasrado/develop
...
Fixed Student Guardian patch - reload issue
2016-09-06 17:54:06 +05:30
Neil Trini Lasrado
52891b55d2
Fixed Student Guardian patch - reload issue
2016-09-06 17:50:42 +05:30
Nabin Hait
93851df048
Merge pull request #6299 from nabinhait/patch_fix_800
...
Patch fixed
2016-09-06 17:49:53 +05:30
Nabin Hait
f79d7188de
Patch fixed
2016-09-06 17:47:19 +05:30
Nabin Hait
1830675481
Merge pull request #6295 from rohitwaghchaure/supplier_quotation_uom_conversion_issue
...
[Issue] Fixed, supplier quotation item uom conversion
2016-09-06 17:30:08 +05:30
Rohit Waghchaure
b44efef094
[Issue] Fixed, supplier quotation item uom conversion
2016-09-06 17:21:38 +05:30
Nabin Hait
541e8504a6
Merge pull request #6294 from neilLasrado/develop
...
Fixed Student Guardian patch - permission issue
2016-09-06 17:20:12 +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
Nabin Hait
b830ffc7d5
Merge pull request #6245 from neilLasrado/develop
...
Forms redesign for Schools Module.
2016-09-06 17:05:02 +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
Nabin Hait
3cdc74e3b0
Merge pull request #6286 from rohitwaghchaure/pos_name
...
[POS] Added offline_pos_name in print format
2016-09-06 11:38:51 +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
05621ed564
Merge pull request #6284 from nabinhait/advance_fetch
...
[fix] Fetch advance journal entry in invoice if it is tagged against linked order
2016-09-05 17:02:44 +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
6e4ab60e4c
Merge branch 'hotfix'
2016-09-05 15:43:48 +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
d223a03814
Merge pull request #6281 from nabinhait/notifications
...
Notifications filters for DN, PR and PI
2016-09-05 15:26:23 +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
a58431a9a7
Merge pull request #6210 from rohitwaghchaure/purchase_return_issue
...
[Enhancement] Purchase return for rejected qty
2016-09-05 12:48:43 +05:30
Nabin Hait
3bd5014b7b
Merge pull request #6280 from nabinhait/minorfixes
...
Minor fixes
2016-09-05 12:32:09 +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
36830016ee
Merge branch 'hotfix'
2016-09-02 16:19:21 +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
0f0c131ba4
Merge branch 'hotfix'
2016-09-02 14:26:33 +05:30
Nabin Hait
e1e187bee1
bumped to version 7.0.37
2016-09-02 14:56:33 +06:00
Nabin Hait
c946c730da
Merge pull request #6258 from nabinhait/party_name_in_pe
...
Party name in Payment Entry and cheque print format
2016-09-02 14:20:22 +05:30
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
Nabin Hait
98d58b5ed1
Merge pull request #6262 from saurabh6790/hotfix
...
[fix] set is_group filter in get query for warehouse
2016-09-02 14:14:47 +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
94dbc14f8a
Merge branch 'hotfix'
2016-09-01 12:42:29 +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
c7be851bf8
Merge branch 'hotfix'
2016-09-01 12:26:11 +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
Nabin Hait
3e805708dc
Merge pull request #6237 from rohitwaghchaure/timesheet_employee_missing_issue
...
[Fix] Timesheet, employee is missing in patch
2016-09-01 12:15:06 +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
48914b47b7
Merge branch 'strixaluco-patch-2' into develop
2016-08-31 12:36:18 +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
Nabin Hait
ef16d657ff
Merge pull request #6226 from rohitwaghchaure/pos_fixes_and_cleanups
...
[POS] Currency format issue, added zero value condition
2016-08-31 11:02:16 +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
Nabin Hait
4f71190a85
Merge pull request #6215 from rohitwaghchaure/pos_precision_issue
...
[Fix] Precision issue for field conversion rate in POS
2016-08-30 09:52:55 +05:30
Nabin Hait
385e8edd3c
Merge pull request #6216 from rohitwaghchaure/update_component_patch_fix
...
[Patch] Fixed error unknown column 'type' in 'field list'
2016-08-30 09:51:23 +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
51a236f38b
Merge branch 'hotfix'
2016-08-29 11:47:30 +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
Nabin Hait
84e88b5d63
Merge pull request #6198 from rmehta/hotfix
...
[minor] validate permission in Process Payroll and all products fix for home page
2016-08-29 11:23:50 +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
Rushabh Mehta
955b979a97
Merge pull request #6183 from KanchanChauhan/columns-added-deleted
...
Coded columns deleted, columns added from UI
2016-08-26 14:34:50 +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
f92f04bffc
Merge branch 'hotfix'
2016-08-26 12:37:19 +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
Nabin Hait
385311c8a2
Merge pull request #6170 from rohitwaghchaure/patch_fix
...
[Fix] 'SalesInvoice' object has no attribute 'account_for_change_amount'
2016-08-25 14:41:47 +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
ec6267e82a
Merge branch 'hotfix'
2016-08-23 12:10:56 +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
Nabin Hait
f862505bf9
Merge pull request #6153 from rohitwaghchaure/hotfix
...
[POS] Fixed decimal button not working
2016-08-23 12:07:40 +05:30
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
Rushabh Mehta
114cb9f1dc
Merge pull request #6145 from netchampfaris/help-feature
...
Added help links
2016-08-22 15:02:59 +05:30
Nabin Hait
43accf4c07
Merge pull request #6144 from nabinhait/timesheet_patch_fix
...
Ignore validating mandatory fields on converting timelogs to timesheets
2016-08-22 14:39:01 +05:30
Faris Ansari
3a6155b1b9
add help_links.js
2016-08-22 14:37:22 +05:30
Nabin Hait
64e0d16e6d
Merge pull request #6141 from frappe/revert-6140-timesheet_patch_fix
...
Revert "Ignore validating mandatory fields on converting timelogs to timesheets"
2016-08-22 14:36:55 +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
Nabin Hait
17824c74cf
Merge pull request #6135 from KanchanChauhan/minor-salary-fixes
...
[Minor]Fixes
2016-08-22 12:12:02 +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
e4fb7b1b2f
Merge branch 'hotfix'
2016-08-18 16:15:49 +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
e30fadc661
Merge branch 'develop'
2016-08-18 16:13:15 +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
b8a8fb5877
Merge branch 'develop'
2016-08-17 17:11:09 +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
386d9e1613
Merge pull request #6106 from nabinhait/item_reload
...
Default material request type field restored
2016-08-17 16:16:28 +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
Nabin Hait
c2595aa902
Merge pull request #6099 from nabinhait/patch_fix_for_v6_to_v7_migration
...
Patch fixed for v6 to v7 migration
2016-08-17 11:28:29 +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
Nabin Hait
815ebafa7b
Merge pull request #6092 from umairsy/9aug
...
Updated docs (please don't merge)
2016-08-16 18:16:28 +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
18d6162935
Merge branch 'develop'
2016-08-16 15:25:34 +05:30
Nabin Hait
91d6544958
bumped to version 7.0.28
2016-08-16 15:55:33 +06:00
Nabin Hait
f640ad4389
Merge pull request #6095 from nabinhait/timesheet_patch
...
Ignore overlap validation while creating timesheet from existing time logs
2016-08-16 15:19:56 +05:30
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
c833cc8432
Merge branch 'develop'
2016-08-12 11:53:08 +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
Rushabh Mehta
09fc241d59
Merge pull request #6054 from rohitwaghchaure/purchase_invoice_accounting_issue_for_auto_stock
...
[Fix] Debit and credit not equal for purchase invoice, if update stock is yes and taxes is defined
2016-08-11 10:54:40 +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
7909a30008
Merge branch 'develop'
2016-08-10 19:47:24 +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
332729e99e
Merge branch 'develop'
2016-08-10 18:19:14 +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
c9501eb460
Merge branch 'develop'
2016-08-10 14:34:39 +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
Rushabh Mehta
aa12d30d5a
Merge pull request #6048 from PawanMeh/fixes_5723
...
[fix] #5723
2016-08-10 14:12:56 +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
88fff46ab4
Merge pull request #6038 from nabinhait/portal_settings_schools
...
Portal settings for schools
2016-08-09 17:20:56 +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
722b22a834
Merge branch 'develop'
2016-08-09 15:30:32 +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
a2c9d13f68
Merge branch 'develop'
2016-08-09 15:00:16 +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
78b8cdc3c1
Merge pull request #6033 from nabinhait/patch_fix_10
...
[patch] Reload Purchase Invoice in patch. Fixed #6032
2016-08-09 14:22:40 +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
b9376641af
Merge pull request #6031 from nabinhait/patch_fix_9
...
[fix]Patch order changed. Fixed #6026
2016-08-09 11:28:48 +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
660f3ed0d6
Merge branch 'develop'
2016-08-08 15:50:00 +05:30
Nabin Hait
d5c83122f2
bumped to version 7.0.21
2016-08-08 16:20:00 +06:00
Nabin Hait
2777f23ace
Merge pull request #6019 from nabinhait/pcv_test_case
...
Fixed test cases for period closing voucher
2016-08-08 15:45:19 +05:30
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
Nabin Hait
7e27e32e92
Merge pull request #6017 from nabinhait/repost_future_stock_transactions
...
Repost gle for future transactions if update stock checked in back dated purchase invoice
2016-08-08 14:45:17 +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
be3aee973c
Merge pull request #6011 from saurabh6790/get_acount_balance_fix
...
[minor][fix] return if account details not found
2016-08-08 12:36:40 +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
- Sets the Status to In Process or Not Started instead of Unstopped
- Displays this same status on the client prompt (msgprint)
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
8793b823af
Merge branch 'develop'
2016-08-06 14:15:34 +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
Rushabh Mehta
2123e02eda
Merge pull request #6005 from revant/patch-2
...
[fix] success_url Issue #6004
2016-08-06 13:40:02 +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
c1162796c5
Merge branch 'develop'
2016-08-05 16:45:14 +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
Nabin Hait
c49a3425ef
Merge pull request #6002 from nabinhait/pe_fix_101
...
Payment Entry fix: Unallocated amount in payment entry considering deductions
2016-08-05 15:44:44 +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
fa1775b6a6
Merge pull request #5988 from nabinhait/item_route
...
default material request type field restored in item
2016-08-03 17:53:11 +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
46f328cbda
Merge branch 'develop'
2016-08-02 18:07:53 +05:30
Nabin Hait
1b9a01b6c3
bumped to version 7.0.18
2016-08-02 18:37:52 +06:00
Nabin Hait
e8ab7b8898
Merge pull request #5976 from nabinhait/patch_fix_109
...
[patch] Set default material request type in Item based on default bom
2016-08-02 18:05:03 +05:30
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
b77ad7c31d
Merge branch 'develop'
2016-08-02 17:16:46 +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
e1e6468b33
Merge pull request #5974 from nabinhait/pos_change_amount
...
Change amount calcualtion in POS if there is write off amount and gl entries in this scenario
2016-08-02 17:14:50 +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
Nabin Hait
8869430a81
Merge pull request #5967 from rohitwaghchaure/minor_fix
...
minor fix in payment entry
2016-08-02 11:29:48 +05:30
Rohit Waghchaure
7f031d1bfd
minor fix in payment entry
2016-08-02 11:07:40 +05:30
Rushabh Mehta
5b1ebc5c54
Merge pull request #5933 from shreyasp/erpnext/update-travis
...
[Minor] Updated the travis.yml to use latest bench installer for erpnext
2016-08-02 10:44:39 +05:30
Neil Trini Lasrado
5bb2f56b47
Update make_guardian.py
2016-08-02 00:01:00 +05:30
Nabin Hait
1e3e6865ce
Merge branch 'develop'
2016-08-01 18:07:21 +05:30
Nabin Hait
94542e104c
bumped to version 7.0.16
2016-08-01 18:37:20 +06:00
Nabin Hait
90bf69aa52
Merge pull request #5957 from nabinhait/guardian_patch_fix
...
[patch] reload guardian interest
2016-08-01 18:05:33 +05:30
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
3aac12d56b
Merge branch 'develop'
2016-08-01 17:48:28 +05:30
Nabin Hait
ed75667f64
bumped to version 7.0.15
2016-08-01 18:18:27 +06:00
Nabin Hait
16a0fef759
Merge pull request #5956 from nabinhait/guardian_patch_fix
...
[patch] fixed reload doc and permission issue in guardian patch
2016-08-01 17:47:48 +05:30
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
shreyas
60e9f84c8a
[Minor] Updated the travis.yml to use new installer for erpnext
2016-08-01 17:40:20 +05:30
Nabin Hait
1ffa76ba5c
Merge branch 'develop'
2016-08-01 17:35:02 +05:30
Nabin Hait
798f3897a3
bumped to version 7.0.14
2016-08-01 18:05:02 +06:00
Nabin Hait
e810ea3a2f
Merge pull request #5954 from nabinhait/guardian_patch_fix
...
Run guardian patch only if student doctype exists and there is father_name column
2016-08-01 17:33:51 +05:30
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
53133dbd4d
Merge branch 'develop'
2016-08-01 16:24:53 +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
Rushabh Mehta
185110159e
Merge pull request #5828 from neilLasrado/guardian
...
Added Guardian
2016-08-01 15:36:48 +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
1d7bd0efb8
Merge branch 'develop'
2016-08-01 14:12:47 +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
Nabin Hait
7c52d09dc2
Merge pull request #5947 from nabinhait/patch_order_fix
...
Changed the order of the patch
2016-08-01 13:06:13 +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
Rushabh Mehta
62658fde45
Merge pull request #5941 from nabinhait/link_formatter
...
minor fix for item and employee link formatter
2016-08-01 10:28:48 +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
Nabin Hait
69e0441041
Merge pull request #5930 from KanchanChauhan/demo-data-for-leave-attendance
...
Demo data for Leave Allocation, Leave Application and Attendance
2016-07-29 16:20:29 +05:30
Kanchan Chauhan
db0e57cdce
Demo data for Leave Allocation, Leave Application and Attendance
2016-07-29 15:59:39 +05:30
Rushabh Mehta
51a593b0b5
Merge pull request #5918 from revant/patch-1
...
[Docs] changed path to login
2016-07-29 07:50:55 +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
1892520324
Merge branch 'develop'
2016-07-28 18:26:23 +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
33b10a0405
Merge pull request #5908 from nabinhait/pe_precision_fix
...
Set difference amount in Payment Entry as per field precision
2016-07-28 17:51:57 +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
0d5e208f8c
Merge branch 'develop'
2016-07-28 16:01:00 +05:30
Nabin Hait
a163299991
bumped to version 7.0.9
2016-07-28 16:31:00 +06:00
Nabin Hait
acff41ddd2
Merge pull request #5906 from nabinhait/opportunity_status_fix
...
Added converted status in Opportunity
2016-07-28 15:59:43 +05:30
Nabin Hait
e72ff9377a
Added converted status in Opportunity
2016-07-28 15:59:20 +05:30
Nabin Hait
a948407460
Merge branch 'develop'
2016-07-28 15:46:36 +05:30
Nabin Hait
ee70f26131
bumped to version 7.0.8
2016-07-28 16:16:35 +06:00
Rushabh Mehta
142b6187b3
Merge pull request #5902 from akshay83/develop
...
[fix] serial no button
2016-07-28 15:05:04 +05:30
akshay
14384c2787
[fix] serial no button
2016-07-28 13:53:17 +05:30
Nabin Hait
7357902802
Merge pull request #5896 from nabinhait/fix_112
...
[fix] repost gle only if there is any stock account without warehouse
2016-07-27 17:34:23 +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
949ceb18fc
Merge pull request #5894 from nabinhait/sle_fix_101
...
minor fix for stock ledger entry
2016-07-27 16:44:54 +05:30
Nabin Hait
7590b8fff1
minor fix for stock ledger entry
2016-07-27 16:44:26 +05:30
Rushabh Mehta
5a8b7ca7be
Merge pull request #5888 from neilLasrado/develop
...
[Patch] Change status in Opportunity to Quotation where status is converted
2016-07-27 16:03:21 +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
Rushabh Mehta
380dbb044f
Merge pull request #5886 from neilLasrado/develop
...
[Fix] Fixed issues in Fee records
2016-07-27 15:32:26 +05:30
Neil Trini Lasrado
ee75d41da0
[Fix] Fixed issues in Fee records
2016-07-27 15:23:19 +05:30
Rushabh Mehta
e26a42dc7a
Merge branch 'develop'
2016-07-27 15:19:58 +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
67047fbb06
Merge branch 'rohitwaghchaure-warehouse_blank_issue_for_non_stock_account' into develop
2016-07-27 12:43:25 +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
Rushabh Mehta
2af5dfa9cc
Merge pull request #5884 from saurabh6790/schools_fix
...
[minor][fix] rename attribute from amount to components
2016-07-27 12:23:22 +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
Rushabh Mehta
fd288f36ec
Merge pull request #5880 from bcornwellmott/fixSalarySlip_TimeSheet_SQL
...
Added date filters for the Timesheet query in Salary Slip
2016-07-27 08:22:29 +05:30
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
6fe4a336f1
Merge branch 'develop'
2016-07-26 18:02:38 +05:30
Rushabh Mehta
154be9b693
bumped to version 7.0.5
2016-07-26 18:32:38 +06:00
Rushabh Mehta
d46235ed83
Merge pull request #5874 from saurabh6790/maintenance_schedule_fix
...
[minor][fix] end date should not be less or equal to start date
2016-07-26 17:44:42 +05:30
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
Rushabh Mehta
9b542f303c
Merge pull request #5870 from saurabh6790/fee_component_patch_fix
...
[fix] fee component rename patch fix
2016-07-26 15:06:56 +05:30
Saurabh
21a5658fdf
[fix] fee component rename patch fix
2016-07-26 15:03:41 +05:30
Rushabh Mehta
0540d52449
Merge pull request #5868 from rohitwaghchaure/patch_issue
...
[Fix] Timesheet patch
2016-07-26 12:59:00 +05:30
Rohit Waghchaure
8a9daece7e
[Fix] Timesheet patch
2016-07-26 12:57:05 +05:30
Rushabh Mehta
c85aa3d9c5
Merge branch 'develop'
2016-07-26 09:24:00 +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
Rushabh Mehta
40cf3db0b1
Merge pull request #5865 from rohitwaghchaure/v7_fixes_and_cleanup
...
[mionr] fixes and cleanups
2016-07-26 07:58:03 +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
Rushabh Mehta
eac602304c
Merge pull request #5864 from neilLasrado/rename
...
[rename] Renamed Fee Amount to Fee Component
2016-07-25 18:37:09 +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
5658fdfaed
Merge branch 'develop'
2016-07-25 15:45:46 +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
Rushabh Mehta
316f78f859
Merge pull request #5858 from bohlian/develop
...
[Fixed] Stopping and Re-Opening of Production Order
2016-07-25 14:24:16 +05:30
Javier Wong
5b2af6ad40
[Fixed] Stopping and Re-Opening of Production Order
2016-07-25 16:49:39 +08:00
Rushabh Mehta
00f7741288
Merge branch 'develop'
2016-07-25 12:58:03 +05:30
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
Rushabh Mehta
7b13c11182
Merge pull request #5857 from neilLasrado/perm
...
Removed Administrator role from Doctypes
2016-07-25 11:46:50 +05:30
Neil Trini Lasrado
d69d961f2a
Removed Administrator role from Doctypes
2016-07-25 11:39:23 +05:30
Rushabh Mehta
cc887900e8
[fix] --yes for reinstall
2016-07-24 22:45:09 +05:30
Rushabh Mehta
ead3ccfd52
[fix] more routes patch up
2016-07-24 22:28:50 +05:30
Rushabh Mehta
84f25b3214
Merge branch 'develop'
2016-07-24 17:17:43 +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
Rushabh Mehta
0e94785cdd
Merge pull request #5846 from rohitwaghchaure/timesheet_patch_issue
...
[Fix] Timesheet patch
2016-07-24 11:52:09 +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
Rushabh Mehta
c96263ceb8
Merge pull request #5841 from neilLasrado/student_batch
...
Minor fixed for Schools
2016-07-22 19:16:54 +05:30
Neil Trini Lasrado
6cfb60dc98
Minor fixed for Schools
2016-07-22 19:08:18 +05:30
Anand Doshi
e8eccf1a49
Merge branch 'develop'
2016-07-22 16:03:16 +05:30
Anand Doshi
b2e1d54fce
bumped to version 7.0.0
2016-07-22 16:33:16 +06:00
Nabin Hait
f5c5634235
Merge pull request #5824 from rohitwaghchaure/demo_records
...
Demo records for projects+tasks+billing, pos invoice
2016-07-22 15:56:55 +05:30
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
Nabin Hait
38035c252a
Merge pull request #5840 from umairsy/15jul
...
Documentation of Timesheet, Budgeting and Payment Entry
2016-07-22 15:36: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
1adb77ee17
Merge branch 'hotfix'
2016-07-22 12:58:12 +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
Rushabh Mehta
20fc7a1e1e
Merge pull request #5826 from rohitwaghchaure/v7_pos_issue
...
[Fix]POS and timesheet issues
2016-07-22 10:35:06 +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
Rushabh Mehta
744d77466c
Merge pull request #5819 from neilLasrado/develop
...
Fixed patch for migrating schools to erpnext again
2016-07-21 17:00:12 +05:30
Neil Trini Lasrado
a537e43838
Fixed patch for migrating schools to erpnext again
2016-07-21 16:57:04 +05:30
Rushabh Mehta
5f7727424e
Merge pull request #5818 from neilLasrado/develop
...
Fixed patch for migrating schools to erpnext
2016-07-21 16:43:40 +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
Rushabh Mehta
4a5cc77352
Merge pull request #5816 from rohitwaghchaure/minor_issue
...
[Fix] To time issue in timesheet
2016-07-21 14:58:49 +05:30
Rohit Waghchaure
3176bc93c1
[Fix] Timesheet to time issue
2016-07-21 14:56:15 +05:30
Nabin Hait
40d4a8d13f
Merge pull request #5806 from rohitwaghchaure/stock_entry_difference_amount_issue
...
[Fix] Stock entry difference amount issue.
2016-07-21 12:28:20 +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
cfd9b1a24c
Merge pull request #5811 from nabinhait/demo2
...
Demo data for Payment Entry
2016-07-21 11:33:57 +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
Rushabh Mehta
f65b50ea6c
Merge pull request #5801 from netchampfaris/ui-fixes
...
fix pos layout #5780
2016-07-20 14:50:25 +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
Rushabh Mehta
28773214bf
Merge pull request #5795 from rohitwaghchaure/sales_invoice_form_is_pos_issue
...
set paid amount with grand amount on sales invoice form
2016-07-19 21:34:05 +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
Nabin Hait
26452cb7eb
Merge pull request #5769 from rohitwaghchaure/timesheet_workstation_holiday_issue
...
[Fix] Timesheet workstation holiday issue
2016-07-16 10:49:17 +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
Rushabh Mehta
cd2ee8940b
Merge pull request #5760 from saurabh6790/is_group_fixes
...
[fix] patch fix for fieldtype change from select to check for is_group
2016-07-14 18:58:50 +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
Nabin Hait
64602168b7
Merge pull request #5754 from rohitwaghchaure/timesheet_patch_fix
...
[Fix] Timesheet patch
2016-07-14 15:25:34 +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
Rushabh Mehta
c748e9c991
Merge pull request #5724 from rohitwaghchaure/v7_timesheet_issue
...
[Fix] Added note field in timesheet and fixes in timesheet patch
2016-07-13 10:53:01 +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
57585aa98d
Merge pull request #5711 from nabinhait/payment_fix_10
...
[fix] Advance payment adjustment in sales/purchase invoice
2016-07-11 17:07:28 +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
Nabin Hait
f366f4d915
Merge pull request #5703 from rohitwaghchaure/timesheet_rename_issue
...
[Fix] Time sheet rename issues
2016-07-11 15:08:32 +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
dceb2e99b6
Merge pull request #5699 from nabinhait/patch_fixes
...
Changed patch order to fix old patches
2016-07-11 12:50:17 +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
Rushabh Mehta
f3a50dc1c5
Merge pull request #5684 from rohitwaghchaure/v7_ts_issue
...
[Salary Structure] Make salary_component field mandatory if salary_slip_based_on_timesheet is true
2016-07-07 17:44:05 +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
Nabin Hait
621ef1ea5c
Merge pull request #5680 from rohitwaghchaure/pricing_rule_issue
...
[Fix] Pricing rule issue
2016-07-07 12:33:53 +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
ac418d44d9
Merge pull request #5666 from nabinhait/fixed_asset_revisited
...
Fixed asset revisited
2016-07-07 10:33:53 +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
Nabin Hait
e739c0cf4e
Merge pull request #5670 from rohitwaghchaure/v7_fixes
...
[Fixes] POS amount calculation issue
2016-07-06 16:20:59 +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
018b6a4bdd
Merge pull request #5668 from nabinhait/stock_reco_fix
...
Query for warehouse and editable fields in grid
2016-07-06 15:47:25 +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
Nabin Hait
479c92a1ea
Merge pull request #5664 from rohitwaghchaure/v7_fixes
...
[Fixes] Time sheet fixes
2016-07-06 15:12:32 +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
Nabin Hait
be81522958
Merge pull request #5661 from rohitwaghchaure/v7_fixes
...
[Fix] Patch salary component
2016-07-06 12:41:02 +05:30
Rohit Waghchaure
c8d231b26b
[Fix] Patch salary component
2016-07-06 12:33:54 +05:30
Nabin Hait
f1439c8f78
Merge pull request #5641 from rohitwaghchaure/rename_prevdoc_fields
...
Rename prevdoc field in purchase order and purchase receipt doctype
2016-07-06 12:21:38 +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
Nabin Hait
a86c5b196f
Merge pull request #5649 from saurabh6790/payment_request_grand_total_fix
...
[minor][fix] fix base_grand_total in payment request
2016-07-05 16:41:57 +05:30
Saurabh
c03a3bf580
[minor][fix] fix base_grand_total
2016-07-05 15:58:14 +05:30
Rushabh Mehta
e9ba712fe3
Merge pull request #5646 from saurabh6790/V7_cheque_print_and_doc_flow_fixes
...
V7 cheque print and documnet flow fixes
2016-07-05 14:55:36 +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
Rushabh Mehta
4419450203
Merge pull request #5638 from nabinhait/warehouse_patch_fix
...
Warehouse patch fix
2016-07-04 18:15:49 +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
Rushabh Mehta
6fa4ec15aa
Merge pull request #5629 from saurabh6790/erp_v7_fix
...
[Minor][fix] Holiday list message fix and company attr fix
2016-07-04 14:07:16 +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
Rushabh Mehta
bed82952b9
Merge pull request #5628 from saurabh6790/patch_fixes
...
[minor][fix] reload warehouse before executing patches
2016-07-04 11:57:37 +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
Rushabh Mehta
3156d596d0
Merge pull request #5627 from rohitwaghchaure/fixes_timesheet_on_sales_invoice
...
[Fixes] Time sheet dependency removed from sales invoice and patch fixes
2016-07-04 10:57:44 +05:30
Rohit Waghchaure
ad884b9fa9
[Fixes] Time sheet dependency removed from sales invoice and patch fixes
2016-07-02 22:28:29 +05:30
Rushabh Mehta
3d047c0be5
Merge pull request #5626 from saurabh6790/stock_analytics
...
[fix] load dependancies on page load event
2016-07-02 17:35:50 +05:30
Saurabh
b35906efc1
[fix] load dependancies on page load event
2016-07-02 17:13:11 +05:30
Rushabh Mehta
133d10429a
Merge pull request #5622 from saurabh6790/stock_analytics
...
[fix] Stock Analytics Report page fix
2016-07-01 18:47:23 +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
Rushabh Mehta
2d65a298ef
Merge pull request #5607 from rohitwaghchaure/v7_rfq_fixes
...
[RFQ] Enhancement and minor fixes
2016-06-30 13:37:12 +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
Rushabh Mehta
cb862c6683
Merge pull request #5604 from rohitwaghchaure/time_sheet_wages
...
[Fixes] Time sheet fixes and changed timesheets to time_logs
2016-06-29 21:55:58 +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
Rushabh Mehta
67cf8af5f8
Merge pull request #5592 from rohitwaghchaure/time_sheet_wages
...
[Fix] Removed make_for field from time sheet
2016-06-29 12:11:16 +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
Nabin Hait
c8d86cb948
Merge pull request #5572 from saurabh6790/warehouse_tree_fix
...
[fix] warehouse tree patch fix
2016-06-28 17:52:10 +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
Rushabh Mehta
db53a15bc3
Merge pull request #5557 from saurabh6790/timesheet_fix
...
[fixes] time sheet patch fix
2016-06-27 17:48:17 +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
Rushabh Mehta
846f2a4989
Merge pull request #5545 from saurabh6790/convert_to_group_or_ledger
...
warehouse group to ledger conversion
2016-06-27 17:23:30 +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
Rushabh Mehta
35796683c1
Merge pull request #5555 from saurabh6790/stock_projected_qty
...
[fix] report Stock Projected Qty
2016-06-27 17:08:39 +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
Rushabh Mehta
20bedc004e
Merge pull request #5548 from saurabh6790/after_rename_for_item_and_item_grp
...
[minor][fix] remove website generator call on after rename
2016-06-27 12:28:23 +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
Nabin Hait
110855e572
Merge pull request #5539 from saurabh6790/merge_acc_type_warehouse_and_stock_to_stock
...
Merge acc type warehouse and stock to stock
2016-06-26 14:42:15 +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
d454fb0f52
Merge pull request #5544 from saurabh6790/authorization_rule_fix
...
[fix] authorization rule fix for sales order
2016-06-26 13:04:15 +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
494f0e279c
Merge pull request #5543 from nabinhait/warehouse_fix
...
[fix] Identify account group for warehouse based on account type
2016-06-26 08:26:50 +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
Rushabh Mehta
b72a2955ac
Merge pull request #5537 from saurabh6790/make_route_fix
...
[fix] return route from make_route of child class
2016-06-25 10:55:30 +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
4dd6b7e671
Merge branch 'hotfix'
2016-06-24 16:11:59 +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
828e2fd5e0
Merge branch 'hotfix'
2016-06-24 12:46:27 +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
2039b3e192
Merge pull request #5524 from rmehta/email-queue
...
[rename] Bulk Email to Email Queue
2016-06-22 13:15:55 +05:30
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
Rushabh Mehta
b1396cb8c3
Merge pull request #5515 from cgpurbaugh/patch-2
...
Update index.md
2016-06-21 10:12:25 +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
Rushabh Mehta
142403e97c
Merge pull request #5506 from umairsy/17jun
...
small fixes
2016-06-17 14:17:55 +05:30
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
Anand Doshi
10ee3655d3
Merge pull request #5477 from neilLasrado/hotfix
...
Set `get_contact_details` and `get_address_display` to the right stan…
2016-06-16 18:41:48 +05:30
Rushabh Mehta
10a3728d09
Merge pull request #5490 from rohitwaghchaure/pos_testing_fix
...
[POS] Minor fixes
2016-06-16 12:45:11 +05:30
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
Rushabh Mehta
3dd8719aa9
Merge pull request #5474 from rohitwaghchaure/pos_enhancement_and_minor_fixes
...
[POS] Enhancement to set default payment as cash, functionality to clear amount value, renamed doctype Payments and some fixes.
2016-06-14 11:03:00 +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
Rushabh Mehta
d395c7d54e
Merge pull request #5458 from rohitwaghchaure/pos_fixes
...
[Fix] POS page loading issue, if system has only one item
2016-06-10 06:36:58 +05:30
Rohit Waghchaure
28c02fe51d
[Fix] POS page loading issue, if system has only one item
2016-06-10 00:48:03 +05:30
Anand Doshi
51ad436e16
[fix] sales and accounts browser name
2016-06-09 19:37:35 +05:30
Anand Doshi
34482788f4
[fix] removed bad import
2016-06-09 16:57:16 +05:30
Anand Doshi
8f6e6ff543
[fix] removed bad import
2016-06-09 16:57:08 +05:30
Anand Doshi
d492b675a7
[fix] removed bad import
2016-06-09 16:56:54 +05:30
Anand Doshi
754f8b42f5
[version] changed to 7.0.0-beta
2016-06-09 16:31:57 +05:30
Anand Doshi
227b238fb1
[fix] change in versioning: store __version__ in __init__.py
2016-06-09 16:31:01 +05:30
Anand Doshi
36a0c5c564
[fix] change in versioning: store __version__ in __init__.py
2016-06-09 16:29:46 +05:30
Anand Doshi
db6b832302
[fix] change in versioning: store __version__ in __init__.py
2016-06-09 16:29:12 +05:30
Rushabh Mehta
d56306add0
[minor] [fix] quotation cancelled status issue, fixes #5221
2016-06-09 15:56:48 +05:30
Rushabh Mehta
743de9b306
[minor] website field in customer and allow_import for purchase receipt, fixes #5227
2016-06-09 15:11:45 +05:30
Rushabh Mehta
cb29d9886c
[minor] fixes #5252
2016-06-08 17:31:11 +05:30
Rushabh Mehta
e9d2c3d46e
[fix] report requested items to be transferred, fixes #5295
2016-06-08 16:41:09 +05:30
Rushabh Mehta
6e837599b1
[minor] added cost center to item wise sales register, fixes #5301
2016-06-08 16:35:10 +05:30
Rushabh Mehta
e778e59e4c
[minor] always show issues in sidebar
2016-06-08 15:34:54 +05:30
Rushabh Mehta
7ce345a827
[minor] re-organize issue
2016-06-08 11:10:34 +05:30
Rushabh Mehta
0b955e6c33
[minor] production planning, fix description
2016-06-08 11:10:34 +05:30
Anand Doshi
841a3bd10f
Merge branch 'saurabh6790-module_flow' into develop
2016-06-07 18:56:03 +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
Rushabh Mehta
605f8a7e09
Merge pull request #5449 from RobertSchouten/patch-11
...
[fix] show company in list view
2016-06-07 16:55:34 +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
Rushabh Mehta
ddd4ce51b8
Merge pull request #5447 from ShashaQin/patch-23
...
Update bom.py
2016-06-07 12:16:20 +05:30
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
b09c87bd0f
Merge branch 'hotfix'
2016-06-03 11:50:19 +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
Rushabh Mehta
1c36b5fd39
Merge pull request #5432 from bcornwellmott/patch-1
...
[BUG] Fix Create Material Request OperationalError
2016-06-02 07:00:47 +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
Nabin Hait
29628f3bb1
Merge pull request #5407 from neilLasrado/hotfix-1
...
Fixed error in bom autoname
2016-05-27 16:22:32 +05:30
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
18f622f3a9
Merge pull request #5406 from nabinhait/patch_fix
...
[fix] reload gl entry doctype in patch
2016-05-27 12:44:54 +05:30
Nabin Hait
a60ceba6d4
[fix] reload gl entry doctype in patch
2016-05-27 12:44:18 +05:30
Nabin Hait
5b7f6300c8
Merge pull request #5405 from nabinhait/chart-fix
...
[fix] Charts in report
2016-05-27 12:34:25 +05:30
Nabin Hait
0014aa9c26
[fix] Charts in report
2016-05-27 12:21:36 +05:30
Nabin Hait
af70b11ea2
Merge pull request #5400 from nabinhait/project_gle
...
Added Project in GL Entry and General Ledger report
2016-05-27 11:23:17 +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
fd5d0db6e2
Merge branch 'hotfix'
2016-05-26 16:55:34 +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
1c383c3664
Merge branch 'hotfix'
2016-05-26 15:45:34 +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
Rushabh Mehta
6e4263cfc6
Merge pull request #5396 from rohitwaghchaure/enhancement_point_of_sales
...
[POS] enhancement and minor fixes
2016-05-25 16:10:27 +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
Nabin Hait
05997b9138
Merge pull request #5380 from rohitwaghchaure/hotfix_material_request_issue
...
[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-23 12:31:17 +05:30
Nabin Hait
434ae21785
Merge pull request #5384 from fderyckel/patch-3
...
minor edits
2016-05-23 10:43:58 +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
6558e1dd80
Merge branch 'hotfix'
2016-05-20 15:15:20 +05:30
Nabin Hait
a54a2a99f4
bumped to version 6.27.19
2016-05-20 15:45:20 +06:00
Nabin Hait
eb04405d6b
Merge pull request #5377 from nabinhait/setup_wizard_access
...
[hotfix] setup wizard access
2016-05-20 15:13:28 +05:30
Nabin Hait
d112417301
[hotfix] setup wizard access
2016-05-20 15:12:45 +05:30
Rushabh Mehta
d2a51d47d8
Merge pull request #5375 from rohitwaghchaure/editable_fields_overriding_issue
...
[Fixes] material request's editable fields overriding with purchase common
2016-05-20 14:11:19 +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
de974c684c
Merge branch 'hotfix'
2016-05-20 12:18:27 +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
Nabin Hait
a1f7e070ec
Merge pull request #5373 from rohitwaghchaure/tax_rule_fixes
...
[Fixes] tax rule, tax rule working even if tax template inside the rule is disabled.
2016-05-20 11:35:37 +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
Rushabh Mehta
c9bfc47854
Merge pull request #5347 from kressi/docfix
...
cleanup up docs
2016-05-13 21:50:21 +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
Rushabh Mehta
6cdebc0baf
Merge pull request #5343 from kressi/patch-1
...
fixed typo
2016-05-12 19:50:19 +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
f2f15629ab
Merge branch 'hotfix'
2016-05-11 12:43:39 +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
Rushabh Mehta
3edc453506
Merge pull request #5330 from IAGAdmin/patch-2
...
Update concepts-and-terms.md
2016-05-11 10:54:25 +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
2f88c67a94
Merge pull request #5328 from nabinhait/sales_register_cols
...
Mode of Payment columns and filters added in sales/purchase register
2016-05-10 17:17:44 +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
Rushabh Mehta
acf45f7b72
Merge pull request #5294 from rohitwaghchaure/pos
...
[WIP][Enhancement] Online and Offline POS
2016-05-10 11:25:20 +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
80c02640a1
Merge branch 'hotfix'
2016-05-06 16:13:34 +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
Anand Doshi
b35abf1125
Merge pull request #5316 from vjFaLk/patch-4
...
Minor link fix
2016-05-06 15:51:22 +05:30
Nabin Hait
397805f992
Merge pull request #5319 from nabinhait/return_fix
...
[fix] Validate returned serial nos and batch nos with original document
2016-05-06 15:49:18 +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
Anand Doshi
c3213b198c
Merge pull request #5312 from vjFaLk/leave-app-fix
...
Fixed Leave Approver issue
2016-05-05 14:39:42 +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
Anand Doshi
a110a06f38
Merge pull request #5300 from neilLasrado/hotfix
...
redirect issues of erpnext to erpnext repository
2016-05-04 15:49:10 +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
9b6198436b
Merge branch 'hotfix'
2016-05-02 15:19:16 +05:30
Nabin Hait
d824fbbddd
bumped to version 6.27.15
2016-05-02 15:49:16 +06:00
Nabin Hait
2460becc50
Merge pull request #5297 from vjFaLk/reset-values
...
Reset Values in Tools
2016-05-02 15:16:28 +05:30
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
e089ffa1fe
Merge branch 'hotfix'
2016-04-29 18:26:45 +05:30
Nabin Hait
ab7f6870cb
bumped to version 6.27.14
2016-04-29 18:56:45 +06:00
Nabin Hait
abfcefb52f
Merge pull request #5292 from neilLasrado/sales_purchase_register
...
Itemwise purchase and Itemwise sales
2016-04-29 18:24:59 +05:30
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
efbcd7c788
Merge branch 'hotfix'
2016-04-29 11:44:54 +05:30
Nabin Hait
cfe14d9814
bumped to version 6.27.13
2016-04-29 12:14:54 +06:00
Nabin Hait
fecccbfbb3
Merge pull request #5262 from nabinhait/fixed_asset_update
...
Fixed asset graphs and movement
2016-04-29 11:42:53 +05:30
Nabin Hait
d8df0d3a8f
Merge pull request #5278 from nabinhait/report_fix1
...
Sales / Purchase Register report fix and on item rename update item-tax json
2016-04-29 11:41:53 +05:30
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
Rushabh Mehta
69d293db08
[removed] issue/pull request template
2016-04-28 15:06:36 +05:30
Rushabh Mehta
3c809c60cd
Merge pull request #5275 from vjFaLk/patch-3
...
Delete Contributing.md
2016-04-28 11:04:32 +05:30
Valmik
6b3c829e4e
Delete Contributing.md
...
Existing file in .github folder
2016-04-28 10:28:32 +05:30
Anand Doshi
79c536acb5
Merge branch 'master' into develop
2016-04-27 15:44:11 +05:30
Anand Doshi
1e2a3f58c1
Merge branch 'hotfix'
2016-04-27 15:43:21 +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
19063db1bd
Merge pull request #5267 from neilLasrado/trans
...
Fixed arabic translation
2016-04-27 12:33:48 +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
ed3c0123e5
Merge branch 'enhancement/products-in-list' into develop
2016-04-22 19:10:57 +05:30
Anand Doshi
a6f48688bc
[enhancement] website: optionally show products as list
2016-04-22 19:10:49 +05:30
Anand Doshi
700ff7a127
Merge branch 'KanchanChauhan-WebsiteChanges' into develop
2016-04-22 18:53:39 +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
2cda7fd834
Merge branch 'hotfix'
2016-04-22 12:15:35 +05:30
Nabin Hait
054e2952c8
bumped to version 6.27.11
2016-04-22 12:45:35 +06:00
Nabin Hait
b4f1f1e8b8
Merge pull request #5255 from nabinhait/hotfix1
...
[fix] Fixed ambiguous column name in query
2016-04-22 12:12:47 +05:30
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
6c99c65a97
Merge pull request #5244 from vjFaLk/patch-2
...
Fixed spelling
2016-04-21 11:39:59 +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
18433591c3
Merge branch 'hotfix'
2016-04-20 16:43:00 +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
Valmik
12bff6ed7c
Fixed spelling
2016-04-20 13:55:48 +05:30
Nabin Hait
88742e0912
Merge pull request #5241 from neilLasrado/lead
...
Removed no-copy from source in lead
2016-04-20 13:02:12 +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
Anand Doshi
4e30b84d88
[fix] templates for pull request and issues
2016-04-19 13:13:08 +05:30
Rushabh Mehta
2c49473df8
Merge pull request #5234 from MaxMorais/patch-3
...
get_address_display calling method error
2016-04-18 23:07:57 +05:30
Rushabh Mehta
4e6402e418
Merge pull request #5230 from vjFaLk/gh-templates
...
[Fix] Added Discuss link in Issue Template
2016-04-18 23:04:09 +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
972224e71a
Merge branch 'saurabh6790-pi_update_stock' into develop
2016-04-18 17:01:57 +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
Valmik Jangla
1bc3455139
Added Discuss link
2016-04-18 15:35:20 +05:30
Rushabh Mehta
092b43bff2
Merge pull request #5229 from vjFaLk/gh-templates
...
[WIP] Updated Contribution Guidelines and added Templates
2016-04-18 15:24:03 +05:30
Valmik Jangla
463cea3b1b
Added Github templates
2016-04-18 15:21:10 +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
4cb163903e
Merge pull request #5210 from jinayG/patch-1
...
Update README.md
2016-04-15 14:12:47 +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
4058af24e2
Merge branch 'hotfix'
2016-04-15 11:01:32 +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
Anand Doshi
48d0a9953d
[travis]
2016-04-14 18:59:11 +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
jinayG
554884b7d2
Update README.md
2016-04-14 16:24:46 +05:30
Rushabh Mehta
6fb803e181
Merge pull request #5209 from umairsy/field-arrangment
...
address and contact related fields re-arranged in the sales transacti…
2016-04-14 14:24:59 +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
Rushabh Mehta
dc2a95aafc
Merge pull request #5207 from ShashaQin/patch-44
...
Update project.py
2016-04-14 10:29:21 +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
9f553e7206
Merge branch 'hotfix'
2016-04-13 16:04:37 +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
55f6308169
Merge branch 'anandpdoshi-fix/quotation-lead-tax-rule' into hotfix
2016-04-13 12:03:22 +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
Nabin Hait
96d7905383
Merge pull request #5177 from rohitwaghchaure/support_hot_fix
...
[Fix] Default letter head
2016-04-12 11:03:18 +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
126ef64203
Merge pull request #5133 from rohitwaghchaure/new_rfq
...
[Fixes]Portal, Supplier can view their addresses, default buying price list …
2016-04-11 15:17:15 +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
4e10a61141
Merge pull request #5169 from nabinhait/patch_fix1
...
[fix] Fixed party update status patch
2016-04-09 16:13:40 +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
Anand Doshi
47d8c52281
Merge branch 'neilLasrado-develop' into develop
2016-04-08 16:36:35 +05:30
Neil Trini Lasrado
cb6430575b
Fixed validation message for disabled employee
2016-04-08 16:36:26 +05:30
Anand Doshi
1dd6329e5b
Merge branch 'shreyasp-matl-req-non-stock-item' into develop
2016-04-08 16:32:30 +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
Anand Doshi
96ed4c394e
Merge pull request #5156 from agusputra/patch-28
...
Update opening-stock.md
2016-04-08 15:07:45 +05:30
Agus Syahputra
34f6145e9d
Update opening-stock.md
2016-04-08 16:35:59 +07:00
Anand Doshi
d89152e4a5
Merge pull request #5151 from anandpdoshi/fix/travis-frappe-branch
...
[fix] bench init using correct frappe branch
2016-04-07 19:56:49 +05:30
Anand Doshi
6677fd58ef
[fix] bench init using correct frappe branch
2016-04-07 19:33:04 +05:30
Anand Doshi
c6a695d0f3
Merge branch 'hotfix'
2016-04-07 17:41:48 +05:30
Anand Doshi
54910000d4
bumped to version 6.27.7
2016-04-07 18:11:48 +06:00
Anand Doshi
abf2796517
Merge pull request #5150 from shreyasp/move-company-fld-stock-entry
...
[Fix] Move company field to top of the Stock Entry form
2016-04-07 16:55:07 +05:30
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
ade5b82167
Merge branch 'hotfix'
2016-04-04 17:54:48 +05:30
Anand Doshi
bcbfeb0d53
bumped to version 6.27.6
2016-04-04 18:24:48 +06:00
Anand Doshi
710c38ffe1
Merge pull request #5120 from nabinhait/report_fix
...
[fix] received and delivered items to be billed report based on percentage billed
2016-04-04 17:43:24 +05:30
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
Anand Doshi
1a922196fa
Merge pull request #5130 from anandpdoshi/fix/validate-pos-paid-amount
...
[fix] POS paid amount validation using grand total
2016-04-04 15:22:51 +05:30
Anand Doshi
1d50bbfad1
Merge pull request #5129 from KanchanChauhan/POS-Search
...
[Minor Fix]POS Search Fixed
2016-04-04 15:22:39 +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
Anand Doshi
da7d1667d5
[travis]
2016-04-04 12:36:52 +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
Rushabh Mehta
5ea0799f83
Merge pull request #5113 from rohitwaghchaure/new_rfq
...
[Fix] Minor fix
2016-04-01 14:41:16 +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
Rushabh Mehta
8497784c4c
Merge pull request #5098 from nabinhait/multi_fix6
...
Multi fixes
2016-03-31 12:25:20 +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
d95c376d57
Merge pull request #5094 from nabinhait/item_query_fix
...
[fix] Item query in bom
2016-03-31 11:53:24 +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
4ccf692f7c
Merge branch 'hotfix'
2016-03-29 10:49:46 +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
Rushabh Mehta
2de1f86009
Merge pull request #5070 from vjFaLk/hotfix
...
Fix for Holiday List in Maintenance Schedule
2016-03-29 10:17:27 +05:30
Rushabh Mehta
fd9ead3cb6
Merge pull request #5072 from rohitwaghchaure/new_rfq
...
[Fix] Minor changes
2016-03-29 10:10:14 +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
Rushabh Mehta
cd4bede04f
Merge pull request #5060 from rohitwaghchaure/issue_fixes
...
[fixes] Set default company's letter head in purchase flow
2016-03-25 13:48:58 +05:30
rohitwaghchaure
f3f2ecf968
[fixes] Set default company's letter head in purchase flow
2016-03-25 12:57:50 +05:30
Rushabh Mehta
ef5ea4579d
Merge pull request #5059 from KanchanChauhan/PM-fixes-25Mar
...
Minor fixes
2016-03-25 12:09:47 +05:30
Kanchan Chauhan
53ce94f9bd
Minor fixes
2016-03-25 12:04:54 +05:30
Rushabh Mehta
aabc634afd
Merge branch 'hot-fix-leave-application'
2016-03-25 11:30:22 +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
Rushabh Mehta
cd66c5c972
Merge pull request #5052 from DrTrills/patch-2
...
Update quotes.py
2016-03-24 13:01:13 +05:30
DrTrills
6e9c8916c0
Update quotes.py
...
Added a fun fact to change it up
2016-03-23 18:27:34 -04:00
Anand Doshi
622837fcac
[travis]
2016-03-23 22:27:02 +05:30
Anand Doshi
bc04489b85
[travis]
2016-03-23 22:22:27 +05:30
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
Rushabh Mehta
1058bd0ae0
Merge pull request #5046 from KanchanChauhan/PMForms
...
Added task and issue webforms and few fixes
2016-03-23 14:50:14 +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
6a17205dcd
Merge pull request #5042 from frappe/revert-5028-paypal-cleanup
...
Revert "[cleanup] PayPal payment UX and moved related methods to hooks of respective apps"
2016-03-23 11:59:39 +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
Nabin Hait
76db1d702f
Merge pull request #5034 from rmehta/letter-head-in-salary
...
[fix] default letter in salary slip comes from customized default or company and optimized boot for curreny
2016-03-23 11:38:20 +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
97e523b4a4
Merge branch 'develop'
2016-03-21 17:25:09 +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
dda0906458
Merge branch 'develop'
2016-03-21 15:45:22 +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
Rushabh Mehta
833432086b
Merge pull request #5024 from nabinhait/recurring_doc_status
...
[patch] Fix delivery and billing status of recurring orders
2016-03-21 15:26:40 +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
Rushabh Mehta
d00ce6a8cf
Merge pull request #5022 from nabinhait/recurring_fix3
...
[fix] set recurring id after saving
2016-03-21 12:04:56 +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
f197d42503
Merge branch 'develop'
2016-03-18 16:36:40 +05:30
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
Nabin Hait
dcedac7f25
Merge pull request #5008 from rohitwaghchaure/support_week_14_03_5
...
[fix]Letterhead not being changed with change in company
2016-03-18 15:41:54 +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
Nabin Hait
d61b21cedf
Merge pull request #5002 from rohitwaghchaure/support_week_14_03_5
...
[fix]Fiscal year removed from trends report
2016-03-18 10:33:18 +05:30
rohitwaghchaure
5b9d517d04
[fix]Fiscal year removed from trends report
2016-03-17 22:46:09 +05:30
Nabin Hait
84806bf673
Merge branch 'develop'
2016-03-17 19:31:45 +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
21ade4a773
Merge pull request #5000 from nabinhait/develop
...
Minor fixes
2016-03-17 19:19:19 +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
2f7b210aac
Merge pull request #4995 from nabinhait/develop
...
[fix] BOM Browser
2016-03-17 18:05:28 +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
2c70238fbb
Merge branch 'develop'
2016-03-15 16:43:05 +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
6c88331101
Merge pull request #4986 from nabinhait/ar_fix
...
Fixes in AR/AP Print Format
2016-03-15 16:11:06 +05:30
Nabin Hait
f853a92676
Fixes in AR/AP Print Format
2016-03-15 16:10:15 +05:30
Nabin Hait
d8d6579003
Merge pull request #4985 from nabinhait/minor_fixes
...
minot fixes
2016-03-15 15:22:34 +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
Nabin Hait
25716652b7
Merge pull request #4982 from rohitwaghchaure/support_week_14_03-1
...
[fixes]draft BOM showing in Material Request
2016-03-15 11:36:15 +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
Nabin Hait
e66b6ce01f
Merge pull request #4978 from rohitwaghchaure/support_week_14_03
...
[fixes]indicator in material request item
2016-03-14 18:09:58 +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
a7aa2c70b5
Merge branch 'vjFaLk-holiday-list' into develop
2016-03-11 17:16:37 +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
58fc9037b3
Merge branch 'vjFaLk-remove-fiscal-year' into develop
2016-03-11 14:57:08 +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
09f7cc4912
Merge branch 'develop'
2016-03-11 12:30:42 +05:30
Anand Doshi
39dda5cf49
bumped to version 6.25.5
2016-03-11 13:00:42 +06:00
Anand Doshi
1e1d8026ad
Merge pull request #4966 from shreyasp/move-compny-fld-in-jv
...
[Minor] Moved company field to top of the form
2016-03-11 12:25:11 +05:30
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
73a0265e4f
Merge branch 'develop'
2016-03-10 15:51:35 +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
eb395788b7
Merge branch 'develop'
2016-03-10 12:48:52 +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
Anand Doshi
650b016584
Merge pull request #4961 from nabinhait/fix_658
...
[fix] Rearranged position of mode_of_payment in sales invoice
2016-03-10 12:15:11 +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
4147106c88
Merge branch 'develop'
2016-03-09 19:04:54 +05:30
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
c88068eecf
Merge branch 'develop'
2016-03-09 16:34:03 +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
7670c9f07d
Merge branch 'develop'
2016-03-09 15:47:14 +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
Anand Doshi
c62927ad5d
Merge branch 'neilLasrado-drip-emails' into develop
2016-03-08 20:22:45 +05:30
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
Anand Doshi
f9148f3a6f
Merge branch 'bohlian-develop' into develop
2016-03-08 17:40:10 +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
Anand Doshi
9a2dc8332b
Merge pull request #4930 from frehu01/patch-3
...
Update journal-entry.md
2016-03-07 11:28:01 +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
a0b21235d7
Merge branch 'develop'
2016-03-03 16:48:45 +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
3d101c3fd2
Merge branch 'develop'
2016-03-03 13:57:45 +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
c47d03cf8a
Merge branch 'develop'
2016-03-03 13:13:21 +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
2c8dc1d273
Merge branch 'develop'
2016-03-03 13:02:23 +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
a289ab75bf
Merge branch 'develop'
2016-03-03 11:27:42 +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
fe3f78b0f6
Merge branch 'develop'
2016-03-03 11:05:22 +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
Rushabh Mehta
7bdd9979aa
Merge pull request #4905 from KanchanChauhan/web-forms
...
[fix] added web form fixtures
2016-03-01 11:42:40 +05:30
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
aabefe4b7c
Merge branch 'develop'
2016-02-29 14:50:54 +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
Rushabh Mehta
e1f68b9904
Merge pull request #4901 from nabinhait/time_log_overlap_fix
...
[fix] Time Log overlap validation and test cases
2016-02-29 14:16:59 +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
Nabin Hait
ab40cd8d08
Merge pull request #4889 from agusputra/patch-21
...
Update managing-transactions-in-multiple-currency.md
2016-02-27 10:02:10 +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
3ef8d066b9
Merge branch 'develop'
2016-02-26 20:58:26 +05:30
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
593bfddb74
Merge branch 'develop'
2016-02-26 17:34:46 +05:30
Nabin Hait
658b3260c2
bumped to version 6.23.5
2016-02-26 18:04:46 +06:00
Nabin Hait
6c30972931
Merge pull request #4883 from nabinhait/time_log_fix
...
[fix] Time log overlap validation
2016-02-26 17:33:11 +05:30
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
8f810c55d2
Merge branch 'develop'
2016-02-26 15:21:02 +05:30
Nabin Hait
eb0c08f328
bumped to version 6.23.4
2016-02-26 15:51:02 +06:00
Nabin Hait
c37c7ed5c6
Merge pull request #4881 from nabinhait/develop
...
[fix] Show credit note button in sales invoice
2016-02-26 15:18:52 +05:30
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
36c0faa744
Merge branch 'develop'
2016-02-25 19:13:31 +05:30
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
a45a6005b8
Merge branch 'develop'
2016-02-25 15:18:42 +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
7f8a5fe6d2
Merge branch 'develop'
2016-02-25 11:59:39 +05:30
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
Nabin Hait
eb9a794993
Merge pull request #4869 from sbkolate/patch-2
...
opportunities status fix in Sales Funnel report
2016-02-25 10:41:11 +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
980f68a5fa
Merge branch 'develop'
2016-02-24 18:19:23 +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
Nabin Hait
ef3d18f127
Merge pull request #4859 from saurabh6790/cart_fixes
...
Shopping Cart with multi currency and checkout fixes
2016-02-24 17:29:55 +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
Nabin Hait
5f6e76ee03
Merge pull request #4862 from agusputra/patch-16
...
Update multi-currency-accounting.md
2016-02-24 11:10:45 +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
Nabin Hait
cfb05e429f
Merge pull request #4825 from saurabh6790/git-issues
...
[enhance] Displaying stock balance while creating quotation
2016-02-23 18:41:14 +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
3b06aeaffd
Merge pull request #4860 from nabinhait/target_variance_fix
...
[fix] Sales Person target variance report: based on lft and rgt of item group
2016-02-23 18:00:08 +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
Nabin Hait
195619e6d4
Merge pull request #4855 from sbkolate/patch-1
...
better validation example for developer
2016-02-22 18:06: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
Nabin Hait
22d8198058
Merge branch 'creador30-reorder_level_zero' into develop
2016-02-22 16:24:55 +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
Nabin Hait
65ec1bfa81
Merge pull request #4843 from nabinhait/delete_company_trans
...
minor fix
2016-02-22 15:48:50 +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
8fdd4e7b54
Merge branch 'develop'
2016-02-19 13:13:01 +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
Anand Doshi
6dc83b356a
Merge pull request #4839 from neilLasrado/typos
...
Typo Fixes
2016-02-18 19:55:43 +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
needed to make GL Entry
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
Anand Doshi
deccbabcc1
Merge pull request #4824 from vjFaLk/att-report-fix
...
"Left" Employees now show up in Monthly Attendance Report
2016-02-18 14:54:28 +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
123ca0fdcd
Merge branch 'develop'
2016-02-17 13:02:26 +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
65397f6de1
Merge branch 'vjFaLk-make-employee' into develop
2016-02-16 15:53:18 +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
1b8ca1712c
Merge branch 'ShashaQin-patch-25' into develop
2016-02-16 15:30:31 +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
6921894f8e
Merge branch 'develop'
2016-02-15 11:53:57 +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
f69b79fd16
Merge branch 'develop'
2016-02-12 13:12:49 +05:30
Rushabh Mehta
2e9f10934f
bumped to version 6.21.5
2016-02-12 13:42:48 +06:00
Rushabh Mehta
cc57088f5c
Merge pull request #4792 from anandpdoshi/optimize/stock-balance-report
...
[optimization] stock balance report - force index + improve memory usage
2016-02-12 13:09:15 +05:30
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
4bef7a3a52
Merge branch 'develop'
2016-02-11 12:41:22 +05:30
Rushabh Mehta
580933998e
bumped to version 6.21.4
2016-02-11 13:11:22 +06:00
Rushabh Mehta
b4a56bc45e
Merge pull request #4790 from rmehta/map-custom-fields
...
[minor] map custom fields from delivery note to packing slip
2016-02-11 12:18:04 +05:30
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
abfadce7d9
Merge branch 'develop'
2016-02-10 16:11:58 +05:30
Nabin Hait
1ec626f39b
bumped to version 6.21.3
2016-02-10 16:41:58 +06:00
Nabin Hait
9bc0d18996
Merge pull request #4785 from nabinhait/fix55
...
[fix] Test case fixed
2016-02-10 16:08:42 +05:30
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
dc83bb8d18
Merge branch 'develop'
2016-02-10 14:51:18 +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
bb514467f6
Merge branch 'develop'
2016-02-10 13:19:17 +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
75de2238d1
Merge branch 'develop'
2016-02-09 12:45:25 +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
Rushabh Mehta
0c70a4ceb3
Merge pull request #4775 from nabinhait/advance32
...
[fix] validate advance only if invoice total is positive
2016-02-09 10:36:29 +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
Rushabh Mehta
b38fac8bf1
Merge pull request #4770 from agusputra/patch-13
...
Update managing-dynamic-link-fields.md
2016-02-09 07:45:20 +05:30
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
3cdf9e4105
Merge pull request #4764 from rmehta/remove-default-warehouse
...
[enhancement] default warehouse not mandatory in time, re-order level and re-order qty must always be set per warehosue
2016-02-08 18:51:01 +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
Rushabh Mehta
903f675b32
Merge pull request #4761 from Tropicalrambler/patch-4
...
Duplicate last line delete
2016-02-08 09:12:47 +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
Rushabh Mehta
dd556e7a89
Merge pull request #4749 from agusputra/patch-9
...
Update blogger.md
2016-02-06 09:39:36 +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
Nabin Hait
acd9040346
Merge pull request #4746 from agusputra/patch-8
...
Update overwriting-data-from-data-import-tool.md
2016-02-05 14:38:22 +05:30
Agus Syahputra
e24cfdc556
Update overwriting-data-from-data-import-tool.md
2016-02-05 08:27:20 +07:00
Chris Ian Fiel
53a46f68a2
Merge pull request #1 from ccfiel/ccfiel-patch-1
...
Update bank_reconciliation.py
2016-02-04 22:12:41 +08: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
Nabin Hait
03f7aa9dab
Merge pull request #4741 from ShashaQin/patch-20
...
Report Improvement - Item Wise Sales/Purchase History report
2016-02-04 14:38:29 +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
2d4cc7e71f
Merge branch 'develop'
2016-02-03 15:23:56 +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
Nabin Hait
31619f0a83
[docs]
2016-02-03 15:13:55 +05:30
Nabin Hait
34037e0d88
[translations]
2016-02-03 13:11:06 +05:30
Nabin Hait
647102fc94
Merge pull request #4729 from vjFaLk/doc-update
...
Updated documentation for new features
2016-02-03 13:01:02 +05:30
Nabin Hait
a533b33fc6
Merge pull request #4730 from nabinhait/ShashaQin-patch-8
...
Financial Statements: Accumulated periodic balance based on filters
2016-02-03 12:55:36 +05:30
ShashaQin
995a71c854
Update leave_application.py
...
fix half day leave issue
2016-02-03 13:10:15 +08:00
Nabin Hait
bd7f48cfd4
[report] Financial Statements: Accumulated periodic balance based on filters
2016-02-02 19:05:43 +05:30
Nabin Hait
82cef59fb3
[fix] Purchase Return warehouse validation
2016-02-02 19:05:43 +05:30
ShashaQin
cc6ce5beac
Update financial_statements.py
2016-02-02 19:05:42 +05:30
ShashaQin
15d7224335
Update balance_sheet.py
2016-02-02 19:05:42 +05:30
ShashaQin
1f51e71827
Update profit_and_loss_statement.py
2016-02-02 19:05:42 +05:30
ShashaQin
539a826b37
Update financial_statements.js
...
Adding Accumulated Values check box on Profit and Loss, Balance Sheet
2016-02-02 19:05:42 +05:30
Valmik Jangla
0ec9b90113
Updated documentation
2016-02-02 18:29:09 +05:30
Nabin Hait
49b275ad1d
Merge pull request #4704 from chaoyee/develop
...
Update material_request.py
2016-02-02 16:11:35 +05:30
Nabin Hait
7957f0ecea
Merge pull request #4726 from nabinhait/develop
...
Multiple fixes
2016-02-02 16:08:40 +05:30
Nabin Hait
3c55d89f7f
[minor] Reference doctype in Item-wise price List Rate report
2016-02-01 15:55:09 +05:30
Nabin Hait
d5fda57297
[fix] Ignore permissions and made Customer warehouse field hidden in selling cycle
2016-02-01 15:55:09 +05:30
Nabin Hait
a85a1ff145
[fix] Validate rate with reference doc
2016-02-01 15:55:09 +05:30
Nabin Hait
afb8ec9cb6
[fix] Validate company abbr
2016-02-01 15:55:09 +05:30
Nabin Hait
8b92de26f0
Merge pull request #4718 from vjFaLk/holiday-fix
...
Fixed issue where no Holidays would cause the report to break
2016-02-01 15:49:15 +05:30
Nabin Hait
fcd4f2b86b
Merge pull request #4706 from vrms/vrms-patch-1
...
Update implementation-strategy.md
2016-02-01 15:47:57 +05:30
Nabin Hait
1277a61dad
Merge pull request #4720 from agusputra/patch-7
...
Update delete-a-company-and-all-related-transactions.md
2016-02-01 15:47:07 +05:30
Nabin Hait
767d5e48e7
Merge pull request #4723 from ShashaQin/patch-12
...
Stock Reconciliation Improvements
2016-02-01 15:38:48 +05:30
ShashaQin
ed11e93b25
Update stock_reconciliation.py
...
exclude 'disabled' item when get items
2016-02-01 16:54:19 +08:00
ShashaQin
1d702bf112
Update stock_reconciliation_item.json
...
Update valuation rate description. This description will be shown on downloaded template in order to input valuation rate correct.
2016-02-01 16:51:01 +08:00
Anand Doshi
43cdf792f9
Merge pull request #4715 from agusputra/patch-6
...
Update stock-reconciliation-for-non-serialized-item.md
2016-02-01 14:17:24 +05:30
Anand Doshi
687888133b
Merge pull request #4716 from agusputra/patch-5
...
Update authorization-rule.md
2016-02-01 14:17:04 +05:30
Agus Syahputra
e0825aaea9
Update delete-a-company-and-all-related-transactions.md
2016-02-01 08:20:36 +07:00
Valmik Jangla
0a76b8b29a
Fixed issue where no Holidays would cause the report to break
2016-01-30 10:59:40 +05:30
Agus Syahputra
0277dbc6b6
Update stock-reconciliation-for-non-serialized-item.md
2016-01-30 07:28:28 +07:00
Agus Syahputra
93a69e9485
Update authorization-rule.md
2016-01-29 23:41:46 +07:00
Anand Doshi
6e33d91443
[minor] fixes to attendance tool and employee holiday attendance
2016-01-29 16:57:54 +05:30
Valmik Jangla
07364f5ece
Feature - Employee Attendance Tool
2016-01-29 16:57:54 +05:30
Valmik Jangla
1890c794d7
Added Employee Report Attendance Report
...
Made Holiday details mandatory
2016-01-29 16:57:54 +05:30
Chao-Yee Hsu 許朝益
71a9be8add
Update material_request.py
...
Add "order by mr_item.item_code ASC" to 'get_material_requests_based_on_supplier(supplier)' in order to get material request item sorted by ascending order.
2016-01-29 18:45:22 +08:00
Anand Doshi
fd131a4210
Merge pull request #4699 from neilLasrado/tl-fix
...
Fixes in Time Log list view
2016-01-29 15:51:24 +05:30
shreyas
1a943151d7
[Refactor/Cleanup] Cleaned debug print statement
...
Refactored code to use format() instead of string formatting using %s
2016-01-29 15:41:45 +05:30
shreyas
c761f1b0a1
[Minor] Cleanup
2016-01-29 15:41:44 +05:30
shreyas
e970ddcee9
[Fix]
...
1. Sales Person wise transaction report
2. Sales Person wise target variance report
3. Sales order trend report generation for selection in group by feild
2016-01-29 15:41:44 +05:30
shreyas
51db2ba22a
[Partial]Fixed Sales person target variance report
2016-01-29 15:41:44 +05:30
shreyas
cbc18ffdbf
[Partial] Fixed the issue for Territory Item Group Variance report
2016-01-29 15:41:44 +05:30
Neil Trini Lasrado
5b7d0a960e
Fixed indicators & List view in Time Log, Time Log Batch
2016-01-29 15:20:22 +05:30
Neil Trini Lasrado
172efb1e87
Fixed error messages while making Time Log Batch from Time Log List view
2016-01-29 14:27:03 +05:30
Anand Doshi
95760a7db6
Merge pull request #4680 from shyjuk/patch-1
...
Update index.md
2016-01-29 12:19:14 +05:30
Anand Doshi
9c24bec654
Merge branch 'nabinhait-mc_fix_5' into develop
2016-01-29 12:16:35 +05:30
Anand Doshi
7c0a58ac3f
[fix] show formatted currency value in advance paid validation
2016-01-29 12:16:24 +05:30
Anand Doshi
77e4f6b774
[fix] strip item_code before autoname
2016-01-29 11:29:36 +05:30
Nabin Hait
5bedd649df
Merge pull request #4691 from anandpdoshi/cleanup/remove-is-service-item
...
[cleanup] Removed 'Is Service Item' checkbox and filters
2016-01-29 11:10:54 +05:30
Anand Doshi
7207d21962
Merge pull request #4694 from umairsy/21-jan
...
Updated articles
2016-01-29 11:09:35 +05:30
Chao-Yee Hsu 許朝益
c118fc9343
Update material_request.py
...
Add "order by mr_item.item_code ASC" to 'get_material_requests_based_on_supplier(supplier)' in order to get material request item sorted by ascending order.
2016-01-29 10:38:33 +08:00
Rushabh Mehta
bad13369d4
[minor] added abbreviate function in company
2016-01-27 18:58:21 +05:30
Umair Sayyed
bf225c11b4
fixed articles
2016-01-27 18:19:31 +05:30
Umair Sayyed
694edbc89a
updated articles
2016-01-27 18:19:31 +05:30
Umair Sayyed
6406f8bda0
discount article
2016-01-27 18:19:30 +05:30
Umair Sayyed
2901e14c59
articles
2016-01-27 18:19:30 +05:30
Umair Sayyed
5204eeedf7
articles
2016-01-27 18:19:30 +05:30
Nabin Hait
ee8f88d641
[patch] Set party account currency in existing orders
2016-01-27 16:01:31 +05:30
Nabin Hait
b2206d1155
[fix] Multi currency advance payment against Order
2016-01-27 15:43:24 +05:30
Anand Doshi
c54e25b5c7
Merge branch 'develop'
2016-01-27 14:20:19 +05:30
Anand Doshi
6e36a48521
bumped to version 6.19.0
2016-01-27 14:50:19 +06:00
Anand Doshi
eca2e42ecb
[fix] patch title field of Pricing Rule
2016-01-27 12:36:36 +05:30
Anand Doshi
d7f7d5c9db
[translations]
2016-01-27 12:36:36 +05:30
Anand Doshi
37b0f7ca47
[language] Added Estonian, Telugu and Urdu. Fixes frappe/translator#64 and frappe/translator#66
2016-01-27 12:36:35 +05:30
Anand Doshi
f4d5a66162
[change log]
2016-01-27 12:36:35 +05:30
Anand Doshi
a84186c209
Merge pull request #4692 from agusputra/patch-3
...
Update terms-and-conditions.md
2016-01-27 12:26:34 +05:30
Agus Syahputra
eb4c299bdb
Update terms-and-conditions.md
2016-01-27 09:34:00 +07:00
Anand Doshi
5b1b2fb858
Merge branch 'shreyasp-disable_cust_supp' into develop
2016-01-26 16:41:11 +05:30
shreyas
eba9ca4d66
[Minor]Change to maintain args ordering convention
2016-01-26 16:29:26 +05:30
Anand Doshi
01de945388
[cleanup] Removed 'Is Service Item' checkbox and filters
...
'Is Service Item' checkbox only worked for filtering Items in Maintenance Schedule and Maintenance Visit, and validating that Items in a Maintenance type Order were of type 'Service'. However, it doesn't fit an actual use case where any Sales Item could be given for Maintenance, making the checkbox an unnecessary addition.
2016-01-26 16:22:51 +05:30
shreyas
79872bf62c
[Refactor]Changed variable name to avoid conflict between args and local variable
2016-01-26 13:57:06 +05:30
shreyas
c8ac3b042b
[Minor]Refactored code for better readability
2016-01-26 13:23:38 +05:30
shreyas
f76853a8d9
[Minor]Changed CustomerDisabled and CustomerFrozen to PartyDisabled and PartyFrozen
2016-01-25 21:25:11 +05:30
shreyas
323dc96c99
[Travis] Fixed reference failure in party.py
2016-01-25 18:19:14 +05:30
shreyas
2563f404d2
[Minor Change] Updated queries.py
2016-01-25 18:19:14 +05:30
shreyas
29b565fdf5
Added Disabled field to Supplier and Customer doctype
...
Frozen field is moved to More Information section for Customer and Supplier. Any Supplier/Customer which is disabled will not be shown while creating PO/SO
2016-01-25 18:19:13 +05:30
Anand Doshi
2ea5c6913d
Merge pull request #4685 from shreyasp/supplier-credit-fix
...
Added the credit_days_based_on field to Supplier and Supplier Type doctype
2016-01-25 17:58:21 +05:30
Anand Doshi
5dcb40bc96
Merge pull request #4687 from anandpdoshi/fix/recurring-docs-no-copy
...
[fix] obey no_copy while creating recurring documents
2016-01-25 17:27:04 +05:30
Anand Doshi
c07489a096
[fix] Journal Entry: init debit/credit in account currency
2016-01-25 17:23:36 +05:30
Anand Doshi
39e2c2bb09
[fix] obey no_copy while creating recurring documents
2016-01-25 17:03:50 +05:30
Rushabh Mehta
e1a1c8ac31
[minor] clean up message if no Customer from Quotation > Sales Order, fixes #3854
2016-01-25 13:08:32 +05:30
shreyas
28a6578ba2
Added the credit_days_based_on field to Supplier and Supplier Type doctype
2016-01-25 12:44:14 +05:30
Shyju Kanaprath
932cf08aee
Update index.md
2016-01-24 10:00:29 +05:30
Anand Doshi
47c2aa179b
[fix] test case for get_item_details
2016-01-21 23:18:08 +05:30
Anand Doshi
f7e9a9d786
Merge branch 'develop'
2016-01-21 22:32:08 +05:30
Anand Doshi
04230cb656
bumped to version 6.18.4
2016-01-21 23:02:08 +06:00
Anand Doshi
54abf025b7
[hotfix] get_price_list_rate
2016-01-21 22:28:55 +05:30
Anand Doshi
39ac535bdb
Merge branch 'develop'
2016-01-21 21:06:34 +05:30
Anand Doshi
dd74b5d44f
bumped to version 6.18.3
2016-01-21 21:36:34 +06:00
Anand Doshi
afe85bdd04
[hotfix] use me.frm.doc in get_item_details
2016-01-21 21:04:16 +05:30
Nabin Hait
e4b44a86a6
Merge branch 'develop'
2016-01-21 18:53:36 +05:30
Nabin Hait
a1ccab81a0
bumped to version 6.18.2
2016-01-21 19:23:36 +06:00
Nabin Hait
cf3b318f7d
Changes modified date
2016-01-21 18:52:25 +05:30
Nabin Hait
568054ab96
[fix] Make Delivery Note from Sales Invoice
2016-01-21 18:50:28 +05:30
Nabin Hait
0d207706c1
[fix] Get item details
2016-01-21 18:47:09 +05:30
Nabin Hait
3d5a6af1ae
Delete Screenshot from 2014-11-18 18:13:22.png
2016-01-21 17:42:41 +05:30
Nabin Hait
79a994e895
Delete Screenshot from 2014-11-18 18:09:42.png
2016-01-21 17:42:35 +05:30
Nabin Hait
20cdaadcd4
Delete Screenshot from 2014-11-18 18:00:57.png
2016-01-21 17:42:28 +05:30
Nabin Hait
a2eccf08a1
Delete Screenshot from 2014-11-18 17:56:19.png
2016-01-21 17:42:22 +05:30
Nabin Hait
6f62ecab73
Delete Screenshot from 2014-11-18 18:09:42.png
2016-01-21 17:41:34 +05:30
Nabin Hait
463f71c6eb
Delete Screenshot from 2014-11-18 18:13:22.png
2016-01-21 17:41:09 +05:30
Nabin Hait
cea6b09d44
Delete Screenshot from 2014-11-18 18:00:57.png
2016-01-21 17:40:41 +05:30
Nabin Hait
b4be679639
Delete Screenshot from 2014-11-18 17:56:19.png
2016-01-21 17:40:01 +05:30
Nabin Hait
c51ef85dd8
Merge branch 'develop'
2016-01-21 17:10:15 +05:30
Nabin Hait
3fc4e7c53f
bumped to version 6.18.1
2016-01-21 17:40:14 +06:00
Nabin Hait
1d21274d65
Update manufacturer.json
2016-01-21 17:01:23 +05:30
Nabin Hait
ccddc48ced
Merge branch 'develop'
2016-01-21 16:52:22 +05:30
Nabin Hait
c9b7824573
bumped to version 6.18.0
2016-01-21 17:22:22 +06:00
Nabin Hait
e50c5321df
[docs]
2016-01-21 16:47:51 +05:30
Nabin Hait
c690b24a7d
[change-log]
2016-01-21 16:32:09 +05:30
Nabin Hait
9a24abe5e9
[translations]
2016-01-21 16:32:08 +05:30
Nabin Hait
c5d41eb22a
Merge pull request #4664 from saurabh6790/variant_fixes
...
[fixes] compare variants in lower case
2016-01-21 16:06:42 +05:30
Saurabh
47fd5e0ff0
[fixes] compare variants in lower case
2016-01-21 15:46:55 +05:30
Nabin Hait
bb7e499cbd
Merge pull request #4662 from ccfiel/develop
...
undo reconciled journal entry record
2016-01-21 15:32:33 +05:30
Chris Ian Fiel
cb66d3a8c9
undo reconciled journal entry record
...
https://github.com/frappe/erpnext/issues/4661
2016-01-21 16:26:22 +08:00
Chris Ian Fiel
43a62ad0f0
undo reconciled journal entry record
2016-01-21 06:50:13 +08:00
Nabin Hait
e6b52bbb43
Update create_manufacturer_records.py
2016-01-21 00:30:39 +05:30
Nabin Hait
6811e73b53
Merge pull request #4658 from umairsy/20-jan
...
Updated articles in Buying
2016-01-20 22:28:50 +05:30
Umair Sayyed
5cd9193a2b
Updated articles in Buying
2016-01-20 18:47:33 +05:30
Nabin Hait
a613ea8abf
[patch] Create manufacturer records
2016-01-20 18:32:37 +05:30
Dominik
d737390b80
Changed Manufacturer from Data to its own DocType, copied most of the logic from Customer but used short_name for namig series.
2016-01-20 18:32:37 +05:30
Nabin Hait
20bf7375f4
Merge pull request #4655 from nabinhait/rounding_issue
...
Rounding based on smallest circulating currency fraction value
2016-01-20 18:12:36 +05:30
Nabin Hait
fb0b24af78
Rounding based on smallest circulating currency fraction value
2016-01-20 17:07:35 +05:30
Nabin Hait
002fa6c1d9
Merge pull request #4650 from RicardoJohann/patch-2
...
Accounts - Bank reconciliation - Workflow and labeling improvements
2016-01-20 17:03:06 +05:30
Nabin Hait
dbbc3eb8a6
Merge pull request #4656 from nabinhait/gle_rounding
...
[fix] Round off gle due to currency conversion
2016-01-20 16:48:42 +05:30
Nabin Hait
c2c9124af8
Merge pull request #4643 from nabinhait/status_button
...
[fix] Close button visible in all sumitted PR and DN
2016-01-20 16:47:17 +05:30
Nabin Hait
5b19aeecb4
Merge pull request #4642 from nabinhait/return_fix1
...
[fix] Accept return items in any warehouse
2016-01-20 16:46:33 +05:30
Nabin Hait
dd2f0330a6
Merge pull request #4641 from nabinhait/report-currency
...
[fix] Currency in Gross Profit report
2016-01-20 16:45:57 +05:30
Nabin Hait
61673aafd4
Merge pull request #4640 from nabinhait/fix50
...
Fixes
2016-01-20 16:35:46 +05:30
Nabin Hait
d4507ac6a0
[fix] Round off gle due to currency conversion
2016-01-20 16:14:27 +05:30
Nabin Hait
7c8dc38f15
Merge pull request #4654 from agusputra/patch-1
...
Update adding-users.md
2016-01-20 14:43:14 +05:30
Agus Syahputra
aa8745378a
Update adding-users.md
2016-01-20 15:45:16 +07:00
Nabin Hait
2b986d3b02
Merge pull request #4651 from RicardoJohann/patch-4
...
Update queries.py - Added item_group
2016-01-20 13:11:44 +05:30
RicardoJohann
3fb5340188
Update queries.py
2016-01-20 14:32:59 +08:00
RicardoJohann
05aa3b391e
Update bank_reconciliation.py
2016-01-20 13:38:20 +08:00
RicardoJohann
e095eeb084
Update bank_reconciliation_statement.py
2016-01-20 13:36:36 +08:00
Rushabh Mehta
7633aca7c1
Merge pull request #4645 from umairsy/16-jan
...
updated stock articles
2016-01-20 10:27:24 +05:30
RicardoJohann
6f9afffd8a
Update bank_reconciliation_statement.html
2016-01-20 12:15:20 +08:00
RicardoJohann
7425af6968
Update bank_reconciliation_detail.json
...
Accounts - Bank reconciliation - Workflow and labeling improvements
2016-01-20 12:02:20 +08:00
Umair Sayyed
de15a26cab
updated stock articles
2016-01-19 18:39:27 +05:30
Nabin Hait
5ac22ce6a1
[fix] Close button visible in all sumitted PR and DN
2016-01-19 18:30:02 +05:30
Nabin Hait
20105d8a0d
[fix] Accept return items in any warehouse
2016-01-19 18:05:28 +05:30
Nabin Hait
6d8688f8b4
[fix] Currency in Gross Profit report
2016-01-19 17:27:06 +05:30
Nabin Hait
9824e22ce1
[fix] Price list rate applied via set_missing_values
2016-01-19 16:48:32 +05:30
Nabin Hait
34d2822483
Fixes in get_item_details and test cases
2016-01-19 16:48:32 +05:30
Nabin Hait
787e59c37e
[fix] BOM Autonaming
2016-01-19 16:48:31 +05:30
Nabin Hait
77532cc8db
[fix] Total Amount in Journal Entry
2016-01-19 16:48:31 +05:30
Rushabh Mehta
c978b9c36a
[minor] [fix] in Item > Add / Edit Prices, go to list view instead of report, fixes #4639
2016-01-19 16:34:49 +05:30
Nabin Hait
31608a82f8
Merge pull request #4632 from nabinhait/pos_fix
...
Calculate change in POS based on smallest currency fraction value
2016-01-19 11:46:13 +05:30
Nabin Hait
4f0bfcd287
Merge pull request #4621 from neilLasrado/develop
...
Fixed time log overlap validation. Fixed test case in time log
2016-01-19 11:13:00 +05:30
Rushabh Mehta
54673f8d1d
Merge pull request #4635 from MaxMorais/patch-2
...
Add localization in the on_submit event
2016-01-19 10:45:51 +05:30
Maxwell
4da17348fd
Add localization in the on_submit event
2016-01-18 23:29:21 -02:00
Rushabh Mehta
aee26219ed
[fix] get warehouse details on selection
2016-01-18 18:57:49 +05:30
Nabin Hait
8b63b1221f
Calculate change in POS based on smallest currency fraction value
2016-01-18 17:56:55 +05:30
Rushabh Mehta
6bf3c7453b
[fix] payment request
2016-01-18 14:29:26 +05:30
Rushabh Mehta
681c9dde84
[ui] payment request cleanup
2016-01-18 14:21:45 +05:30
Rushabh Mehta
34fb5cf0e2
[fix] make setup_wizard.create_bank_account multi-company safe
2016-01-18 12:35:24 +05:30
Rushabh Mehta
0e2f9ee44c
[docs] fix
2016-01-18 12:35:24 +05:30
Anand Doshi
0bcd9efa88
[fix] value returned by frappe._ will always be unicode
2016-01-18 12:30:31 +05:30
Rushabh Mehta
b46069d44b
[cleanup] contextual buttons in sales & purchase and fix rate setting in opp -> quotation and material request -> purchase order
2016-01-15 16:59:26 +05:30
Neil Trini Lasrado
329e7783bc
Fixed time log overlap validation. Fixed test case in time log
2016-01-15 16:34:06 +05:30
Rushabh Mehta
2e3d2b8426
Merge pull request #4613 from nabinhait/fixes
...
[fix] Item query and exchange rate
2016-01-15 11:19:44 +05:30
Rushabh Mehta
66eaf7e1c3
Merge pull request #4607 from saurabh6790/group_custom_buttons
...
[enhance] merge customize buttons under groups
2016-01-15 11:15:23 +05:30
Rushabh Mehta
23ee568564
Merge pull request #4620 from nabinhait/fixes12
...
Minor fixes
2016-01-15 11:15:10 +05:30
Nabin Hait
ad42d2f67a
Minor fixes
2016-01-15 11:09:41 +05:30
Rushabh Mehta
1bf440b03a
[fix] module ordering
2016-01-14 18:19:21 +05:30
Rushabh Mehta
9bf2df9303
[minor] [layout] cleaned up Time Log layout
2016-01-14 18:19:21 +05:30
Rushabh Mehta
986f6a71ec
[minor] fix new customer link in POS
2016-01-14 18:15:56 +05:30
Rushabh Mehta
26cb8baef0
Merge pull request #4618 from neilLasrado/develop
...
Added additional cost to time log
2016-01-14 17:11:53 +05:30
Neil Trini Lasrado
975dcc2bf3
Added additional cost to time log. Fixed issues in Time log billing amount calculation and billing amount calculation while making time log batch
2016-01-14 16:09:35 +05:30
Rushabh Mehta
1bc6a73878
Merge pull request #4614 from saurabh6790/cart_fixes
...
[fixes] redirect uri fixes
2016-01-14 11:47:29 +05:30
Saurabh
f7caad8ecb
[fixes] redirect uri fixes
2016-01-14 11:30:47 +05:30
Rushabh Mehta
27e8ae0ff9
Merge pull request #4612 from rmehta/sales-partner-address-fix
...
[fix] set sales partner from previous document, fixes #4611
2016-01-14 10:48:03 +05:30
Nabin Hait
a88912a2f5
[fix] Item query and exchange rate
2016-01-14 10:43:17 +05:30
Rushabh Mehta
10d634b016
[fix] set sales partner from previous document, fixes #4611
2016-01-14 10:34:18 +05:30
Saurabh
e23e99f4bd
[enhance] merge customize buttons under groups
2016-01-13 09:18:31 +05:30
Rushabh Mehta
075b9626cf
[docs] update
2016-01-12 17:08:33 +05:30
Rushabh Mehta
025a407e13
Merge pull request #4595 from saurabh6790/payment_request_vai_cart
...
Payment request via cart
2016-01-12 14:23:42 +05:30
Saurabh
cbebb4b8ba
[fixes] code cleanup
2016-01-12 14:13:35 +05:30
Saurabh
3ade883fd9
[fixes] place cart button via js
2016-01-12 14:09:52 +05:30
Saurabh
403ad48364
[fixes] display cart count only if item exist in cart
2016-01-12 14:09:52 +05:30
Saurabh
69f9975748
[fixes] show link to visit cart after adding item, hide cart button on cart view
2016-01-12 14:09:52 +05:30
Saurabh
df2783dbb0
[enhance] i. facility to send PR email; ii. update cart, item view and order view;
2016-01-12 14:09:52 +05:30
Saurabh
a940b6d149
[fixes] handle cancled payment requests
2016-01-12 14:09:51 +05:30
Saurabh
0a0c78729f
[enhace] display payment status on order
2016-01-12 14:09:51 +05:30
Saurabh
276d3e60bd
[enhance] pay via cart
2016-01-12 14:09:51 +05:30
Saurabh
c22e525a14
[Fixes] payment request url fixes
2016-01-12 14:09:51 +05:30
Saurabh
2ffea6ba94
[document & fixes] document and test case rewrite
2016-01-12 14:09:51 +05:30
Saurabh
6fc408e974
[fixes] conmify account details and validate gateway currency
2016-01-12 14:09:51 +05:30
Saurabh
ed0723c6fe
[fixes] Create payment gateway account
2016-01-12 14:09:50 +05:30
Saurabh
766f6a43d5
[fixes] test case for Payment request
2016-01-12 14:09:50 +05:30
Saurabh
1664668b0e
[fixes] multi-currency fixes
2016-01-12 14:09:50 +05:30
Saurabh
3ba22676bf
[fixes] Create and manage payment request
2016-01-12 14:09:50 +05:30
Saurabh
db7a56b453
[fixes] fieldtype, message fixes on Payment Request
2016-01-12 14:09:50 +05:30
Saurabh
cb98d9ec5f
[fixes] print format listing
2016-01-12 14:09:50 +05:30
Saurabh
b109ee96de
[fixes] Base structure for Payment Request
2016-01-12 14:09:49 +05:30
Saurabh
eba7aa496c
[enhace] basic structure for payment gateway
2016-01-12 14:09:49 +05:30
Rushabh Mehta
108bc78693
Merge branch 'develop'
2016-01-12 12:25:18 +05:30
Rushabh Mehta
c85112b093
bumped to version 6.17.0
2016-01-12 12:55:17 +06:00
Rushabh Mehta
4a3140102c
Merge pull request #4606 from nabinhait/report_currency
...
[fix] Currency symbol based on account/company currency, not based on Global Defaults
2016-01-12 12:12:43 +05:30
Rushabh Mehta
6ef1fb6b39
Merge pull request #4605 from umairsy/docs
...
[docs] added articles in manufacturing, stock, website
2016-01-12 12:12:08 +05:30
Rushabh Mehta
de6b30c7ac
Merge pull request #4604 from anandpdoshi/fix/duplicate-region-setup-wizard
...
[fix] removed duplicate 'region' section as it is already in Frappe Framework
2016-01-12 12:11:41 +05:30
Rushabh Mehta
1c32d05601
[translations] update
2016-01-12 12:02:26 +05:30
Rushabh Mehta
659bc1aca4
[minor] fixes reported on support
2016-01-12 11:57:25 +05:30
Nabin Hait
226a101119
[fix] Currency symbol based on account/company currency, not based on Global Defaults
2016-01-12 11:56:40 +05:30
Rushabh Mehta
5dfd1d48fa
[minor] disabled in terms and conditions, fixes #4602
2016-01-12 10:29:29 +05:30
Umair Sayyed
c9af48af35
[docs] added articles in manufacturing, stock, website
2016-01-11 18:35:28 +05:30
Anand Doshi
d8ac0f3df7
[fix] removed duplicate 'region' section as it is already in Frappe Framework
2016-01-11 18:22:02 +05:30
Nabin Hait
af2bf7541f
Merge pull request #4603 from ccfiel/develop
...
note added equity
2016-01-11 13:13:15 +05:30
Chris Ian Fiel
d070d56f72
note added equity
2016-01-11 15:34:24 +08:00
Anand Doshi
cc5632a99c
[minor] removed image_view from in list view
2016-01-11 13:03:14 +05:30
Rushabh Mehta
7be0b47778
[minor] [fix] validate fiscal year in trial balance
2016-01-11 11:59:08 +05:30
Rushabh Mehta
5facb60bbe
[fix] cleanup old style js in email digest
2016-01-11 10:37:20 +05:30
Rushabh Mehta
56b5387dbd
[minor] README
2016-01-11 10:37:20 +05:30
Rushabh Mehta
9743d688d0
Merge pull request #4597 from makeen/fixEditButtonAddressContact
...
fix button "Edit" encode url in address and contact template
2016-01-11 10:33:18 +05:30
Raul Viveros
1d5f8d4436
fix button "Edit" encode url in address and contact template
2016-01-09 22:18:14 +01:00
vrms
063a88f057
Update implementation-strategy.md
2016-01-09 19:45:39 +08:00
Anand Doshi
6cb8662bec
Merge branch 'develop'
2016-01-07 18:27:21 +05:30
Anand Doshi
74dfabbe21
bumped to version 6.16.4
2016-01-07 18:57:21 +06:00
Anand Doshi
4096603656
[fix] add index on so_detail in Delivery Note Item
2016-01-07 17:10:09 +05:30
Anand Doshi
574415b59b
Merge branch 'develop'
2016-01-06 18:56:03 +05:30
Anand Doshi
0eee6bbf7e
bumped to version 6.16.3
2016-01-06 19:26:03 +06:00
Anand Doshi
ed72a28e41
[minor] patch for billed in DN and PR
2016-01-06 18:53:12 +05:30
Anand Doshi
4e0908d055
[change-log]
2016-01-06 18:23:25 +05:30
Anand Doshi
3c2ffde95b
Merge pull request #4573 from anandpdoshi/fix/stock-entry-calculate-amount-in-js
...
[fix] Stock Entry: calculate amount in javascript
2016-01-06 18:04:53 +05:30
Anand Doshi
2c021dcdcd
[fix] Stock Entry: calculate amount in javascript
2016-01-06 17:47:39 +05:30
Rushabh Mehta
1ee5ae1e25
[fix] [minor] don't show cancelled sales orders
2016-01-06 16:47:18 +05:30
Anand Doshi
0aadb9e213
Merge pull request #4584 from nabinhait/last_pur_rate
...
Get last purchase rate button in Purchase Order
2016-01-06 16:33:07 +05:30
Anand Doshi
a0693983cc
Merge branch 'nabinhait-billing_status' into develop
2016-01-06 16:32:19 +05:30
Anand Doshi
6b71ef5843
[refactor] changed set_modified, change_modified to update_modified like in the framework
2016-01-06 16:32:06 +05:30
Nabin Hait
602683fdc0
Get last purchase rate button in Purchase Order
2016-01-06 16:03:58 +05:30
Nabin Hait
1eea26fc5c
[patch] Update billing status in Delivery Note and Purchase Receipt
2016-01-06 15:42:44 +05:30
Nabin Hait
c040075bd4
[patch] Update billing status in Delivery Note and Purchase Receipt
2016-01-06 15:42:44 +05:30
Nabin Hait
a2afb16f6b
[testcase] Billing status in Purchase Receipt
2016-01-06 15:42:44 +05:30
Nabin Hait
bdab0eea0f
Billing status in Purchase Receipt
2016-01-06 15:42:43 +05:30
Nabin Hait
ba5d6b5004
[test-case] for billing status in DN
2016-01-06 15:42:27 +05:30
Nabin Hait
5b13b99441
Update billing status in Delivery Note if directly invoiced against SO
2016-01-06 15:42:27 +05:30
Anand Doshi
a3e87c7af1
Merge branch 'umairsy-develop' into develop
2016-01-06 15:06:27 +05:30
Umair Sayyed
31e2a709d5
updated articles in Accounts
2016-01-06 15:06:11 +05:30
Umair Sayyed
e083cde3d7
updated articles
2016-01-06 15:05:31 +05:30
Anand Doshi
09fc4a456e
Merge pull request #4582 from nabinhait/develop
...
Chart of accounts added for Singapore and some other fixes
2016-01-06 15:01:49 +05:30
Anand Doshi
4774c41958
[fix] validate_multi_currency
2016-01-06 14:16:10 +05:30
Anand Doshi
03e7e581d8
[minor] removed Communication table
2016-01-06 13:23:45 +05:30
Anand Doshi
e88ffe032e
[fix] show fields like sales_order, against_sales_order, schedule_date in item grid if In List View is checked
2016-01-06 12:54:59 +05:30
Nabin Hait
ea8bc8ecb0
Chart of accounts added for Singapore and some other fixes
2016-01-06 12:32:48 +05:30
Anand Doshi
a40c6282a1
[fix] don't allow import for child tables
2016-01-06 12:20:25 +05:30
Anand Doshi
570d1783f9
Merge branch 'develop'
2016-01-05 19:09:36 +05:30
Anand Doshi
2076203fc1
bumped to version 6.16.2
2016-01-05 19:39:35 +06:00
Anand Doshi
d7b7f74ac9
[docs]
2016-01-05 19:08:09 +05:30
Anand Doshi
d27308d1cd
Merge pull request #4575 from nabinhait/report_fix_1
...
[fix] minor fix in stock projected qty
2016-01-05 18:41:48 +05:30
Anand Doshi
06a82d4e1f
Merge pull request #4574 from rmehta/translations
...
Translation fixes
2016-01-05 18:41:18 +05:30
Anand Doshi
f9eff57531
[fix] credit limit
2016-01-05 16:00:33 +05:30
Rushabh Mehta
e64fbd6d3c
[minor] fixes for chart_of_accounts_builder app
2016-01-04 18:11:21 +05:30
Anand Doshi
88e709e1f0
Merge branch 'develop'
2016-01-04 17:58:13 +05:30
Anand Doshi
988a1ab419
bumped to version 6.16.1
2016-01-04 18:28:13 +06:00
Anand Doshi
13bf123b24
[hotfix] item on web
2016-01-04 17:51:35 +05:30
Anand Doshi
22b956d33c
Merge branch 'develop'
2016-01-04 16:55:20 +05:30
Anand Doshi
10be112e85
bumped to version 6.16.0
2016-01-04 17:25:20 +06:00
Anand Doshi
bb256e41d7
[translations]
2016-01-04 16:51:24 +05:30
Nabin Hait
d35d74346d
[fix] minor fix in stock projected qty
2016-01-04 16:16:49 +05:30
Rushabh Mehta
969d48a554
[translations] fixes #4534-38
2016-01-04 16:09:40 +05:30
Anand Doshi
d8b15ebaf7
Merge pull request #4572 from nabinhait/multi-currency-docs
...
[fix] Updated multi currency docs
2016-01-04 16:06:02 +05:30
Anand Doshi
b55dd5b284
[fix] BOM validate quantity > 0
2016-01-04 16:02:04 +05:30
Rushabh Mehta
5760b79747
[translations] fixes #4533
2016-01-04 15:57:01 +05:30
Rushabh Mehta
eb961370ff
[translations] fixes #4532
2016-01-04 15:48:37 +05:30
Nabin Hait
cb08d576f6
Merge pull request #4571 from anandpdoshi/fix/payment-reconciliation-date
...
[fix] Payment Reconciliation: use the date and amount filters only for Invoice
2016-01-04 15:24:10 +05:30
Nabin Hait
9f40a252fc
[fix] Updated multi currency docs
2016-01-04 15:20:37 +05:30
Anand Doshi
aee8b5bcad
[fix] Purchase Receipt: Show row no. against the Rejected Warehouse mandatory error
2016-01-04 13:16:09 +05:30
Anand Doshi
f7980927a1
[fix] Payment Reconciliation: use the date and amount filters only for Invoice
2016-01-04 13:00:14 +05:30
Anand Doshi
c1e1026486
[fix] validate 'cannot change fiscal year dates' only if not new
2016-01-04 12:20:25 +05:30
Anand Doshi
7ae53657f9
Merge pull request #4565 from nabinhait/leave_docs
...
[docs] Leave Management
2016-01-04 12:11:00 +05:30
Anand Doshi
a6a71216a8
Merge pull request #4566 from rmehta/website-cleanup
...
[cleanup] [website]
2016-01-04 11:41:20 +05:30
Rushabh Mehta
51008f2abc
[cleanup] [website]
2016-01-01 17:24:37 +05:30
Nabin Hait
c1e5cbb55d
[docs] Leave Management
2016-01-01 17:08:57 +05:30
Nabin Hait
f41da5cfab
Merge branch 'develop'
2015-12-31 16:14:17 +05:30
Nabin Hait
2d0ef63e72
bumped to version 6.15.1
2015-12-31 16:44:17 +06:00
Nabin Hait
884d4cbc48
Merge pull request #4560 from nabinhait/item_variants
...
[fix] Disable atrribute table in variant item record
2015-12-31 15:58:41 +05:30
Nabin Hait
9602c394dd
Merge branch 'gabtzi-develop' into develop
2015-12-31 15:49:20 +05:30
Nabin Hait
51ff2658cb
[fix] Minor changes in item naming
2015-12-31 15:49:00 +05:30
Nabin Hait
dd1c3ba164
Merge branch 'develop' of https://github.com/gabtzi/erpnext into gabtzi-develop
2015-12-31 15:46:15 +05:30
Nabin Hait
6b068e1367
[fix] Disable atrribute table in variant item record
2015-12-31 15:44:12 +05:30
Nabin Hait
b9dcf7f857
Merge pull request #4554 from umairsy/develop
...
Updated Articles
2015-12-31 15:37:46 +05:30
Nabin Hait
9ebbec5d9a
Merge pull request #4558 from nabinhait/item_variants
...
[fix] Disable atrribute table in variant item record
2015-12-31 15:18:06 +05:30
Nabin Hait
bb9f59a051
Merge pull request #4556 from nabinhait/setup_bank
...
[fix] Create bank accounts from setup wizard #4546
2015-12-31 15:17:51 +05:30
Nabin Hait
f8de94b7c6
Merge pull request #4557 from nabinhait/po_fix
...
[fix] Update ordered qty in SO, if PO is made against SO
2015-12-31 15:17:41 +05:30
Nabin Hait
6626e32719
[fix] Disable atrribute table in variant item record
2015-12-31 14:54:57 +05:30
Rushabh Mehta
d55bdcf921
[fix] before_install returns False if setup wizard has been completed, fixes frappe/frappe#1488
2015-12-31 11:12:48 +05:30
Umair Sayyed
40a79de34d
updating articles under Accounts
2015-12-30 18:27:08 +05:30
Nabin Hait
82a1561120
[fix] Create bank accounts from setup wizard #4546
2015-12-30 15:32:57 +05:30
Nabin Hait
3505de037e
[fix] Update ordered qty in SO, if PO is made against SO
2015-12-30 15:03:34 +05:30
Umair Sayyed
d548ef8158
updated Articles in Customization and Accounting section
2015-12-29 16:25:26 +05:30
Umair Sayyed
3ad37363ed
update artciles in customization section
2015-12-28 17:24:51 +05:30
gabtzi
d46abb49f3
Fix for Issue #4543 : Suffix now uses attribute abbreviation if it exists or value for numeric attributes
2015-12-28 12:03:24 +02:00
Nabin Hait
c57517b201
Merge branch 'develop'
2015-12-28 15:09:44 +05:30
Nabin Hait
8efeea9c59
bumped to version 6.15.0
2015-12-28 15:39:43 +06:00
Nabin Hait
bf9e8cfbcc
[translations]
2015-12-28 14:38:22 +05:30
gabtzi
096fc88200
Fix for Issue #4543 : Improved code to check if it's a variant only once.
2015-12-28 11:07:10 +02:00
Nabin Hait
d5dedb1808
Merge pull request #4548 from nabinhait/fix1
...
[fix] Ignore permissions while creating fiscal year automatically
2015-12-28 14:23:01 +05:30
Nabin Hait
e50f80302a
Merge pull request #4549 from saurabh6790/bin_update
...
[fixes] flag to identify actual qty update
2015-12-28 14:22:46 +05:30
gabtzi
9d44ac88f2
Fix for Issue #4543 : Automatic item_code generation for variants when parent item is named after a Naming Series
2015-12-28 10:26:42 +02:00
Nabin Hait
892a782e59
docs
2015-12-28 13:27:41 +05:30
Saurabh
b166bcf50b
[fixes] flag to trigger actual qty update
2015-12-28 13:25:35 +05:30
Nabin Hait
0e2d1bd4ed
[fix] Ignore permissions while creating fiscal year automatically
2015-12-28 13:04:19 +05:30
Nabin Hait
f080003415
Merge pull request #4542 from umairsy/develop
...
updated Articles under Customization section
2015-12-28 12:43:18 +05:30
Nabin Hait
96e7c5a3bd
Merge pull request #4541 from neilLasrado/develop
...
Added education as a domain in Company
2015-12-28 12:42:16 +05:30
Umair Sayyed
4bad150cf0
updated customization related articles
2015-12-24 20:40:37 +05:30
Anand Doshi
76568f0e8e
[fix] log newsletter sending error
2015-12-24 15:13:54 +05:30
Neil Trini Lasrado
49febea6f5
Added education as a domain in Company
2015-12-24 15:10:35 +05:30
Rushabh Mehta
a59e1792b5
Merge pull request #4535 from nabinhait/defaults
...
[fix] Get defaults based on doctype or fieldname
2015-12-24 11:50:08 +05:30
Rushabh Mehta
28d6987455
Merge pull request #4537 from umairsy/develop
...
updated help articles in the setup section
2015-12-24 11:47:27 +05:30
Umair Sayyed
56e19f3a8b
updated articles in the setup section
2015-12-23 18:58:07 +05:30
Nabin Hait
b6b56453e1
[fix] Get defaults based on doctype or fieldname
2015-12-23 16:37:06 +05:30
Rushabh Mehta
d55d0c06e3
Merge branch 'develop'
2015-12-23 16:29:34 +05:30
Rushabh Mehta
8681a95010
bumped to version 6.14.1
2015-12-23 16:59:34 +06:00
Rushabh Mehta
1f63747916
[minor] [fix] add child in sales browser
2015-12-23 16:23:37 +05:30
Rushabh Mehta
332ec15dd7
Merge pull request #4525 from nabinhait/jv_fix_10
...
[fix] Validate advance entry based on party
2015-12-23 16:09:29 +05:30
Nabin Hait
6f8dafbb5e
[fix] Validate advance entry based on party
2015-12-23 13:03:31 +05:30
Rushabh Mehta
d4073d50b2
Merge pull request #4530 from umairsy/develop
...
Updated screenshots in some articles
2015-12-23 13:01:30 +05:30
Rushabh Mehta
88bcee78a7
Merge pull request #4524 from nabinhait/jv_fix_9
...
[fix] Set debit/credit in company currency
2015-12-23 12:59:02 +05:30
Rushabh Mehta
cc2796e676
Merge pull request #4520 from partzsch/develop
...
Time Log now down to seconds
2015-12-23 12:56:44 +05:30
Umair Sayyed
dbaf6b569b
Updated screenshots in some articles
2015-12-23 12:11:53 +05:30
Nabin Hait
d37cef7f60
[fix] Set debit/credit in company currency
2015-12-22 15:13:01 +05:30
Rushabh Mehta
01293bb3a3
[fix] [minor] fix available qty even if 0
2015-12-22 12:57:42 +05:30
partzsch
55ad42cfd0
Time Log now down to seconds
...
according to request of @anadpdoshi
new branch new commit new PR
2015-12-21 17:51:42 +01:00
Anand Doshi
381cec7b87
[fix] added Shopping Cart and Report Builder in Learn module
2015-12-21 18:56:20 +05:30
Anand Doshi
4c87497b7c
Merge branch 'develop'
2015-12-21 18:34:08 +05:30
Anand Doshi
9fdf2a8bfe
bumped to version 6.14.0
2015-12-21 19:04:08 +06:00
Anand Doshi
f773f1f539
[videos] added missing videos
2015-12-21 18:32:23 +05:30
Anand Doshi
7b8a224dd0
Merge pull request #4519 from umairsy/develop
...
video help page on report builder and shopping cart
2015-12-21 18:16:26 +05:30
Umair Sayyed
e1482f1acc
video help page on report builder and shopping cart
2015-12-21 18:06:15 +05:30
Anand Doshi
c98d244af0
[change-log]
2015-12-21 17:31:09 +05:30
Anand Doshi
ee19fc0c7f
[translations] + added Gujarati - Fixes frappe/translator#63
2015-12-21 17:10:20 +05:30
Anand Doshi
ee2129ce1c
Merge pull request #4513 from nabinhait/discount_percentage
...
Additional Discount amount based on percentage
2015-12-21 16:13:17 +05:30
Anand Doshi
beed9ae4f8
Merge pull request #4510 from nabinhait/account_merge
...
[fix] Group account merging with sub-ordinate group
2015-12-21 16:03:19 +05:30
Anand Doshi
50ddf921be
[minor] UOM message
2015-12-21 10:58:33 +05:30
Nabin Hait
3769d87240
Additional Discount amount based on percentage
2015-12-18 13:12:08 +05:30
Anand Doshi
15050e326c
Merge pull request #4509 from anandpdoshi/fix/validate-total-transfer-in-material-request
...
[fix] Validate transfer qty cannot be greater than qty
2015-12-18 10:50:36 +05:30
Anand Doshi
0f809426d2
[fix] Validate transfer qty cannot be greater than qty
2015-12-17 22:35:03 +05:30
Nabin Hait
adab5d308c
[fix] Group account merging with sub-ordinate group
2015-12-17 12:53:25 +05:30
Nabin Hait
824122c42a
Merge branch 'ccfiel-develop' into develop
2015-12-17 12:20:40 +05:30
Nabin Hait
afda26e4f3
Fixed conflict
2015-12-17 12:19:58 +05:30
Chris Ian Fiel
d6d354b5c3
By: nabinhait
...
Depreciation account is an expense account, it is debited while booking depreciation. Thats why Depreciation amount is coming as negative, I think it should be positive and added to the "Net Profit and Loss".
2015-12-17 09:42:12 +08:00
Chris Ian Fiel
7d310bd182
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2015-12-17 09:18:24 +08:00
Nabin Hait
8b33a6cdc0
Cleanup in cash flow
2015-12-16 16:09:43 +05:30
Anand Doshi
1abe550e65
Merge branch 'develop'
2015-12-16 13:18:41 +05:30
Anand Doshi
5605f8f20e
bumped to version 6.13.1
2015-12-16 13:48:40 +06:00
Anand Doshi
a1580f2781
[language] Added Malayalam - Fixes frappe/translator#62
2015-12-16 13:17:24 +05:30
Anand Doshi
dfdededcf0
[fix] product search limit = 12 instead of 10, since we show it in a grid of 12
2015-12-16 12:57:02 +05:30
Rushabh Mehta
5aa744893d
Merge pull request #4504 from venetanji/master
...
Changelog file naming issue
2015-12-16 10:32:52 +05:30
Giovanni Lion
55cca49371
Changelog file naming issue
2015-12-16 12:29:15 +08:00
Nabin Hait
5e173c7106
Merge branch 'develop' of https://github.com/ccfiel/erpnext into ccfiel-develop
2015-12-15 17:39:55 +05:30
Anand Doshi
cf3da35d67
Merge branch 'develop'
2015-12-15 17:33:02 +05:30
Anand Doshi
a17ddcfe89
bumped to version 6.13.0
2015-12-15 18:03:01 +06:00
Anand Doshi
088826f6f0
[change-log]
2015-12-15 17:28:34 +05:30
Anand Doshi
f89eaa96d1
[docs] Fixed heading and added attribution to 'CWT Connector & Wire Technology GmbH' for german docs
2015-12-15 17:22:15 +05:30
Martin Ender
e526cfe7ec
Update concepts-and-terms.md
2015-12-15 17:22:15 +05:30
Martin Ender
21c189184d
Update concepts-and-terms.md
2015-12-15 17:22:15 +05:30
Martin Ender
2aaebdbe11
Update concepts-and-terms.md
2015-12-15 17:22:14 +05:30
Martin Ender
cda3174a57
Update concepts-and-terms.md
2015-12-15 17:22:14 +05:30
Martin Ender
91eeb76f7b
Update concepts-and-terms.md
2015-12-15 17:22:14 +05:30
Martin Ender
df18c29fb7
Update concepts-and-terms.md
2015-12-15 17:22:14 +05:30
Martin Ender
7aebb39003
Update implementation-strategy.md
2015-12-15 17:22:14 +05:30
Martin Ender
91bb25d0c9
Update implementation-strategy.md
2015-12-15 17:22:14 +05:30
Martin Ender
b89d7eb558
Update implementation-strategy.md
2015-12-15 17:22:14 +05:30
Martin Ender
ba004aab83
Update the-champion.md
2015-12-15 17:22:14 +05:30
Martin Ender
4c3762989b
Update the-champion.md
2015-12-15 17:22:14 +05:30
Martin Ender
225b907a03
Update getting-started-with-erpnext.md
2015-12-15 17:22:14 +05:30
Martin Ender
b543861cbe
Update getting-started-with-erpnext.md
2015-12-15 17:22:14 +05:30
Martin Ender
fc6595b92b
Update getting-started-with-erpnext.md
2015-12-15 17:22:14 +05:30
Martin Ender
d11df3645b
Update getting-started-with-erpnext.md
2015-12-15 17:22:13 +05:30
Martin Ender
ea4c83dcb3
Update open-source.md
2015-12-15 17:22:13 +05:30
Martin Ender
3d05635d7a
Update open-source.md
2015-12-15 17:22:13 +05:30
Martin Ender
90b0db2d18
Update open-source.md
2015-12-15 17:22:13 +05:30
Martin Ender
91a71d4f2c
Update open-source.md
2015-12-15 17:22:13 +05:30
Martin Ender
36ab7f01b4
Update do-i-need-an-erp.md
2015-12-15 17:22:13 +05:30
Martin Ender
130dd2da61
Update do-i-need-an-erp.md
2015-12-15 17:22:13 +05:30
Martin Ender
6d15d36639
Update do-i-need-an-erp.md
2015-12-15 17:22:13 +05:30
Martin Ender
4395d0bc4d
Update do-i-need-an-erp.md
2015-12-15 17:22:13 +05:30
Martin Ender
6e4e2152af
Update print-format.md
2015-12-15 17:22:13 +05:30
Martin Ender
fc5d5d1600
Create print-format.md
2015-12-15 17:22:13 +05:30
Martin Ender
180d7e9ceb
Create hiding-modules-and-features.md
2015-12-15 17:22:12 +05:30
Martin Ender
7be281e712
Create document-title.md
2015-12-15 17:22:12 +05:30
Martin Ender
9d5f4f729e
Update customize-form.md
2015-12-15 17:22:12 +05:30
Martin Ender
b68087d690
Update customize-form.md
2015-12-15 17:22:12 +05:30
Martin Ender
a970e72819
Create customize-form.md
2015-12-15 17:22:12 +05:30
Martin Ender
4d0c5a51c9
Create custom-button.md
2015-12-15 17:22:12 +05:30
Martin Ender
41e1eb6af7
Create update-field-based-on-value-in-other-date-field.md
2015-12-15 17:22:12 +05:30
Martin Ender
1761004bd5
Create sales-invoice-id-based-on-sales-order-id.md
2015-12-15 17:22:12 +05:30
Martin Ender
c8fc5a2048
Create restrict-user-based-on-child-record.md
2015-12-15 17:22:12 +05:30
Martin Ender
9b639b82cf
Create restrict-purpose-of-stock-entry.md
2015-12-15 17:22:12 +05:30
Martin Ender
314fa2bdad
Create restrict-cancel-rights.md
2015-12-15 17:22:12 +05:30
Martin Ender
bff501c401
Create make-read-only-after-saving.md
2015-12-15 17:22:12 +05:30
Martin Ender
89d64f5b12
Update generate-code-based-on-custom-logic.md
2015-12-15 17:22:11 +05:30
Martin Ender
670269f85c
Create generate-code-based-on-custom-logic.md
2015-12-15 17:22:11 +05:30
Martin Ender
38a15ab4fc
Update date-validation.md
2015-12-15 17:22:11 +05:30
Martin Ender
8dfb35bb79
Create date-validation.md
2015-12-15 17:22:11 +05:30
Martin Ender
20e97c9dbc
Create index.txt
2015-12-15 17:22:11 +05:30
Martin Ender
909f6da868
Create index.md
2015-12-15 17:22:11 +05:30
Martin Ender
0ffc350f57
Create custom-script-fetch-values-from-master.md
2015-12-15 17:22:11 +05:30
Martin Ender
fea9357741
Update index.md
2015-12-15 17:22:11 +05:30
Martin Ender
2fbc3b7259
Create index.txt
2015-12-15 17:22:11 +05:30
Martin Ender
f99923dc08
Create index.md
2015-12-15 17:22:11 +05:30
Martin Ender
d5781b5de8
Create custom-doctype.md
2015-12-15 17:22:11 +05:30
Martin Ender
81adb7dec9
Create custom-field.md
2015-12-15 17:22:10 +05:30
Martin Ender
46d4ba904a
Create index.txt
2015-12-15 17:22:10 +05:30
Martin Ender
8c48c36be6
Create index.md
2015-12-15 17:22:10 +05:30
Martin Ender
f52b3090a9
Create tags.md
2015-12-15 17:22:10 +05:30
Martin Ender
e8703298ed
Update assignment.md
2015-12-15 17:22:10 +05:30
Martin Ender
98eba6b9ba
Create assignment.md
2015-12-15 17:22:10 +05:30
Martin Ender
34dc5bc812
Create calendar.md
2015-12-15 17:22:10 +05:30
Martin Ender
ba9b85c1a6
Update notes.md
2015-12-15 17:22:10 +05:30
Martin Ender
4eefd2218a
Create notes.md
2015-12-15 17:22:10 +05:30
Martin Ender
d58d56f4d4
Create messages.md
2015-12-15 17:22:10 +05:30
Martin Ender
1d7d055d16
Create collaborating-around-forms.md
2015-12-15 17:22:09 +05:30
Martin Ender
2e7dca8693
Create to-do.md
2015-12-15 17:22:09 +05:30
Martin Ender
746e21f283
Create index.txt
2015-12-15 17:22:09 +05:30
Martin Ender
60eed43269
Create index.md
2015-12-15 17:22:09 +05:30
Martin Ender
b2b7d91010
Create social-login-keys.md
2015-12-15 17:22:09 +05:30
Martin Ender
1641f0815e
Create website-settings.md
2015-12-15 17:22:09 +05:30
Martin Ender
e3f4b6ce6f
Create index.txt
2015-12-15 17:22:09 +05:30
Martin Ender
7a6ec814b9
Create index.md
2015-12-15 17:22:09 +05:30
Martin Ender
4325a8c82f
Create blogger.md
2015-12-15 17:22:09 +05:30
Martin Ender
6bff33b949
Create web-form.md
2015-12-15 17:22:09 +05:30
Martin Ender
99c244c834
Create blog-post.md
2015-12-15 17:22:08 +05:30
Martin Ender
838db977fe
Create web-page.md
2015-12-15 17:22:08 +05:30
Martin Ender
837b656c45
Create index.txt
2015-12-15 17:22:08 +05:30
Martin Ender
7641a957eb
Create index.md
2015-12-15 17:22:08 +05:30
Martin Ender
f8a383b339
Create issues.md
2015-12-15 17:22:08 +05:30
Martin Ender
d144bfe2ca
Create sign-up.md
2015-12-15 17:22:08 +05:30
Martin Ender
b5edc6676e
Update portal-login.md
2015-12-15 17:22:08 +05:30
Martin Ender
f72a1eb782
Create portal-login.md
2015-12-15 17:22:08 +05:30
Martin Ender
a574979ebc
Create customer-orders-invoices-and-shipping.md
2015-12-15 17:22:08 +05:30
Martin Ender
49b3c0c064
Create index.txt
2015-12-15 17:22:08 +05:30
Martin Ender
d32a43c39f
Create index.md
2015-12-15 17:22:08 +05:30
Martin Ender
3162f31fd8
Create holyday-list.md
2015-12-15 17:22:08 +05:30
Martin Ender
952c336f70
Create leave-type.md
2015-12-15 17:22:07 +05:30
Martin Ender
2f6a29b060
Update leave-allocation.md
2015-12-15 17:22:07 +05:30
Martin Ender
55e467dc20
Create leave-allocation.md
2015-12-15 17:22:07 +05:30
Martin Ender
df5aa98d00
Create deduction-type.md
2015-12-15 17:22:07 +05:30
Martin Ender
ffa18f4dc8
Create earning-type.md
2015-12-15 17:22:07 +05:30
Martin Ender
cea952c1c4
Create designation.md
2015-12-15 17:22:07 +05:30
Martin Ender
92a3aa9fad
Update branch.md
2015-12-15 17:22:07 +05:30
Martin Ender
3b7f626c0b
Update branch.md
2015-12-15 17:22:07 +05:30
Martin Ender
8d71597c03
Update branch.md
2015-12-15 17:22:07 +05:30
Martin Ender
786779fd5c
Create department.md
2015-12-15 17:22:07 +05:30
Martin Ender
0c30c9cccb
Update branch.md
2015-12-15 17:22:07 +05:30
Martin Ender
6479f0e82a
Update and rename department.md to branch.md
2015-12-15 17:22:07 +05:30
Martin Ender
f8da1ff59f
Create department.md
2015-12-15 17:22:06 +05:30
Martin Ender
043ab0c47e
Create employment-type.md
2015-12-15 17:22:06 +05:30
Martin Ender
6e982264db
Update hr-settings.md
2015-12-15 17:22:06 +05:30
Martin Ender
ed9f8de78c
Create hr-settings.md
2015-12-15 17:22:06 +05:30
Martin Ender
80f1fc4fcb
Create index.txt
2015-12-15 17:22:06 +05:30
Martin Ender
c26b090c72
Create index.md
2015-12-15 17:22:06 +05:30
Martin Ender
a637010af1
Create human-resources-report.md
2015-12-15 17:22:06 +05:30
Martin Ender
108c1f8783
Create leave-allocation-tool.md
2015-12-15 17:22:06 +05:30
Martin Ender
cfb0b3d371
Create upload-attendance.md
2015-12-15 17:22:06 +05:30
Martin Ender
e1a3b369e8
Create index.txt
2015-12-15 17:22:06 +05:30
Martin Ender
f0f54d53f4
Create index.md
2015-12-15 17:22:06 +05:30
Martin Ender
fdf61e40f3
Create offer-letter.md
2015-12-15 17:22:06 +05:30
Martin Ender
9a12221d72
Create job-opening.md
2015-12-15 17:22:05 +05:30
Martin Ender
6bea8c7bc2
Create job-applicant.md
2015-12-15 17:22:05 +05:30
Martin Ender
7bfba0fb0e
Create appraisal.md
2015-12-15 17:22:05 +05:30
Martin Ender
15597d7f60
Update salary-and-payroll.md
2015-12-15 17:22:05 +05:30
Martin Ender
19fb4f231d
Create salary-and-payroll.md
2015-12-15 17:22:05 +05:30
Martin Ender
fc70f4c9e8
Update attendance.md
2015-12-15 17:22:05 +05:30
Martin Ender
b0fc040dcc
Create attendance.md
2015-12-15 17:22:05 +05:30
Martin Ender
26018adff4
Create expense-claim.md
2015-12-15 17:22:05 +05:30
Martin Ender
73933c1195
Create leave-application.md
2015-12-15 17:22:05 +05:30
Martin Ender
1d3d0ed595
Create employee.md
2015-12-15 17:22:05 +05:30
Martin Ender
9d80e47d27
Create index.txt
2015-12-15 17:22:05 +05:30
Martin Ender
f2fc91b73e
Create index.md
2015-12-15 17:22:04 +05:30
Martin Ender
b77eb6d383
Create maintenance-schedule.md
2015-12-15 17:22:04 +05:30
Martin Ender
6ced0da90b
Create maintenance-visit.md
2015-12-15 17:22:04 +05:30
Martin Ender
6aaec8e874
Create warranty-claim.md
2015-12-15 17:22:04 +05:30
Martin Ender
e4ba4d0efd
Update issue.md
2015-12-15 17:22:04 +05:30
Martin Ender
acef1eaa9d
Create issue.md
2015-12-15 17:22:04 +05:30
Martin Ender
75960296c9
Create index.txt
2015-12-15 17:22:04 +05:30
Martin Ender
924b9c1763
Update index.md
2015-12-15 17:22:04 +05:30
Martin Ender
92f2771ae2
Create index.md
2015-12-15 17:22:04 +05:30
Martin Ender
88a2580ec5
Create activity-cost.md
2015-12-15 17:22:04 +05:30
Martin Ender
95a2e2f5e4
Create activity-type.md
2015-12-15 17:22:04 +05:30
Martin Ender
90f44ba6ac
Create time-log-batch.md
2015-12-15 17:22:04 +05:30
Martin Ender
b32d97f071
Create time-log.md
2015-12-15 17:22:03 +05:30
Martin Ender
8cb9cfdb81
Create project.md
2015-12-15 17:22:03 +05:30
Martin Ender
44420e4df7
Create tasks.md
2015-12-15 17:22:03 +05:30
Martin Ender
55bd4f7d06
Create index.txt
2015-12-15 17:22:03 +05:30
Martin Ender
1d1e03b792
Create index.md
2015-12-15 17:22:03 +05:30
Martin Ender
bb4fcd9438
Create manufacturing-settings.md
2015-12-15 17:22:03 +05:30
Martin Ender
b61345c040
Create index.md
2015-12-15 17:22:03 +05:30
Martin Ender
1827c3bc5f
Create index.txt
2015-12-15 17:22:03 +05:30
Martin Ender
e65df29aed
Update bom-replace-tool.md
2015-12-15 17:22:03 +05:30
Martin Ender
c9588f5aa3
Create bom-replace-tool.md
2015-12-15 17:22:03 +05:30
Martin Ender
6a2a290194
Create production-planning-tool.md
2015-12-15 17:22:03 +05:30
Martin Ender
8c95b5492c
Create index.txt
2015-12-15 17:22:02 +05:30
Martin Ender
3cf31eaefe
Create index.md
2015-12-15 17:22:02 +05:30
Martin Ender
0349c8e96d
Create subcontracting.md
2015-12-15 17:22:02 +05:30
Martin Ender
666b63aa5e
Create operation.md
2015-12-15 17:22:02 +05:30
Martin Ender
16fca942bb
Create workstation.md
2015-12-15 17:22:02 +05:30
Martin Ender
bf5f7425bb
Create production-order.md
2015-12-15 17:22:02 +05:30
Martin Ender
a165451b84
Create bill-of-materials.md
2015-12-15 17:22:02 +05:30
Martin Ender
5f7ac05af3
Create introduction.md
2015-12-15 17:22:02 +05:30
Martin Ender
afc9afa01f
Create index.txt
2015-12-15 17:22:02 +05:30
Martin Ender
fe032bfb6f
Create index.md
2015-12-15 17:22:02 +05:30
Martin Ender
71f5792f02
Create supplier-type.md
2015-12-15 17:22:02 +05:30
Martin Ender
0c70bd4b10
Create buying-settings.md
2015-12-15 17:22:02 +05:30
Martin Ender
f8ee7e12ef
Create index.txt
2015-12-15 17:22:01 +05:30
Martin Ender
f8a93b6cb1
Create index.md
2015-12-15 17:22:01 +05:30
Martin Ender
612ec6c289
Create purchase-order.md
2015-12-15 17:22:01 +05:30
Martin Ender
2fe811695c
Create supplier-quotation.md
2015-12-15 17:22:01 +05:30
Martin Ender
3cedb81670
Create supplier.md
2015-12-15 17:22:01 +05:30
Martin Ender
393afdaa1f
Create index.md
2015-12-15 17:22:01 +05:30
Martin Ender
80b1ff7744
Create index.txt
2015-12-15 17:22:01 +05:30
Martin Ender
0689d27072
Create sales-return.md
2015-12-15 17:22:01 +05:30
Martin Ender
e44372ca6b
Create purchase-return.md
2015-12-15 17:22:01 +05:30
Martin Ender
a94073d37d
Create item-attribute.md
2015-12-15 17:22:01 +05:30
Martin Ender
5d9a9473d3
Create item-group.md
2015-12-15 17:22:01 +05:30
Martin Ender
6854d66cdc
Create stock-settings.md
2015-12-15 17:22:00 +05:30
Martin Ender
29675f8bbd
Create index.txt
2015-12-15 17:22:00 +05:30
Martin Ender
2ffb4a7a8d
Create index.md
2015-12-15 17:22:00 +05:30
Martin Ender
692e465829
Create uom-replacement-tool.md
2015-12-15 17:22:00 +05:30
Martin Ender
eaed755e0f
Create landed-cost-voucher.md
2015-12-15 17:22:00 +05:30
Martin Ender
f32d3716b8
Create quality-inspection.md
2015-12-15 17:22:00 +05:30
Martin Ender
e493a9252b
Update packing-slip.md
2015-12-15 17:22:00 +05:30
Martin Ender
e005662cf0
Create packing-slip.md
2015-12-15 17:22:00 +05:30
Martin Ender
e83697c21c
Create index.txt
2015-12-15 17:22:00 +05:30
Martin Ender
c3c654c672
Create index.md
2015-12-15 17:22:00 +05:30
Martin Ender
c6a445fa8e
Update migrate-to-perpetual-inventory.md
2015-12-15 17:22:00 +05:30
Martin Ender
6ebf5b0bbb
Create migrate-to-perpetual-inventory.md
2015-12-15 17:22:00 +05:30
Martin Ender
668ea8a161
Update perpetual-inventory.md
2015-12-15 17:21:59 +05:30
Martin Ender
49c58975d9
Update perpetual-inventory.md
2015-12-15 17:21:59 +05:30
Martin Ender
3d9ef3202e
Update perpetual-inventory.md
2015-12-15 17:21:59 +05:30
Martin Ender
4dd13fd81e
Update perpetual-inventory.md
2015-12-15 17:21:59 +05:30
Martin Ender
edc5a79fbf
Update perpetual-inventory.md
2015-12-15 17:21:59 +05:30
Martin Ender
a3bb3cded0
Update perpetual-inventory.md
2015-12-15 17:21:59 +05:30
Martin Ender
c8e88f5bba
Update perpetual-inventory.md
2015-12-15 17:21:59 +05:30
Martin Ender
c4ffa9ceb0
Update perpetual-inventory.md
2015-12-15 17:21:59 +05:30
Martin Ender
b8834c3c1c
Update perpetual-inventory.md
2015-12-15 17:21:59 +05:30
Martin Ender
c384bc8045
Create perpetual-inventory.md
2015-12-15 17:21:59 +05:30
Martin Ender
9d0e4c841b
Create index.txt
2015-12-15 17:21:59 +05:30
Martin Ender
3097e73e5a
Create index.md
2015-12-15 17:21:59 +05:30
Martin Ender
eec101dffb
Create projected-quantity.md
2015-12-15 17:21:58 +05:30
Martin Ender
40e5b0589a
Create batch.md
2015-12-15 17:21:58 +05:30
Martin Ender
ee343c8c77
Create serial-no.md
2015-12-15 17:21:58 +05:30
Martin Ender
079ac113fb
Create warehouse.md
2015-12-15 17:21:58 +05:30
Martin Ender
285ec76130
Delete article-variants.mg
2015-12-15 17:21:58 +05:30
Martin Ender
e1eb761807
Create article-variants.md
2015-12-15 17:21:58 +05:30
Martin Ender
ae8974b627
Create article-variants.mg
2015-12-15 17:21:58 +05:30
Martin Ender
ea18cc464a
Create article-coding.md
2015-12-15 17:21:58 +05:30
Martin Ender
064da78734
Create index.txt
2015-12-15 17:21:58 +05:30
Martin Ender
c87dc4771c
Create index.md
2015-12-15 17:21:58 +05:30
Martin Ender
c5aede5b4c
Create installation-note.md
2015-12-15 17:21:58 +05:30
Martin Ender
d8785dde0c
Create purchase-receipt.md
2015-12-15 17:21:58 +05:30
Martin Ender
669e4df639
Create delivery-note.md
2015-12-15 17:21:57 +05:30
Martin Ender
e7894fab39
Create stock-entry.md
2015-12-15 17:21:57 +05:30
Martin Ender
f8be4394dc
Create material-request.md
2015-12-15 17:21:57 +05:30
Martin Ender
384f620c9d
Create index.txt
2015-12-15 17:21:57 +05:30
Martin Ender
ba0ae97fdf
Create index.md
2015-12-15 17:21:57 +05:30
Martin Ender
a95a189592
Update product-bundle.md
2015-12-15 17:21:57 +05:30
Martin Ender
5ede3a8a6f
Create product-bundle.md
2015-12-15 17:21:57 +05:30
Martin Ender
49e8628627
Create shipping-rule.md
2015-12-15 17:21:57 +05:30
Martin Ender
05521ee102
Create sales-partner.md
2015-12-15 17:21:57 +05:30
Martin Ender
11e9c18b51
Update selling-settings.md
2015-12-15 17:21:57 +05:30
Martin Ender
5fcb3d7775
Update selling-settings.md
2015-12-15 17:21:57 +05:30
Martin Ender
84226006dd
Create selling-settings.md
2015-12-15 17:21:56 +05:30
Martin Ender
4fc998d0f9
Create index.txt
2015-12-15 17:21:56 +05:30
Martin Ender
938b9b2097
Create index.md
2015-12-15 17:21:56 +05:30
Martin Ender
61c2d88781
Create sales-order.md
2015-12-15 17:21:56 +05:30
Martin Ender
fdba12d355
Update quotation.md
2015-12-15 17:21:56 +05:30
Martin Ender
8e1014565e
Create quotation.md
2015-12-15 17:21:56 +05:30
Martin Ender
040c565a44
Create index.txt
2015-12-15 17:21:56 +05:30
Martin Ender
54f7616cf8
Create index.md
2015-12-15 17:21:56 +05:30
Martin Ender
b27f2dc012
Create tax-rule.md
2015-12-15 17:21:56 +05:30
Martin Ender
7bf3d908ba
Create account-settings.md
2015-12-15 17:21:56 +05:30
Martin Ender
17caf1f6e5
Create cost-center.md
2015-12-15 17:21:56 +05:30
Martin Ender
b1c5f385bf
Create fiscal-year.md
2015-12-15 17:21:56 +05:30
Martin Ender
457cfb7b60
Create index.txt
2015-12-15 17:21:55 +05:30
Martin Ender
46e0166d1f
Create index.md
2015-12-15 17:21:55 +05:30
Martin Ender
0b55567b44
Create payment-tool.md
2015-12-15 17:21:55 +05:30
Martin Ender
f3ca6d0ac3
Create period-closing-voucher.md
2015-12-15 17:21:55 +05:30
Martin Ender
06ff0e42d9
Create payment-reconciliation.md
2015-12-15 17:21:55 +05:30
Martin Ender
1727bdb2b8
Create bank-reconciliation.md
2015-12-15 17:21:55 +05:30
Martin Ender
80300b321d
Create index.md
2015-12-15 17:21:55 +05:30
Martin Ender
5c8c606b50
Create index.txt
2015-12-15 17:21:55 +05:30
Martin Ender
7b8e9a39e7
Update multi-currency-accounting.md
2015-12-15 17:21:55 +05:30
Martin Ender
054d63c94e
Create multi-currency-accounting.md
2015-12-15 17:21:55 +05:30
Martin Ender
4deb7aaea2
Create point-of-sales-invoice.md
2015-12-15 17:21:55 +05:30
Martin Ender
f146046845
Create item-wise-tax.md
2015-12-15 17:21:55 +05:30
Martin Ender
f8942dd060
Update opening-accounts.md
2015-12-15 17:21:54 +05:30
Martin Ender
ee1f66bc86
Create opening-accounts.md
2015-12-15 17:21:54 +05:30
Martin Ender
ae77cb4959
Create budgeting.md
2015-12-15 17:21:54 +05:30
Martin Ender
6ba0f7bf75
Create accounting-entries.md
2015-12-15 17:21:54 +05:30
Martin Ender
3e2ebe5972
Update accounting-reports.md
2015-12-15 17:21:54 +05:30
Martin Ender
5f2f82de56
Create accounting-reports.md
2015-12-15 17:21:54 +05:30
Martin Ender
9d0d426ed6
Update opening-entry.md
2015-12-15 17:21:54 +05:30
Martin Ender
d7ea4ec2b6
Create opening-entry.md
2015-12-15 17:21:54 +05:30
Martin Ender
4d35ef149f
Create credit-limit.md
2015-12-15 17:21:54 +05:30
Martin Ender
34fe511260
Create advance-payment-entry.md
2015-12-15 17:21:54 +05:30
Martin Ender
03a3d5089c
Create making-payments.md
2015-12-15 17:21:54 +05:30
Martin Ender
8af11201d9
Update chart-of-accounts.md
2015-12-15 17:21:54 +05:30
Martin Ender
cd35d45628
Create chart-of-accounts.md
2015-12-15 17:21:53 +05:30
Martin Ender
dd09f67e75
Create purchase-invoice.md
2015-12-15 17:21:53 +05:30
Martin Ender
a51c4403a5
Update sales-invoice.md
2015-12-15 17:21:53 +05:30
Martin Ender
5656c6e969
Create sales-invoice.md
2015-12-15 17:21:53 +05:30
Martin Ender
635528e186
Create journal-entry.md
2015-12-15 17:21:53 +05:30
Martin Ender
49e39f0cde
Create index.md
2015-12-15 17:21:53 +05:30
Martin Ender
e9784d1280
Create index.txt
2015-12-15 17:21:53 +05:30
Martin Ender
82e3e08650
Create sales-person.md
2015-12-15 17:21:53 +05:30
Martin Ender
721de2629e
Create customer-group.md
2015-12-15 17:21:53 +05:30
Martin Ender
19d627c51f
Create campaign.md
2015-12-15 17:21:53 +05:30
Martin Ender
a1d129f836
Create index.txt
2015-12-15 17:21:53 +05:30
Martin Ender
79f52a54ef
Create index.md
2015-12-15 17:21:52 +05:30
Martin Ender
92091ce22d
Create newsletter.md
2015-12-15 17:21:52 +05:30
Martin Ender
019196894c
Create contact.md
2015-12-15 17:21:52 +05:30
Martin Ender
fbce19b2c6
Create opportunity.md
2015-12-15 17:21:52 +05:30
Martin Ender
84a9b6c816
Create customer.md
2015-12-15 17:21:52 +05:30
Martin Ender
aeb0934da0
Create lead.md
2015-12-15 17:21:52 +05:30
Martin Ender
347a580883
Create index.md
2015-12-15 17:21:52 +05:30
Martin Ender
2891c5ebca
Create index.txt
2015-12-15 17:21:52 +05:30
Martin Ender
fc1bb3ee1d
Create company-setup.md
2015-12-15 17:21:52 +05:30
Martin Ender
bd194a9fb7
Create bar-code.md
2015-12-15 17:21:52 +05:30
Martin Ender
4bd999cbc5
Update workflows.md
2015-12-15 17:21:52 +05:30
Martin Ender
bb154ad6c9
Create workflows.md
2015-12-15 17:21:52 +05:30
Martin Ender
f7d133f4a0
Update third-party-backups.md
2015-12-15 17:21:51 +05:30
Martin Ender
b79151ccac
Create third-party-backups.md
2015-12-15 17:21:51 +05:30
Martin Ender
5b509ca194
Update territory.md
2015-12-15 17:21:51 +05:30
Martin Ender
38aa8982f8
Create territory.md
2015-12-15 17:21:51 +05:30
Martin Ender
c46504dfdf
Update stock-reconciliation-for-non-serialized-item.md
2015-12-15 17:21:51 +05:30
Martin Ender
279fc35cb2
Create stock-reconciliation-for-non-serialized-item.md
2015-12-15 17:21:51 +05:30
Martin Ender
4887292513
Update sms-setting.md
2015-12-15 17:21:51 +05:30
Martin Ender
a056a7e390
Create sms-setting.md
2015-12-15 17:21:51 +05:30
Martin Ender
d82fec317e
Create authorization-rule.md
2015-12-15 17:21:51 +05:30
Martin Ender
2545651a77
Create price-lists.md
2015-12-15 17:21:51 +05:30
Martin Ender
43029c2754
Create pos-setting.md
2015-12-15 17:21:51 +05:30
Martin Ender
3adcca8238
Update setting-up-taxes.md
2015-12-15 17:21:51 +05:30
Martin Ender
a76f957345
Update setting-up-taxes.md
2015-12-15 17:21:50 +05:30
Martin Ender
6935ae7f60
Create setting-up-taxes.md
2015-12-15 17:21:50 +05:30
Martin Ender
72e3741b44
Create terms-and-conditions.md
2015-12-15 17:21:50 +05:30
Martin Ender
609568d6d5
Create address-template.md
2015-12-15 17:21:50 +05:30
Martin Ender
576c76f71c
Create letter-head.md
2015-12-15 17:21:50 +05:30
Martin Ender
a952fef53d
Create print-headings.md
2015-12-15 17:21:50 +05:30
Martin Ender
5dc46b6096
Delete print-headings.md3
2015-12-15 17:21:50 +05:30
Martin Ender
463bd7b742
Create print-headings.md3
2015-12-15 17:21:50 +05:30
Martin Ender
e5cb6ab319
Create print-format-builder.md
2015-12-15 17:21:50 +05:30
Martin Ender
eeb280e06d
Create print-settings.md
2015-12-15 17:21:50 +05:30
Martin Ender
2799039eec
Create index.txt
2015-12-15 17:21:50 +05:30
Martin Ender
84f47e54af
Create index.md
2015-12-15 17:21:50 +05:30
Martin Ender
3cd67c9e9b
Create sending-email.md
2015-12-15 17:21:49 +05:30
Martin Ender
6b3d94a5df
Update email-digest.md
2015-12-15 17:21:49 +05:30
Martin Ender
218cc5d1f2
Create email-digest.md
2015-12-15 17:21:49 +05:30
Martin Ender
f53407b76e
Update concepts-and-terms.md
2015-12-15 17:21:49 +05:30
Martin Ender
92988591fc
Update user-permissions.md
2015-12-15 17:21:49 +05:30
Martin Ender
9b69827d2c
Update role-based-permissions.md
2015-12-15 17:21:49 +05:30
Martin Ender
4136b3170a
Update adding-users.md
2015-12-15 17:21:49 +05:30
Martin Ender
f3459158c6
Delete globals-defaults.md
2015-12-15 17:21:49 +05:30
Martin Ender
a82056f424
Create global-defaults.md
2015-12-15 17:21:49 +05:30
Martin Ender
a440125ef2
Update system-settings.md
2015-12-15 17:21:49 +05:30
Martin Ender
3e8aec4d64
Update naming-series.md
2015-12-15 17:21:49 +05:30
Martin Ender
97a27f3d46
Update naming-series.md
2015-12-15 17:21:48 +05:30
Martin Ender
0eb0f59194
Update module-settings.md
2015-12-15 17:21:48 +05:30
Martin Ender
fce8780c08
Update globals-defaults.md
2015-12-15 17:21:48 +05:30
Martin Ender
48d45869ab
Update email-alerts.md
2015-12-15 17:21:48 +05:30
Martin Ender
349360b3a1
Update email-alerts.md
2015-12-15 17:21:48 +05:30
Martin Ender
5e646cd8ad
Update email-alerts.md
2015-12-15 17:21:48 +05:30
Martin Ender
8bcd104cec
Create email-alerts.md
2015-12-15 17:21:48 +05:30
Martin Ender
5e91280912
Create email-account.md
2015-12-15 17:21:48 +05:30
Martin Ender
5fec1751a7
Create index.txt
2015-12-15 17:21:48 +05:30
Martin Ender
91802f914c
Create index.md
2015-12-15 17:21:48 +05:30
Martin Ender
f779df2737
Create bulk-rename.md
2015-12-15 17:21:48 +05:30
Martin Ender
fad1363756
Update data-import-tool.md
2015-12-15 17:21:47 +05:30
Martin Ender
b041b905d0
Rename data-import-tool.md2.4.1 Werkzeug zum Datenimport Das Werkzeug zum Datenimport ist ein großartiger Weg um große Mengen an Daten, speziell Stammdaten, in das System hochzuladen oder zu bearbeiten. Um das Werkzeug zum Datenimport zu öffnen, gehen Sie entweder zu den Einstellungen oder zur Transaktion, für die Sie importieren wollen. Wenn der Datenimport erlaubt ist, sehen Sie eine Importschaltfläche: Das Werkzeug hat zwei Abschnitte, einen um eine Vorlage herunter zu laden, und einen zweiten um Daten hoch zu laden. (Anmerkung: Für den Import sind nur die DocTypes zugelassen, deren Dokumenttyp "Stammdaten" ist, oder bei denen die Einstellung "Import erlauben" aktiviert ist.) 1. Herunterladen der Vorlage Daten werden in ERPNext in Tabellen gespeichert, sehr ähnlich einer Tabellenkalkulation mit Spalten und Zeilen voller Daten. Jede Instanz in ERPNext kann mehrere verschiedene mit Ihr verbundene Untertabellen haben. Die Untertabellen sind mit Ihren übergeordneten Tabellen verknüpft und werden dort eingesetzt, wo es für eine Eigenschaft mehrere verschiedene Werte gibt. So kann z. B. ein Artikel mehrere verschiedene Preise haben, eine Rechnung hat mehrere verschiedene Artikel usw. - Klicken Sie auf die Tabelle, die Sie herunter laden wollen, oder auf "Alle Tabellen". - Für Massenbearbeitung klicken Sie auf "Mit Daten herunterladen". 2. Füllen Sie die Vorlage aus Öffnen Sie die Vorlage nach dem Herunterladen in einer Tabellenkalkulationsanwendung und fügen Sie die Daten unterhalb der Spaltenköpfe ein. Exportieren Sie dann Ihre Vorlage oder speichern Sie sie im CSV-Format (Comma Separated Values). 3. Hochladen der CSV-Datei Fügen Sie abschliessend die CSV-Datei im Abschnitt Import hinzu. Klicken Sie auf die Schaltfläche "Hochladen und Importieren". Anmerkungen: 1. Stellen Sie sicher, dass Sie als Verschlüsselung UTF-8 verwenden, wenn Ihre Anwendung das zulässt. 2. Lassen Sie die Spalte ID für einen neuen Datensatz leer. 4. Hochladen aller Tabellen (übergeordnete und Untertabellen) Wenn Sie alle Tabellen auswählen, dann erhalten Sie Spalten für alle Tabellen in einer Zeile gertrennt durch ~ Spalten. Wenn Sie mehrere verschiedene Unterzeilen haben, dann müssen Sie einen neuen Hauptartikel in einer neuen Zeile eintragen. Sehen Sie hierzu das Beispiel unten: Main Table ~ Child Table Column 1 Column 2 Column 3 ~ Column 1 Column 2 Column 3 v11 v12 v13 c11 c12 c13 c14 c15 c17 v21 v22 v23 c21 c22 c23 Um zu sehen, wie das gemacht wird, geben Sie manuell über Formulare einige Datensätze ein und exportieren Sie "Alle Tabellen" über "Mit Daten herunterladen". 5. Überschreiben ERPNext ermöglicht es Ihnen auch alle oder bestimmte Spalten zu überschreiben. Wenn Sie bestimmte Spalten aktualisieren möchten, können Sie die Vorlage mit Daten herunter laden. Vergessen Sie nicht die Box "Überschreiben" zu markieren, bevor sie hochladen. Anmerkung: Wenn Sie "Überschreiben" auswählen, werden alle Unterdatensätze eines übergeordneten Elements gelöscht. 6. Einschränkungen beim Hochladen ERPNext begrenzt die Menge an Daten, die Sie in einer Datei hochladen können. Die Menge kann sich je nach Datentyp unterscheiden. Normalerweise kann man problemlos ungefähr 1.000 Zeilen einer Tabelle in einem Vorgang hochladen. Wenn das System den Vorgang nicht akzeptiert, sehen Sie eine Fehlermeldung. Warum das alles? Wenn Sie zuviele Daten hochladen, kann das System abstürzen, im Besonderen dann, wenn andere Benutzer parallel arbeiten. Daher begrenzt ERPNext die Anzahl von Schreibvorgängen, die Sie mit einer Eingabe verarbeiten können. Wie fügen Sie Dateien an? Wenn Sie ein Formular öffnen, dann sehen Sie in der Seitenleiste rechts einen Abschnitt zum Anfügen von Dateien. Klicken Sie auf "Hinzufügen" und wählen Sie die Datei aus, die Sie anfügen möchten. Klicken Sie auf "Hochladen" und die Sache ist erledigt. Was ist eine CSV-Datei? Eine CSV (Durch Kommas getrennte Werte)-Datei ist ein Datensatz, den Sie in ERPNext hochladen können um verschiedene Daten zu aktualisieren. Jedes gebräuchliche Tabellenkalkulationsprogramm wie MS-Excel oder OpenOffice Spreadsheet kann im CSV-Format abspeichern. Wenn Sie Microsoft Excel benutzen und nicht-englische Zeichen verwenden, dann sollten Sie Ihre Datei UTF-8-kodiert abspeichern. Bei älteren Versionen von Excel gibt es keinen eindeutigen Weg als UTF-8 zu speichern. Deshalb können Sie die Datei auch ganz einfach als CSV abspeichern, dann mit Notepad öffnen und als UTF-8 abspeichern. (Microsoft Excel kann das leider nicht.) to data-import-tool.md
2015-12-15 17:21:47 +05:30
Martin Ender
ed4e85bf97
Create index.md
2015-12-15 17:21:47 +05:30
Martin Ender
1a8e484542
Create index.txt
2015-12-15 17:21:47 +05:30
Martin Ender
8794bb9c5f
Delete system-settings.md
2015-12-15 17:21:47 +05:30
Martin Ender
1cd13ce2d5
Delete naming-series.md
2015-12-15 17:21:47 +05:30
Martin Ender
c1bdc108c8
Delete index.txt
2015-12-15 17:21:47 +05:30
Martin Ender
6549710eaa
Delete module-settings.md
2015-12-15 17:21:47 +05:30
Martin Ender
4634194009
Delete index.md
2015-12-15 17:21:47 +05:30
Martin Ender
14006ad8c8
Delete global-defaults.md
2015-12-15 17:21:47 +05:30
Martin Ender
89a7730406
Create system-settings.md
2015-12-15 17:21:47 +05:30
Martin Ender
c2e913e0ca
Create naming-series.md
2015-12-15 17:21:47 +05:30
Martin Ender
afbf3296d4
Create module-settings.md
2015-12-15 17:21:46 +05:30
Martin Ender
75963505dc
Create index.md
2015-12-15 17:21:46 +05:30
Martin Ender
9ec61cf150
Create globals-defaults.md
2015-12-15 17:21:46 +05:30
Martin Ender
699feb0384
Create index.txt
2015-12-15 17:21:46 +05:30
Martin Ender
da00bacb55
Create global-defaults.md
2015-12-15 17:21:46 +05:30
Martin Ender
8ca8b14720
Create naming-series.md
2015-12-15 17:21:46 +05:30
Martin Ender
64b47ade3b
Create module-settings.md
2015-12-15 17:21:46 +05:30
Martin Ender
423791a1cd
Create system-settings.md
2015-12-15 17:21:46 +05:30
Martin Ender
9b09fea692
Create index.txt
2015-12-15 17:21:46 +05:30
Martin Ender
098cb65a54
Create index.md
2015-12-15 17:21:46 +05:30
Martin Ender
2cf2f48c02
Create sharing.md
2015-12-15 17:21:46 +05:30
Martin Ender
85febb969e
Update user-permissions.md
2015-12-15 17:21:46 +05:30
Martin Ender
952e19a9bb
Create user-permissions.md
2015-12-15 17:21:45 +05:30
Martin Ender
451ad3fe93
Update role-based-permissions.md
2015-12-15 17:21:45 +05:30
Martin Ender
cec0728bba
Update role-based-permissions.md
2015-12-15 17:21:45 +05:30
Martin Ender
44838ea239
Update role-based-permissions.md
2015-12-15 17:21:45 +05:30
Martin Ender
3c29d6faa2
Update role-based-permissions.md
2015-12-15 17:21:45 +05:30
Martin Ender
5c4fdfce44
Create role-based-permissions.md
2015-12-15 17:21:45 +05:30
Martin Ender
19bed183b0
Update adding-users.md
2015-12-15 17:21:45 +05:30
Martin Ender
53523539f4
Create adding-users.md
2015-12-15 17:21:45 +05:30
Martin Ender
a5488e43ad
Create index.md
2015-12-15 17:21:45 +05:30
Martin Ender
f8a2587cf4
Create index.txt
2015-12-15 17:21:45 +05:30
Martin Ender
337972eada
Create step-10-item.md
2015-12-15 17:21:45 +05:30
Martin Ender
e5944e8866
Create step-9-suppliers.md
2015-12-15 17:21:45 +05:30
Martin Ender
ee17a60872
Create step-8-customer-names.md
2015-12-15 17:21:44 +05:30
Martin Ender
35ad87bb14
Create step-7-tax-details.md
2015-12-15 17:21:44 +05:30
Martin Ender
421bef2db4
Update step-6-add-users.md
2015-12-15 17:21:44 +05:30
Martin Ender
0048d29799
Create step-6-add-users.md
2015-12-15 17:21:44 +05:30
Martin Ender
5029670657
Update step-1-language.md
2015-12-15 17:21:44 +05:30
Martin Ender
d40ec15f1c
Update step-2-currency-and-timezone.md
2015-12-15 17:21:44 +05:30
Martin Ender
9873c4029b
Update step-3-user-details.md
2015-12-15 17:21:44 +05:30
Martin Ender
78b4ae02cb
Update step-4-company-details.md
2015-12-15 17:21:44 +05:30
Martin Ender
9fa9b34930
Update step-5-letterhead-and-logo.md
2015-12-15 17:21:44 +05:30
Martin Ender
61b6918e73
Create step-5-letterhead-and-logo.md
2015-12-15 17:21:44 +05:30
Martin Ender
755d14b004
Create step-4-company-details.md
2015-12-15 17:21:44 +05:30
Martin Ender
2d3670b6a4
Create step-3-user-details.md
2015-12-15 17:21:44 +05:30
Martin Ender
8ff1c7b3e0
Create step-2-currency-and-timezone.md
2015-12-15 17:21:43 +05:30
Martin Ender
8df03c6e30
Create step-1-language.md
2015-12-15 17:21:43 +05:30
Martin Ender
cab2fc6e73
Create index.txt
2015-12-15 17:21:43 +05:30
Martin Ender
a5b9008088
Create index.md
2015-12-15 17:21:43 +05:30
Martin Ender
0a5ccb008a
Create index.md
2015-12-15 17:21:43 +05:30
Martin Ender
83b8d33e78
Create index.txt
2015-12-15 17:21:43 +05:30
Martin Ender
9c2a20a67b
Update the-champion.md
2015-12-15 17:21:43 +05:30
Martin Ender
a7465f8fd6
Update open-source.md
2015-12-15 17:21:43 +05:30
Martin Ender
49b476b9e5
Update key-workflows.md
2015-12-15 17:21:43 +05:30
Martin Ender
7f7f77f4d7
Create index.txt
2015-12-15 17:21:43 +05:30
Martin Ender
356c552b41
Update index.md
2015-12-15 17:21:43 +05:30
Martin Ender
1ccbd82b35
Update implementation-strategy.md
2015-12-15 17:21:43 +05:30
Martin Ender
e606678b8f
Update getting-started-with-erpnext.md
2015-12-15 17:21:42 +05:30
Martin Ender
45db6156c7
Update getting-started-with-erpnext.md
2015-12-15 17:21:42 +05:30
Martin Ender
9d3da40351
Update getting-started-with-erpnext.md
2015-12-15 17:21:42 +05:30
Martin Ender
3f51a8aed4
Update do-i-need-an-erp.md
2015-12-15 17:21:42 +05:30
Martin Ender
e7d09edc0d
Update do-i-need-an-erp.md
2015-12-15 17:21:42 +05:30
Martin Ender
94c7fa0141
Update concepts-and-terms.md
2015-12-15 17:21:42 +05:30
Martin Ender
abe9abc90b
Update concepts-and-terms.md
2015-12-15 17:21:42 +05:30
Martin Ender
dbb25b67a5
Update concepts-and-terms.md
2015-12-15 17:21:42 +05:30
Martin Ender
d4e8e05749
Create concepts-and-terms.md
2015-12-15 17:21:42 +05:30
Martin Ender
02d28f1422
Create key-workflows.md
2015-12-15 17:21:42 +05:30
Martin Ender
a97265c8af
Create implementation-strategy.md
2015-12-15 17:21:42 +05:30
Martin Ender
0480ad45f6
Create the-champion.md
2015-12-15 17:21:42 +05:30
Martin Ender
c8ea02d745
Update getting-started-with-erpnext.md
2015-12-15 17:21:41 +05:30
Martin Ender
028f246cae
Update getting-started-with-erpnext.md
2015-12-15 17:21:41 +05:30
Martin Ender
f683bbee59
Create getting-started-with-erpnext.md
2015-12-15 17:21:41 +05:30
Martin Ender
e01309f07e
Update open-source.md
2015-12-15 17:21:41 +05:30
Martin Ender
d7786190e6
Create open-source.md
2015-12-15 17:21:41 +05:30
Martin Ender
5bce109e8e
Create do-i-need-an-erp.md
2015-12-15 17:21:41 +05:30
Martin Ender
a2531995f9
Create index.md
2015-12-15 17:21:41 +05:30
Martin Ender
98ccde84fb
Create Beispiel.md
2015-12-15 17:21:41 +05:30
CWTGMBH
a12840f803
Create index.md
2015-12-15 17:21:41 +05:30
CWTGMBH
3e2f36034f
Delete de
2015-12-15 17:21:41 +05:30
Martin Ender
d8c6213828
Create de
2015-12-15 17:21:41 +05:30
Anand Doshi
dd56b5f4ac
Merge pull request #4503 from nabinhait/target_warehouse_patch
...
[patch] Repost entries with wrongly selected target warehouse
2015-12-15 17:01:37 +05:30
Nabin Hait
8444febbda
[patch] Repost entries with wrongly selected target warehouse
2015-12-15 15:55:06 +05:30
Anand Doshi
b26c3f2263
Merge pull request #4502 from nabinhait/general_ledger_fix
...
[fix][report] General Ledger
2015-12-15 15:18:20 +05:30
Anand Doshi
03791fceee
[translations]
2015-12-15 15:17:11 +05:30
Anand Doshi
542782e400
[fix] delete lead addresses in delete company transactions
2015-12-15 15:17:04 +05:30
Nabin Hait
8bdf8e675f
[fix][report] General Ledger
2015-12-15 15:02:04 +05:30
Anand Doshi
2da81732eb
Merge pull request #4500 from rmehta/fixes-to-tree
...
[fix] rename tree item fixes #2524
2015-12-15 14:38:26 +05:30
Anand Doshi
e1f46be230
Merge branch 'ShashaQin-patch-60' into develop
2015-12-15 14:37:11 +05:30
ShashaQin
81b8627250
Update serial_no.json
2015-12-15 14:14:51 +05:30
ShashaQin
79586775b2
Update serial_no.json
...
change "delivery_document_type" to Link and ""delivery_document_no" to Dynamic link will be more convenient, like "purchase_document_type" and "purchase_document_no".
2015-12-15 14:14:26 +05:30
Anand Doshi
8ee5498fe0
[fix] delete lead addresses in delete company transaction
2015-12-15 13:14:38 +05:30
Rushabh Mehta
e8ab320028
[fix] rename tree item fixes #2524
2015-12-15 12:06:37 +05:30
Chris Ian Fiel
c80796cdd5
Cash Flow Report
2015-12-12 11:26:54 +08:00
Chris Ian Fiel
fde03453e4
Cash Flow Report
2015-12-12 10:54:56 +08:00
Chris Ian Fiel
826e18a29f
Cash Flow Report
2015-12-12 10:33:01 +08:00
Nabin Hait
bdd1ee2185
Merge branch 'develop'
2015-12-11 15:06:29 +05:30
Nabin Hait
660f479ec8
bumped to version 6.12.11
2015-12-11 15:36:29 +06:00
Nabin Hait
fa557f494b
Merge pull request #4481 from nabinhait/develop
...
[fix] Ignore user permission in target warehouse in SO
2015-12-11 15:04:38 +05:30
Anand Doshi
695d09f9cd
[fix] typo
2015-12-11 15:03:26 +05:30
Anand Doshi
66c9940d73
[fix] [validation] website url should be public
2015-12-11 15:02:58 +05:30
Nabin Hait
204af3ce90
[fix] Ignore user permission in target warehouse in SO
2015-12-11 15:01:02 +05:30
Nabin Hait
4a9f6ba520
Merge branch 'develop'
2015-12-11 14:35:41 +05:30
Nabin Hait
83f9f93015
bumped to version 6.12.10
2015-12-11 15:05:41 +06:00
Nabin Hait
53804c5bed
Merge pull request #4472 from umairsy/develop
...
[docs] Added new videos
2015-12-11 14:31:35 +05:30
Nabin Hait
d3d4fe45c6
Merge pull request #4473 from nabinhait/sms_logs
...
[fix] Ignore permissions while creating sms logs
2015-12-11 14:31:26 +05:30
Nabin Hait
fae4f0269b
Merge pull request #4478 from nabinhait/website_image
...
[fix] Website Image validation
2015-12-11 14:31:18 +05:30
Nabin Hait
fc4eca5cc7
[fix] Website Image validation
2015-12-11 11:47:05 +05:30
Rushabh Mehta
a1a712b0c6
[minor] [fix] task close button condition
2015-12-11 11:16:03 +05:30
Nabin Hait
2164595933
[fix] Ignore permissions while creating sms logs
2015-12-10 18:09:57 +05:30
Umair Sayyed
8eaf5eee74
[docs] Added videos
2015-12-10 17:58:12 +05:30
Nabin Hait
09e5306825
Merge branch 'develop'
2015-12-10 14:41:02 +05:30
Nabin Hait
9cca3494c0
bumped to version 6.12.9
2015-12-10 15:11:02 +06:00
Nabin Hait
360b057b0a
[chnage-log]
2015-12-10 14:37:28 +05:30
Nabin Hait
56ae9481a0
Merge pull request #4466 from rmehta/task-notification-on-overdue
...
[enhancement] task status will be set to overdue when it crosses expected end date
2015-12-10 14:30:34 +05:30
Nabin Hait
12425e22a6
Merge pull request #4462 from nabinhait/sal_slip_fix
...
[fix] Payment days calculation in salary slip
2015-12-10 14:23:31 +05:30
Nabin Hait
da80a649fc
Merge pull request #4465 from anandpdoshi/fix/validate-website-image-public
...
[fix] validate that Item's website image is public
2015-12-10 14:23:14 +05:30
Rushabh Mehta
13ec41abb2
[enhancement] task status will be set to overdue when it crosses expected end date
2015-12-10 12:59:02 +05:30
Anand Doshi
b3051ab84d
[fix] validate that Item's website image is public
2015-12-10 11:46:20 +05:30
Nabin Hait
533aba02c5
[fix] Payment days calculation in salary slip
2015-12-10 10:50:42 +05:30
Rushabh Mehta
a5cf8a86c1
[minor] lang fixes for email digest
2015-12-10 10:38:46 +05:30
Rushabh Mehta
c819fd4ee8
[translations] for #4461
2015-12-10 10:34:32 +05:30
Anand Doshi
2af44ffd06
[fix] setup wizard is_private
2015-12-09 17:29:11 +05:30
Nabin Hait
cff91abd8d
Merge pull request #4456 from nabinhait/drop_ship_fix1
...
[fix] Reload SO Item in patch
2015-12-09 17:06:54 +05:30
Nabin Hait
5d39a9594d
[fix] Reload SO Item in patch
2015-12-09 17:06:09 +05:30
Nabin Hait
b1caeba0b4
Merge branch 'develop'
2015-12-09 15:32:30 +05:30
Nabin Hait
7290c79fdf
bumped to version 6.12.8
2015-12-09 16:02:30 +06:00
Nabin Hait
547e916b00
Merge pull request #4452 from saurabh6790/drop-ship-fixes-3
...
[fixes] pull customer details only if drop shipping is marked
2015-12-09 15:31:49 +05:30
Nabin Hait
e4c0388b68
Merge pull request #4453 from nabinhait/translation_fix
...
suomalainen translation fixed for Extra Small
2015-12-09 15:30:11 +05:30
Nabin Hait
783e63a8e6
suomalainen translation fixed for Extra Small and Large
2015-12-09 15:29:21 +05:30
Saurabh
f6891975d5
[fixes] pull customer details only if drop shipping is marked
2015-12-09 15:04:12 +05:30
Nabin Hait
45a8f9d006
Merge branch 'develop'
2015-12-09 14:59:44 +05:30
Nabin Hait
1b0c797817
bumped to version 6.12.7
2015-12-09 15:29:44 +06:00
Nabin Hait
c119cbcb50
Merge pull request #4449 from nabinhait/coa_fix
...
[fix] Stock account identified in COA of Guatamala
2015-12-09 13:58:09 +05:30
Nabin Hait
d595534431
Merge pull request #4450 from venetanji/develop
...
Fix dynamic link in reports to generate correct link when user language is not english
2015-12-09 13:57:45 +05:30
Giovanni Lion
5de53eb0eb
Voucher dynamic link fix to allow links to work if user language is not english
2015-12-09 15:45:40 +08:00
Giovanni Lion
5ccaf6f9d7
Merge remote-tracking branch 'frappe/develop' into develop
2015-12-09 15:25:47 +08:00
Anand Doshi
29fe53f63c
[fix] use pip parse requirements in setup.py
2015-12-09 12:15:22 +05:30
Nabin Hait
49fe7af6de
[fix] Stock account identified in COA of Guatamala
2015-12-09 11:27:10 +05:30
Nabin Hait
a68a3b5cc1
Merge branch 'develop'
2015-12-08 18:06:25 +05:30
Nabin Hait
3931a35e27
bumped to version 6.12.6
2015-12-08 18:36:25 +06:00
Nabin Hait
56595ecda0
Merge pull request #4445 from nabinhait/patch_fix1
...
[patch][fix] Fixed drop ship status and tax rule patch
2015-12-08 18:05:33 +05:30
Nabin Hait
466ff3d31b
Merge pull request #4446 from nabinhait/translation_fix
...
[fix] Hungary translation for chart of accounts
2015-12-08 18:05:12 +05:30
Nabin Hait
61c6552434
[fix] Hungary translation for chart of accounts
2015-12-08 18:03:23 +05:30
Nabin Hait
4ad0963ee8
[patch][fix] Fixed drop ship status and tax rule patch
2015-12-08 16:51:04 +05:30
Nabin Hait
aa99fe2c4e
Merge branch 'develop'
2015-12-08 15:40:17 +05:30
Nabin Hait
d56ec92682
bumped to version 6.12.5
2015-12-08 16:10:17 +06:00
Nabin Hait
90852d334f
Merge branch 'nabinhait-tax_rule_patch' into develop
2015-12-08 15:30:32 +05:30
Nabin Hait
694373d022
Fixed conflict
2015-12-08 15:30:15 +05:30
Nabin Hait
40d49ccf98
Merge pull request #4444 from nabinhait/get_incoming_rate_fix
...
[fix] Get incoming rate if args as json
2015-12-08 15:17:32 +05:30
Nabin Hait
4372ac559a
Merge pull request #4443 from nabinhait/bank_reco_print
...
[fix] Print format for bank reco statement
2015-12-08 15:17:24 +05:30
Nabin Hait
01478b3fc1
Merge pull request #4439 from saurabh6790/drop-ship-fixes-3
...
[fixes] Drop Shipping - Purchase Order Cancellation - Sales Order Status
2015-12-08 15:16:38 +05:30
Nabin Hait
41c8cf645a
[fix] Get incoming rate if args as json
2015-12-08 14:50:24 +05:30
Saurabh
70ed6ede5c
[fixes] patch to update delivery status for drop ship item
2015-12-08 14:48:19 +05:30
Nabin Hait
7af5c4aefc
[fix] Print format for bank reco statement
2015-12-08 14:25:10 +05:30
Saurabh
01ca354d52
[fixes] Drop Shipping - Purchase Order Cancellation - Sales Order Status
2015-12-08 14:03:09 +05:30
Nabin Hait
a974ab3dc5
[fix][patch] Create Tax Rule based on default taxes and charges template in Customer and Supplier
2015-12-08 12:56:14 +05:30
Anand Doshi
cc24d28ddc
[fix] address creation for new user
2015-12-08 12:34:13 +05:30
Rushabh Mehta
441b2c7657
[minor] limit pos search to 24 items at a time
2015-12-08 12:16:53 +05:30
Anand Doshi
51d07dfca2
[docs] rename perm level error article
2015-12-07 16:22:57 +05:30
Nabin Hait
5e6757f197
Merge branch 'develop'
2015-12-07 14:25:00 +05:30
Nabin Hait
6a8ff42a5a
bumped to version 6.12.4
2015-12-07 14:54:59 +06:00
Nabin Hait
06db236aa0
[fix] Allow Production Order, by default unchecked in item
2015-12-07 14:19:13 +05:30
Nabin Hait
733680bc3f
[translations]
2015-12-07 14:12:41 +05:30
Rushabh Mehta
14a0441b4b
[fix] removed temp_highlight
2015-12-07 12:28:03 +05:30
Rushabh Mehta
a311e706b0
[docs] home.png
2015-12-07 12:13:17 +05:30
Rushabh Mehta
e6a16c29df
[docs] index fix
2015-12-07 12:07:01 +05:30
Nabin Hait
92bb480fc3
Merge pull request #4432 from bohlian/develop
...
Purchase Invoice - Show Payment Button when Outstanding Amount !=0
2015-12-07 11:12:11 +05:30
Nabin Hait
7dc0da18b5
Merge pull request #4433 from nabinhait/expense_allow_import
...
[fix] Allowed import for Expense Claim
2015-12-07 11:11:35 +05:30
Nabin Hait
c8a2b94200
Merge pull request #4434 from nabinhait/whitelist_fix
...
[fix] get_incoming_rate function whitelisted
2015-12-07 11:11:21 +05:30
Nabin Hait
203d4088fa
Merge pull request #4435 from saurabh6790/drop-ship-fixes-3
...
[fixes] recreate print format, shipping address on po for drop ship, …
2015-12-07 11:10:11 +05:30
Nabin Hait
5eefff13a1
[fix] get_incoming_rate function whitelisted
2015-12-07 10:44:56 +05:30
Nabin Hait
9421e9873a
[fix] Allowed import for Expense Claim
2015-12-07 10:40:13 +05:30
bohlian
5e4c8a52ee
Payment To Be Shown When Outstanding Amount != 0
...
Payment button should be shown when outstanding amount != 0.
2015-12-07 12:06:08 +08:00
bohlian
41f62f7250
Merge pull request #1 from frappe/develop
...
7/12/2015 Merge
2015-12-07 12:04:34 +08:00
Saurabh
4f39fd243e
[fixes] recreate print format, shipping address on po for drop ship, validate update stock
2015-12-06 10:09:06 +05:30
Nabin Hait
c43a11a313
Merge pull request #4431 from nabinhait/leave_fix
...
[fix] Don't validate balance for lwp and in balance consider all leaves in the allocation period
2015-12-05 12:43:38 +05:30
Nabin Hait
1bffb42809
Merge pull request #4428 from nabinhait/get_exchange_rate
...
[fix] Get exchange rate as 1 if same currency
2015-12-05 12:43:13 +05:30
Nabin Hait
4660f820da
Merge pull request #4427 from nabinhait/offer_letter_fix
...
[fix] Offer letter print format fixed
2015-12-05 12:42:39 +05:30
Nabin Hait
1a19c05ef0
Merge pull request #4425 from nabinhait/bank_reco_fix
...
[fix] Fixed amounts not reflected in bank
2015-12-05 12:42:20 +05:30
Nabin Hait
d53e780fb8
[fix] Don't validate balance for lwp and in balance consider all leaves in the allocation period
2015-12-05 12:15:49 +05:30
Nabin Hait
0f5d97a156
[fix] Get exchange rate as 1 if same currency
2015-12-04 16:47:34 +05:30
Rushabh Mehta
2f273674e9
[docs] fixed links
2015-12-04 16:00:38 +05:30
Nabin Hait
734a40ad62
[fix] Offer letter print format fixed
2015-12-04 12:19:21 +05:30
Nabin Hait
9547b774f7
[fix] Fixed amounts not reflected in bank
2015-12-04 11:05:25 +05:30
Rushabh Mehta
e1f8b1d695
[minor] [production planning tool] include non production items without default BOM in multi-level BOM
2015-12-04 10:53:15 +05:30
Rushabh Mehta
7be2e985b0
[docs] updated generated docs
2015-12-03 18:28:19 +05:30
Rushabh Mehta
3b6287d849
[docs] updated generated docs
2015-12-03 18:27:13 +05:30
Rushabh Mehta
ab7021ce64
[docs] merged kb and cleanup. warning: don't see the commit
2015-12-03 17:59:34 +05:30
Rushabh Mehta
ca4c663e07
Merge branch 'develop'
2015-12-03 17:58:58 +05:30
Rushabh Mehta
275b3eec0d
bumped to version 6.12.3
2015-12-03 18:28:57 +06:00
Rushabh Mehta
acaef538c2
Merge pull request #4420 from rmehta/stock-entry-fix
...
[minor] allow stock entry for manufacture without production order
2015-12-03 17:58:07 +05:30
Rushabh Mehta
041b062014
Merge pull request #4419 from nabinhait/salary_payment_days
...
[fix] Payment Days and holidays considering joining and relieving dates
2015-12-03 17:57:24 +05:30
Rushabh Mehta
39e603a154
Merge pull request #4413 from nabinhait/bank_transfer_exchange_rate
...
Bank transfer exchange rate and account balance in COA
2015-12-03 17:56:03 +05:30
Nabin Hait
a4eeb919e6
[fix] Set payment days considering joinging date, reliving date and applicable holidays
2015-12-03 15:10:30 +05:30
Nabin Hait
c4d9554a05
[fix] Payment Days and holidays considering joining and relieving dates
2015-12-03 15:10:30 +05:30
Rushabh Mehta
2e1c8f27c4
Merge pull request #4421 from nabinhait/tax_rule_fix
...
[fix] Toggle required for sales and purchase tax template based on tax type
2015-12-03 11:50:09 +05:30
Nabin Hait
4c7a32e446
[fix] Toggle required for sales and purchase tax template based on tax type
2015-12-03 11:47:38 +05:30
Rushabh Mehta
2c069a418a
[minor] allow stock entry for manufacture without production order
2015-12-03 11:10:23 +05:30
Rushabh Mehta
ba2596a7e0
[minor] validate email id before inviting user
2015-12-03 10:35:11 +05:30
Rushabh Mehta
f7911687a0
[minor] fixes to patch
2015-12-03 08:09:42 +05:30
Rushabh Mehta
ceb82324ad
Merge branch 'develop'
2015-12-02 14:54:45 +05:30
Rushabh Mehta
5dd1aa9f31
bumped to version 6.12.2
2015-12-02 15:24:45 +06:00
Rushabh Mehta
80ada3eddd
Merge pull request #4415 from nabinhait/salary_slip_fix
...
[fix] Inactive salary structure validation
2015-12-02 14:52:11 +05:30
Nabin Hait
8df5900f98
[fix] Inactive salary structure validation
2015-12-02 14:50:08 +05:30
Nabin Hait
f58a3726a7
Balance in chart of accounts in both company and account currency
2015-12-02 12:28:06 +05:30
Nabin Hait
1c77506e80
[fix] Don't overwrite exchange rate on saving for bank transfer
2015-12-02 12:28:06 +05:30
Rushabh Mehta
f1f556c0ac
Merge pull request #4409 from nabinhait/reorder_level
...
[fix] Reorder Qty mandatory if reorder level entered
2015-12-02 12:25:09 +05:30
Rushabh Mehta
4a1b9ac793
Merge pull request #4407 from nabinhait/develop
...
[fix] Mapping allowed for negative quantity
2015-12-02 12:24:49 +05:30
Nabin Hait
20abc2d0e8
[fix] Reorder Qty mandatory if reorder level entered
2015-12-01 19:01:19 +05:30
Rushabh Mehta
4f9fe9c856
Merge branch 'develop'
2015-12-01 18:18:28 +05:30
Rushabh Mehta
4496cc1e80
bumped to version 6.12.1
2015-12-01 18:48:28 +06:00
Rushabh Mehta
29cca2352c
[hot] [fix] trial balance report
2015-12-01 18:17:33 +05:30
Nabin Hait
d793fc9446
[fix] Mapping allowed for negative quantity
2015-12-01 17:28:12 +05:30
Rushabh Mehta
84f44ad5eb
Merge pull request #4345 from nabinhait/stock_reco
...
[fix] Get items in stock reconciliation based on default warehouse
2015-12-01 16:50:32 +05:30
Nabin Hait
5b73dea9f6
[fix] Get items in stock reconciliation based on default warehouse or existing bin
2015-12-01 16:47:17 +05:30
Rushabh Mehta
cd90478c6d
Merge pull request #4406 from nabinhait/recurring_test_fix
...
[fix] Recurring test case fixed for the 1st day of the month
2015-12-01 16:43:27 +05:30
Nabin Hait
c4edcf1532
[fix] Recurring test case fixed for the 1st day of the month
2015-12-01 16:28:35 +05:30
Rushabh Mehta
70885f63a5
Merge branch 'develop'
2015-12-01 16:24:13 +05:30
Rushabh Mehta
48b1633ff5
bumped to version 6.12.0
2015-12-01 16:54:13 +06:00
Rushabh Mehta
4140fa59c5
[translations]
2015-12-01 16:02:15 +05:30
Rushabh Mehta
afacc3d779
[minor] catch illegal reference, via error report
2015-12-01 15:53:07 +05:30
Rushabh Mehta
87b0bec2cf
Merge pull request #4405 from rmehta/get-product-bundle-fixes
...
[fixes] [ux] get product bundle items only on po, mr and button on toolbar
2015-12-01 15:14:23 +05:30
Rushabh Mehta
29f9f6c147
[fixes] [ux] get product bundle items only on po, mr and button on toolbar
2015-12-01 11:36:22 +05:30
Rushabh Mehta
37d9d6fdea
Merge pull request #4402 from nabinhait/allow_root_accounts
...
[feature] Allowed custom root accounts in Chart of Accounts
2015-12-01 10:59:44 +05:30
Rushabh Mehta
0cc177f73c
Merge pull request #4400 from nabinhait/total_amount_in_jv
...
[fix] Total Amount in Journal Entry in bank currency
2015-12-01 10:58:34 +05:30
Nabin Hait
8c4e043747
[feature] Allowed custom root accounts in Chart of Accounts
2015-12-01 10:34:43 +05:30
Rushabh Mehta
3617942ff7
Merge pull request #4395 from nabinhait/drop_ship
...
[fix] Invoicing against drop-ship Purchase Order
2015-12-01 10:26:25 +05:30
Nabin Hait
ddc295b4b3
[minor] Set expense account as Stock RBNB for perpetual inventory after mapping
2015-11-30 18:40:28 +05:30
Nabin Hait
621f4cd7c9
[fix] Invoicing against drop-ship Purchase Order
2015-11-30 18:40:28 +05:30
Rushabh Mehta
4750b1fdb7
Merge pull request #4397 from rmehta/setup-wizard-fixes
...
[minor] system settings in setup wizard moved to frappe
2015-11-30 17:17:16 +05:30
Rushabh Mehta
e7bb6544f5
Merge pull request #4401 from nabinhait/pr-for-non-stock-items
...
[fix] Show 'Make Purchase Receipt' button in PO even if all items are non-stock items
2015-11-30 16:56:28 +05:30
Nabin Hait
72e348daf5
[fix] Show 'Make Purchase Receipt' button in PO even if all items are non-stock items
2015-11-30 16:26:49 +05:30
Nabin Hait
6c173e9730
[fix] Total Amount in Journal Entry in bank currency
2015-11-30 16:13:42 +05:30
Rushabh Mehta
0547a7668e
Merge pull request #4398 from nabinhait/bank_reco
...
[fix] Bank Reconciliation in account currency
2015-11-30 16:06:06 +05:30
Nabin Hait
ec1695dbe3
[fix] Bank Reconciliation in account currency
2015-11-30 15:23:46 +05:30
Rushabh Mehta
7909102edd
[minor] system settings in setup wizard moved to frappe
2015-11-30 15:12:45 +05:30
Rushabh Mehta
3f10e0ba2d
Merge pull request #4396 from rmehta/stock-reco-fixes
...
[fixes] stock reco, must always set qty and rate
2015-11-30 14:18:09 +05:30
Rushabh Mehta
9f7de868ef
[fixes] stock reco, must always set qty and rate
2015-11-30 14:16:36 +05:30
Rushabh Mehta
d6c5235d58
[minor] [translation] fix #4343
2015-11-30 11:33:01 +05:30
Rushabh Mehta
32e55e174d
[minor] fix error message
2015-11-30 10:51:29 +05:30
Anand Doshi
8d968ceb94
Merge branch 'develop'
2015-11-27 17:38:46 +05:30
Anand Doshi
47e82d1a49
bumped to version 6.11.3
2015-11-27 18:08:46 +06:00
Anand Doshi
563c243ec6
Revert "[hotfix] total amount in journal entry"
...
This reverts commit 5b03a75970 .
2015-11-27 17:38:17 +05:30
Anand Doshi
7781763efa
Merge branch 'develop'
2015-11-27 17:24:49 +05:30
Anand Doshi
711e675987
bumped to version 6.11.2
2015-11-27 17:54:49 +06:00
Anand Doshi
5b03a75970
[hotfix] total amount in journal entry
2015-11-27 17:24:06 +05:30
Anand Doshi
f4c3819134
Merge branch 'develop'
2015-11-27 15:08:57 +05:30
Anand Doshi
b8591da62c
bumped to version 6.11.1
2015-11-27 15:38:57 +06:00
Anand Doshi
a5f0a7ce06
[change-log]
2015-11-27 15:08:36 +05:30
Rushabh Mehta
9785cd35dc
[minor] quote optional in email digest
2015-11-27 14:50:15 +05:30
Anand Doshi
e38a53443a
Merge pull request #4386 from rmehta/bank-reco-bulk-edit
...
[enhancement] bulk edit in bank reconciliation, #4356
2015-11-27 14:46:58 +05:30
Anand Doshi
70f57eb7f0
[fix] call apply price list, apply pricing rule only if price list is mentioned or there are items in the table
2015-11-27 14:38:01 +05:30
Rushabh Mehta
2d70887aaf
[enhancement] bulk edit in bank reconciliation, #4356
2015-11-27 11:37:18 +05:30
Anand Doshi
15b22c9d7d
Merge pull request #4383 from anandpdoshi/fix/auto-material-request-template
...
[fix] Show Item Name in re-order email. Fixes #4381
2015-11-27 11:31:36 +05:30
Anand Doshi
4b12740e8d
[fix] Shipment in portal. Fixes #4291
2015-11-26 18:22:03 +05:30
Anand Doshi
f942d97a18
[fix] removed UOM Replace Utility from message
2015-11-26 16:08:09 +05:30
Anand Doshi
5cf7a0bf72
[fix] Show Item Name in re-order email. Fixes #4381
2015-11-26 15:11:18 +05:30
Anand Doshi
49abb18928
Merge branch 'develop'
2015-11-26 12:42:07 +05:30
Anand Doshi
7c016d2ee2
bumped to version 6.11.0
2015-11-26 13:12:06 +06:00
Anand Doshi
666fbaff8c
[translations]
2015-11-26 12:40:13 +05:30
Anand Doshi
6674d1dc2b
[change-log]
2015-11-26 12:37:52 +05:30
Anand Doshi
5225a9752b
Merge pull request #4377 from rmehta/jv-print-fix
...
[fix] total amount in journal entry
2015-11-26 11:05:35 +05:30
Rushabh Mehta
0fd67b23f4
[minor] duplicate button on BOM cancel
2015-11-26 10:37:24 +05:30
Rushabh Mehta
b82bdd6f1f
[fix] total amount in journal entry
2015-11-26 09:08:07 +05:30
Rushabh Mehta
131bec67bc
Merge pull request #4373 from anandpdoshi/fix/status-updater-after-not-null
...
[fix] status update - update qty after int float not null change
2015-11-25 18:09:13 +05:30
Anand Doshi
ebae726237
[fix] status update - update qty after int float not null change
2015-11-25 17:55:47 +05:30
Anand Doshi
3314f1cba7
Merge pull request #4374 from rmehta/reorder-fix
...
[minor] re-order at re-order level, not below
2015-11-25 17:54:36 +05:30
Anand Doshi
a4870118ea
Merge pull request #4365 from anandpdoshi/fix/print-hide-if-0
...
[fix] Show Credit/Debit as blank in Journal Entry Account if its value is 0
2015-11-25 17:28:54 +05:30
Rushabh Mehta
03b3d66b90
[minor] re-order at re-order level, not below
2015-11-25 17:23:00 +05:30
Anand Doshi
5c968abcef
[fix] Show Credit/Debit as blank in Journal Entry Account if its value is 0
2015-11-25 16:33:00 +05:30
Anand Doshi
699d9be4b7
Merge pull request #4369 from bohlian/develop
...
Removed Warehouse Requirement for SerialNo Listing
2015-11-25 15:19:47 +05:30
Anand Doshi
ad5cf9b22e
Merge pull request #4370 from rmehta/manual-contribs
...
[manual] contributions via Robert Becht
2015-11-25 15:18:56 +05:30
Anand Doshi
cdb63fd52a
Merge pull request #4366 from anandpdoshi/fix/setup-wizard-fiscal-year
...
[fix] validate fiscal year dates and company name
2015-11-25 15:18:28 +05:30
Rushabh Mehta
bf07cba6a8
[manual] contributions via Robert Becht
2015-11-25 14:42:02 +05:30
bohlian
ff1ab26088
Removed Warehouse Requirement for SerialNo Listing
...
Removed the requirement that Warehouse has to be assigned for Serial Number to appear in the listing.
2015-11-25 16:06:20 +08:00
Anand Doshi
5c3469a01e
[fix] validate fiscal year dates and company name
2015-11-24 17:06:54 +05:30
Anand Doshi
625592e997
Merge pull request #4363 from anandpdoshi/fix/web-form-customization
...
[fix] Changed Country fieldtype to Link in Web Form
2015-11-24 13:26:23 +05:30
Anand Doshi
7221805587
[fix] Changed Country fieldtype to Link in Web Form
2015-11-23 19:20:51 +05:30
Anand Doshi
a0961bc0cf
Merge pull request #4360 from nabinhait/bom_fix
...
[fix] Update exploded materials table from 'Update Cost' button
2015-11-23 16:55:31 +05:30
Nabin Hait
cf3cf2ca1f
[fix] Update exploded materials table from 'Update Cost' button
2015-11-23 15:12:18 +05:30
Anand Doshi
17e9b9444d
Merge pull request #4355 from nabinhait/items_from_product_bundle
...
Get Items from Product Bundle button in purchase cycle
2015-11-23 12:59:41 +05:30
Nabin Hait
c4f4c09e42
Get Items from Product Bundle button in purchase cycle
2015-11-23 12:51:37 +05:30
Anand Doshi
fe1e5884b8
Merge pull request #4354 from nabinhait/pcv
...
[fix] Period closing account should be of type Liability / Equity
2015-11-23 12:35:06 +05:30
Nabin Hait
072c540ae3
[fix] Period closing account should be of type Liability / Equity
2015-11-23 09:52:08 +05:30
Anand Doshi
3012f0d39a
Merge branch 'develop'
2015-11-20 18:10:04 +05:30
Anand Doshi
c6d91b8fb2
bumped to version 6.10.2
2015-11-20 18:40:04 +06:00
Anand Doshi
019111b05c
[translations]
2015-11-20 18:00:11 +05:30
Anand Doshi
ddad05dab3
[fix] Customer de-duplication sql
2015-11-20 17:29:40 +05:30
Nabin Hait
9e425863a1
Merge pull request #4342 from revant/patch-2
...
fix frappe call to update_purchase_receipt_status
2015-11-20 12:47:35 +05:30
Revant Nandgaonkar
bde324a90f
fix frappe call to update_purchase_receipt_status
...
changed update_purchase_order_status to update_purchase_receipt_status
2015-11-20 12:41:58 +05:30
Anand Doshi
b133240298
Merge branch 'develop'
2015-11-20 00:42:15 +05:30
Anand Doshi
56c605f36e
bumped to version 6.10.1
2015-11-20 01:12:15 +06:00
Anand Doshi
8c56adf42b
[hotfix] drop ship patch
2015-11-20 00:41:28 +05:30
Nabin Hait
690023538e
Merge branch 'develop'
2015-11-19 14:34:29 +05:30
Nabin Hait
19ce11aa9c
bumped to version 6.10.0
2015-11-19 15:04:29 +06:00
Nabin Hait
f649013079
Merge pull request #4329 from anandpdoshi/int-float-not-null
...
[enhancement] Int, Currency, Float, Percent as not null and default to 0
2015-11-19 14:30:58 +05:30
Anand Doshi
120ea62acc
[fix] get_balance_on: convert date to string
2015-11-19 14:24:39 +05:30
Anand Doshi
602e8253be
[enhancement] Int, Currency, Float, Percent as not null and default to 0
2015-11-19 13:23:36 +05:30
Nabin Hait
06df19b56a
Reload PO Item before patch
2015-11-19 12:46:37 +05:30
Nabin Hait
0f72750fc8
Merge pull request #4338 from anandpdoshi/fix/salary-slip-earning-deduction
...
[fix] pull earning and deduction on change of employee
2015-11-19 12:06:37 +05:30
Nabin Hait
5f0b93ed71
Merge pull request #4337 from nabinhait/payment_tool_fix
...
[fix] Mapping from Payment Tool
2015-11-19 12:05:38 +05:30
Nabin Hait
5284b22c53
[fix] Mapping from negative outstanding invoice
2015-11-19 11:42:23 +05:30
Nabin Hait
343c1a5cbd
[fix] Mapping from Payment Tool
2015-11-19 11:42:22 +05:30
Nabin Hait
6daa5746f8
Merge pull request #4335 from saurabh6790/drop-ship-fixes-1
...
Move Drop Ship from Purchase Order to Purchase Order Items
2015-11-19 11:40:06 +05:30
Anand Doshi
7763bb5c15
[fix] pull earning and deduction on change of employee
2015-11-18 19:04:03 +05:30
Saurabh
b65c69f9eb
[fixes] drop ship test case fixes
2015-11-18 17:39:26 +05:30
Saurabh
2e292060c5
[fix] Reserved and ordered qty fix for drop ship orders
2015-11-18 17:39:26 +05:30
Saurabh
a4bf02de6c
[fixes] overlapping allocation
2015-11-18 17:39:26 +05:30
Saurabh
3bcf82c7a6
[fixes] test leave allocation record creation
2015-11-18 17:39:26 +05:30
Saurabh
55222a5b82
[fixes] test case fixes
2015-11-18 17:39:26 +05:30
Saurabh
2c85efe31a
[fixes] hide drop ship section and typo
2015-11-18 17:39:26 +05:30
Saurabh
20628f5bd8
[patch] mo drop shipment from purchase order to purchase order item
2015-11-18 17:39:25 +05:30
Saurabh
caf122f015
[fixes] dropship fixes
2015-11-18 17:39:25 +05:30
Nabin Hait
b73f3da02c
Merge pull request #4332 from nabinhait/pi_fix
...
[fix] Check Purchase Receipt mandatory only for stock items
2015-11-18 17:30:29 +05:30
Nabin Hait
f0607b45c5
Merge pull request #4334 from revant/patch-1
...
Mode of Payment validate
2015-11-18 17:29:54 +05:30
Nabin Hait
b45ca3ada0
Merge pull request #4331 from nabinhait/pcv_fix
...
[fix] Allowed Equity accounts in closing account in Period Closing Voucher
2015-11-18 17:15:57 +05:30
Nabin Hait
11e8728715
Merge pull request #4336 from nabinhait/offer_letter_print_format
...
[fix] Don't add pagebreak in print format if terms contains only spaces and newlines
2015-11-18 17:15:34 +05:30
Rushabh Mehta
edc8ab03b5
[minor] fixed description
2015-11-18 16:48:19 +05:30
Revant Nandgaonkar
27c266b081
improve mode_of_payment validate_accounts
...
using frappe.db.get_value instead of frappe.get_list
2015-11-18 13:28:09 +05:30
Nabin Hait
c7fc11a812
[fix] Don't add pagebreak in print format if terms contains only spaces and newlines
2015-11-18 12:59:00 +05:30
Rushabh Mehta
d962d1c96f
[minor] remove feedback line from digest
2015-11-18 10:53:03 +05:30
Revant Nandgaonkar
11f8a0033a
Mode of Payment validate
...
Error when Same Company is entered multiple times in accounts
Error when Company of Ledger account doesn't match with Company Selected
2015-11-17 21:15:00 +05:30
Anand Doshi
da79740cdf
[fix] injection
2015-11-17 18:27:50 +05:30
Nabin Hait
2cf1699937
[fix] Check Purchase Receipt mandatory only for stock items
2015-11-17 17:32:07 +05:30
Nabin Hait
1a3413875f
[fix] Allowed Equity accounts in closing account in Period Closing Voucher
2015-11-17 17:12:44 +05:30
Anand Doshi
3667da1053
[fix] Set user_id as Reply-To in birthday reminder emails
2015-11-16 19:31:20 +05:30
Nabin Hait
a5ac1f024e
Merge branch 'develop'
2015-11-16 18:12:03 +05:30
Nabin Hait
d9e57978b8
bumped to version 6.9.2
2015-11-16 18:42:03 +06:00
Nabin Hait
fee95f1135
Merge pull request #4328 from nabinhait/hotfix1
...
[hotfix]
2015-11-16 18:11:18 +05:30
Nabin Hait
e8f4790d0a
[hotfix]
2015-11-16 18:10:15 +05:30
Nabin Hait
e1feab1d70
Merge branch 'develop'
2015-11-16 17:07:38 +05:30
Nabin Hait
6826ca19b1
bumped to version 6.9.1
2015-11-16 17:37:38 +06:00
Nabin Hait
de46fd62d8
Delete v6_9_1.md
2015-11-16 17:06:51 +05:30
Nabin Hait
c7c2d17823
Merge pull request #4327 from nabinhait/item_fix
...
[change-log] Added change log
2015-11-16 17:05:45 +05:30
Nabin Hait
6f7cd47ac6
[change-log] Added change log
2015-11-16 17:04:48 +05:30
Nabin Hait
11fc0723c9
Merge pull request #4326 from nabinhait/item_fix
...
Item fix and change log
2015-11-16 17:02:02 +05:30
Nabin Hait
94e90bddaa
[change-log] Added change log
2015-11-16 17:01:12 +05:30
Nabin Hait
43ce642649
[fix] Uncheck 'Is Production Item' if it is a non-stock item
2015-11-16 16:50:59 +05:30
Nabin Hait
a975fea3ac
Merge branch 'develop'
2015-11-16 16:42:56 +05:30
Nabin Hait
8e2d76bd63
bumped to version 6.9.0
2015-11-16 17:12:56 +06:00
Anand Doshi
34af16140e
Merge pull request #4315 from rmehta/standard-in-web-form
...
Web form, make standard
2015-11-16 16:24:14 +05:30
Nabin Hait
b3a68c3f40
Merge pull request #4323 from nabinhait/leaves
...
[fix][cleanup] Leave allocation, application and balance report cleanup and fixes
2015-11-16 15:57:04 +05:30
Nabin Hait
9f2fd009b0
Merge pull request #4318 from nabinhait/sal_fix
...
[fix] Check Salary Structure validity
2015-11-16 15:52:52 +05:30
Nabin Hait
3858d12f1d
Merge pull request #4317 from nabinhait/close_feature
...
Show Close button in Delivery Note and Purchase Receipt, only if it is returned and user has submit permission
2015-11-16 15:52:41 +05:30
Nabin Hait
adc93b797a
Merge pull request #4316 from nabinhait/advance_fix
...
[fix] Invoice Outstanding calculation related to advance
2015-11-16 15:50:32 +05:30
Nabin Hait
b6de519571
[fix] Test case fixed
2015-11-16 15:50:10 +05:30
Nabin Hait
58c4646199
[fix][cleanup] Leave allocation, application and balance report cleanup and fixes
2015-11-16 15:35:14 +05:30
Anand Doshi
4fbf01fd9d
[fix] urlencode address list's link
2015-11-16 15:05:49 +05:30
Anand Doshi
1ed82834ce
[fix] re-make setup wizard slides on change of language
2015-11-16 12:58:14 +05:30
Nabin Hait
cd87e76d88
[fix] Check Salary Structure validity
2015-11-15 11:06:55 +05:30
Rushabh Mehta
834b3e6f83
[fix] added missing address hook for website permissions
2015-11-13 14:38:12 +05:30
Nabin Hait
95d025f9aa
Show Close button in Delivery Note and Purchase Receipt, only if it is returned and user has submit permission
2015-11-13 14:22:32 +05:30
Nabin Hait
90c6d7bb47
[fix] Invoice Outstanding calculation related to advance
2015-11-13 14:04:03 +05:30
Nabin Hait
59ba9e3d56
Merge pull request #4314 from anandpdoshi/fix/po-non-stock-receive
...
[fix] Don't show Receive for a Purchase Order having non-stock items, show Close button only for users with Submit rights
2015-11-13 13:59:04 +05:30
Rushabh Mehta
c1531e7008
[minor] catch SSL error on make_thumbnail, via support
2015-11-13 11:39:38 +05:30
Rushabh Mehta
511421b6a3
[minor] [enhancement] ability to make web-form standard, reload web-forms, merge after https://github.com/frappe/frappe/pull/1405
2015-11-13 11:04:50 +05:30
Rushabh Mehta
26c54bb4fb
[minor] new quote
2015-11-13 10:42:20 +05:30
Anand Doshi
2c93d67463
Merge branch 'develop'
2015-11-12 20:37:12 +05:30
Anand Doshi
d4b05fbd51
bumped to version 6.8.4
2015-11-12 21:07:12 +06:00
Anand Doshi
d65a03d437
[fix] material request type in reorder
2015-11-12 20:36:44 +05:30
Anand Doshi
fd288d4211
Merge branch 'develop'
2015-11-12 20:35:48 +05:30
Anand Doshi
f774f75c63
bumped to version 6.8.3
2015-11-12 21:05:48 +06:00
Anand Doshi
e34a1b5fa2
Merge branch 'develop'
2015-11-12 20:01:53 +05:30
Anand Doshi
5f6546c8a5
bumped to version 6.8.2
2015-11-12 20:31:53 +06:00
Anand Doshi
ca5b593e38
[hotfix] setup wizard tax rate
2015-11-12 20:00:50 +05:30
Anand Doshi
cea5479f4d
[fix] Don't show Receive for a Purchase Order having non-stock items, show Close button only for users with Submit rights
2015-11-12 18:39:57 +05:30
Anand Doshi
6303f84d45
[minor] fix test case
2015-11-12 18:11:58 +05:30
Anand Doshi
5dd00a7e89
Merge branch 'develop'
2015-11-12 17:42:41 +05:30
Anand Doshi
87c0e9f03a
bumped to version 6.8.1
2015-11-12 18:12:41 +06:00
Anand Doshi
d40d1e9a59
[optimize] Payment Reconciliation and Payment Tool
2015-11-12 17:42:05 +05:30
Anand Doshi
e19abfbe70
Merge branch 'develop'
2015-11-12 17:10:49 +05:30
Anand Doshi
3fc1c44334
bumped to version 6.8.0
2015-11-12 17:40:48 +06:00
Anand Doshi
bb347f5afa
[translations]
2015-11-12 16:39:58 +05:30
Anand Doshi
938b530ebf
[change-log]
2015-11-12 15:44:09 +05:30
Anand Doshi
28962f26d4
Merge pull request #4307 from frappe/v5.x.x
...
[fix] Stock Entry additional costs patch fix for v4 accounts
2015-11-12 15:30:59 +05:30
Anand Doshi
0b5489ca88
Merge pull request #4312 from nabinhait/delete_uom_replace_utility
...
Deleted Stock UOM Replace Utility
2015-11-12 15:26:41 +05:30
Anand Doshi
adebf31041
Merge pull request #4313 from saurabh6790/doc
...
[help-page] drop-shipping documentation
2015-11-12 15:25:50 +05:30
Anand Doshi
7fbab12c5d
Merge branch 'rmehta-setup-wizard-in-frappe' into develop
2015-11-12 12:48:31 +05:30
Saurabh
11cc43a5a6
[help-page] drop-shipping documentation
2015-11-12 12:39:21 +05:30
Nabin Hait
61fb7ee5b8
Deleted Stock UOM Replace Utility
2015-11-12 12:06:47 +05:30
Rushabh Mehta
37b4d75e4a
[re-org] setup wizard in frappe
2015-11-12 11:45:47 +05:30
Anand Doshi
f71ecbba2c
Merge pull request #4311 from rmehta/auth-rule-cleanup
...
Auth rule cleanup
2015-11-12 11:40:55 +05:30
Anand Doshi
c5c6c0669f
[fix] gross profit
2015-11-12 11:07:32 +05:30
Anand Doshi
fe85b2ea17
Merge branch 'nabinhait-erpnext_docs' into develop
2015-11-10 18:59:55 +05:30
Anand Doshi
1c1eb7018c
[docs] fixed Linked With and title
2015-11-10 18:58:56 +05:30
Anand Doshi
8df5b5e3a1
Merge branch 'develop'
2015-11-10 11:31:29 +05:30
Anand Doshi
39982a5f02
bumped to version 6.7.8
2015-11-10 12:01:29 +06:00
Rushabh Mehta
8f228dd7f9
[fix] [minor] closed not in notifications
2015-11-10 11:28:35 +05:30
Rushabh Mehta
739aa4d51a
[minor] allow pricing rule to have negative discount
2015-11-09 17:05:12 +05:30
Nabin Hait
f9ef0e4e15
[docs] Fixed ref docs, image and video links
2015-11-09 15:41:45 +05:30
Nabin Hait
fc51ec7f58
[docs] Added existing erpnext manual
2015-11-09 14:40:34 +05:30
Nabin Hait
7ba4d02444
[docs] First commit for docs
2015-11-09 14:40:29 +05:30
Anand Doshi
87b5fcb3b5
Merge branch 'develop'
2015-11-09 13:17:49 +05:30
Anand Doshi
7489d29813
bumped to version 6.7.7
2015-11-09 13:47:49 +06:00
Anand Doshi
268d300030
Merge pull request #4297 from frappe/revert-4294-develop
...
Revert b28573ab03
2015-11-09 13:17:04 +05:30
Anand Doshi
7f77002015
Revert b28573ab03
2015-11-09 13:16:24 +05:30
Anand Doshi
b28573ab03
Merge pull request #4294 from neilLasrado/develop
...
[Minor fix] Allowed maintenance schedule to be imported via data import tool
2015-11-09 13:13:41 +05:30
Anand Doshi
c756ff67b0
Merge pull request #4296 from anandpdoshi/sales-order-allow-delivery
...
[fix] Allow both Purchase Order and Delivery from Sales Order, based on drop shipping checkbox
2015-11-09 13:13:14 +05:30
Anand Doshi
4e72ef1421
[fix] Allow both Purchase Order and Delivery from Sales Order, based on drop shipping checkbox
2015-11-09 13:01:49 +05:30
Neil Trini Lasrado
6b173f3a67
Allowed maintenance schedule to be imported via data import tool
2015-11-09 11:38:06 +05:30
Rushabh Mehta
bbcce8cca0
[minor] [cleanup] cosmetic cleanup and fix to start auth rule, did not do big cleanup
2015-11-09 11:28:51 +05:30
Rushabh Mehta
c438c1dec7
[minor] allow pricing rule to have negative discount
2015-11-07 20:28:43 +05:30
Anand Doshi
fcfced624a
Merge branch 'develop'
2015-11-07 15:40:22 +05:30
Anand Doshi
64949bfc4b
bumped to version 6.7.6
2015-11-07 16:10:22 +06:00
Anand Doshi
438c4fb279
[patch] reload doctype Leave Allocation
2015-11-07 15:38:29 +05:30
Rushabh Mehta
ae4c8a6a48
Merge branch 'develop'
2015-11-06 16:54:17 +05:30
Rushabh Mehta
0d7213122a
bumped to version 6.7.5
2015-11-06 17:24:17 +06:00
Rushabh Mehta
4268b0092a
[minor] don't show po / mr buttons if delivered
2015-11-06 16:52:18 +05:30
Rushabh Mehta
64e31e9a4e
[fix] process payroll
2015-11-06 14:47:12 +05:30
Rushabh Mehta
0a0c267edb
Merge branch 'develop'
2015-11-06 11:45:09 +05:30
Rushabh Mehta
1a8d4b6ea7
bumped to version 6.7.4
2015-11-06 12:15:09 +06:00
Rushabh Mehta
97426776bd
Merge pull request #4281 from nabinhait/address_fix
...
[fix] Clear addressed and contacts on a new form
2015-11-06 11:02:31 +05:30
Rushabh Mehta
60e7f01fd4
Merge branch 'develop'
2015-11-06 10:49:53 +05:30
Rushabh Mehta
169089bdde
bumped to version 6.7.3
2015-11-06 11:19:53 +06:00
Rushabh Mehta
c14f80838b
[fix] [hot] leave allocation patch
2015-11-06 10:49:16 +05:30
Rushabh Mehta
a5007db902
Merge branch 'develop'
2015-11-06 10:41:06 +05:30
Rushabh Mehta
0d58501229
bumped to version 6.7.2
2015-11-06 11:11:06 +06:00
Nabin Hait
7c654cd1bb
Leave allocation patch included
2015-11-06 10:37:26 +05:30
Rushabh Mehta
54fc260a42
[minor] trigger link triggers while mapping material request to po to set supplier default currency
2015-11-05 15:26:02 +05:30
Rushabh Mehta
7a39d51366
[fix] pull tax rate in item tax
2015-11-05 15:19:11 +05:30
Rushabh Mehta
79c94426f7
Merge pull request #4277 from nabinhait/gross_profit_fix
...
[fix][report] Buying amount for product bundle in Gross Profit report
2015-11-05 14:04:30 +05:30
Nabin Hait
c3ced9a0b5
[fix][report] Buying amount for product bundle in Gross Profit report
2015-11-05 13:13:31 +05:30
Rushabh Mehta
c825575940
Merge branch 'develop'
2015-11-05 10:51:31 +05:30
Rushabh Mehta
afd3209017
bumped to version 6.7.1
2015-11-05 11:21:31 +06:00
Rushabh Mehta
c541b87bb9
[thumbnail] remove attachment if fails
2015-11-05 10:49:42 +05:30
Rushabh Mehta
b42f3e34ef
Merge branch 'develop'
2015-11-04 18:18:08 +05:30
Rushabh Mehta
6a7edd32aa
bumped to version 6.7.0
2015-11-04 18:48:07 +06:00
Rushabh Mehta
fc307970aa
[translations]
2015-11-04 18:02:45 +05:30
Rushabh Mehta
b9e7cb02f4
[change-log]
2015-11-04 17:02:13 +05:30
Rushabh Mehta
a20a419cb8
Merge pull request #4274 from saurabh6790/drop-shipping
...
[fixes] update delivery status
2015-11-04 16:41:22 +05:30
Saurabh
d805bd7daf
[fixes] update delivery status
2015-11-04 16:40:09 +05:30
Rushabh Mehta
ac53f2dbb1
[test] [fix]
2015-11-04 15:47:08 +05:30
Rushabh Mehta
20a7d820ab
[fix] shot ledger buttons for closed DN / PR
2015-11-04 15:31:41 +05:30
Rushabh Mehta
d48c2394e8
[cleanup] drop ship testing & cleanup
2015-11-04 15:24:04 +05:30
Rushabh Mehta
58101e9e6c
Merge pull request #4272 from nabinhait/report-fix1
...
[report] Added delay in payment column
2015-11-04 13:18:42 +05:30
Rushabh Mehta
666131d2fe
Merge pull request #4271 from saurabh6790/drop-shipping
...
Exclude warehouse from drop ship and re-open status for DN / PR
2015-11-04 13:18:20 +05:30
Rushabh Mehta
118f043335
Merge pull request #4270 from rmehta/email-digest-fix
...
Email digest fixes
2015-11-04 13:18:08 +05:30
Nabin Hait
b4a51ec80b
[report] Added delay in payment column
2015-11-04 13:09:48 +05:30
Saurabh
6197860643
[fixes] test case update
2015-11-04 12:43:40 +05:30
Saurabh
95fbfa4928
[fixes] typo fixes
2015-11-04 12:10:01 +05:30
Saurabh
b7f0a4961e
- no delivery / reserve warehouse in drop ship
...
- “Re-open” in DN / PR after “Stop” / “Close"
- check for closed status in reports
2015-11-04 12:03:54 +05:30
Rushabh Mehta
9c044eefff
[cleanup] re-arrange drop ship field
2015-11-03 18:28:37 +05:30
Rushabh Mehta
5951692db0
[fix] cleanup stop-resume code
2015-11-03 18:20:39 +05:30
Rushabh Mehta
bd4814fbb7
[fix] email digest periods for weekly and monthly
2015-11-03 16:55:33 +05:30
Rushabh Mehta
7d23e4286e
[minor] move item to top in stock module page
2015-11-03 16:25:09 +05:30
Rushabh Mehta
15ea751f3c
Merge pull request #4268 from saurabh6790/drop-shipping
...
[fixes] missing delivered by supplier field
2015-11-03 10:43:27 +05:30
Saurabh
c40148e0da
[fixes] missing delivered by supplier field
2015-11-03 10:32:46 +05:30
Rushabh Mehta
a9dda232b2
[minor] move item to top in stock module page
2015-11-02 17:47:50 +05:30
Rushabh Mehta
1f25c45ad7
Merge pull request #4266 from saurabh6790/fixes1
...
[fixes] args fixes
2015-11-02 16:26:40 +05:30
Saurabh
12ffd914ee
[fixes] args fixes
2015-11-02 16:10:09 +05:30
Rushabh Mehta
b1d8979a59
Merge pull request #4179 from saurabh6790/drop-shipping
...
Drop shipping
2015-11-02 15:43:48 +05:30
Rushabh Mehta
ec2d0030b7
Merge pull request #4265 from nabinhait/jv_fix
...
[cleanup] Make Payment Entry from Order/Invoice
2015-11-02 15:23:01 +05:30
Rushabh Mehta
55d0506155
Merge pull request #4264 from superlack/patch-3
...
Update time_log_batch.py
2015-11-02 15:21:59 +05:30
Rushabh Mehta
5e9b52c273
Merge pull request #4263 from superlack/patch-2
...
Update time_log_batch_detail.json
2015-11-02 15:21:54 +05:30
Rushabh Mehta
00b4663e12
Merge pull request #4262 from saurabh6790/close_pr_dn
...
[feature] Close feature for Purchase Receipt and Delivery Note
2015-11-02 15:21:19 +05:30
Rushabh Mehta
e54a4004ec
Merge pull request #4258 from anandpdoshi/fixes-3to6
...
[fix] issues encountered migrating from v3/4 to 6
2015-11-02 15:20:25 +05:30
Rushabh Mehta
d0b086ca54
Merge pull request #4255 from anandpdoshi/slovene-language
...
added Slovene and updated translations
2015-11-02 15:20:17 +05:30
Rushabh Mehta
8d1191ac8f
Merge pull request #4252 from anandpdoshi/edge-case-website-variant-selection
...
[fix] Edge case in variant selection in website - when variant has less number of attributes than template
2015-11-02 15:20:10 +05:30
Rushabh Mehta
a938b81e1c
Merge pull request #4251 from saurabh6790/hr
...
Leave allocation based on Date range
2015-11-02 15:19:55 +05:30
Saurabh
7cd0ba70d9
[fixes] typo error
2015-11-02 15:18:23 +05:30
Nabin Hait
66340f9894
[cleanup] Make Payment Entry from Order/Invoice
2015-11-02 14:40:47 +05:30
superlack
41f7f7442b
Update time_log_batch.py
2015-11-02 00:39:36 -08:00
superlack
126fb31f9a
Update time_log_batch_detail.json
2015-11-02 00:38:17 -08:00
Saurabh
a8a91cca16
[feature] Close feature for Purchase Receipt and Delivery Note
2015-11-02 12:57:08 +05:30
Saurabh
381385d19a
[fixes] add status 'Closed' in filter creating PR, PI from PO and SI, DN from SO
2015-11-02 11:30:51 +05:30
Anand Doshi
aba8fdd18d
[fix] issues encountered migrating from v3/4 to 6
2015-10-31 22:49:42 +05:30
Nabin Hait
915778fb69
[fix] Clear addressed and contacts on a new form
2015-10-30 14:43:13 +05:30
Anand Doshi
bacc679df5
[language] added Slovene and updated translations
2015-10-30 12:54:27 +05:30
Anand Doshi
b0388d971a
[minor] reduced size of video placeholder
2015-10-30 12:54:10 +05:30
Saurabh
61c9ea938d
[Change Log] change log entry for drop shipment
2015-10-30 12:02:24 +05:30
Saurabh
6956eee790
[fixes] test case and code rewrite
2015-10-29 19:43:35 +05:30
Saurabh
2e65aadb1e
[fixes] reload doc after status update and supplier address fetching
2015-10-29 19:43:35 +05:30
Saurabh
653cffec1e
[change_log and fixes] set print hide, add change_log
2015-10-29 19:43:35 +05:30
Saurabh
cc8f1afa56
[fixes] test case fixes for drop shipping
2015-10-29 19:43:35 +05:30
Saurabh
2f702dcb32
[fixes] bulk close facility, rename Drop Ship to Delivered By Supplier
2015-10-29 19:43:35 +05:30
Saurabh
f857d81f35
[fixes]test case to check updated delivered qty
2015-10-29 19:43:34 +05:30
Saurabh
6d64fe378d
[fixes] remover per_ordered field and update delivered qty from perchase order via delivered by supplier -1
2015-10-29 19:43:34 +05:30
Saurabh
b0ab93f779
[fixes] typo error
2015-10-29 19:43:34 +05:30
Saurabh
df1c1a573f
[fixes] test case for per_ordered
2015-10-29 19:43:34 +05:30
Saurabh
a1f2aec918
[fixes] check ordered and reserved qrt, check closed status for so and po
2015-10-29 19:43:34 +05:30
Saurabh
d8930a776d
[fixes] test case import fix
2015-10-29 19:43:34 +05:30
Saurabh
8a8ef85174
[fixes] reviwe fixes
2015-10-29 19:43:33 +05:30
Saurabh
edba048c14
[fixes] set is_stock_item for test items
2015-10-29 19:43:33 +05:30
Saurabh
b705798ccb
[enhance & fixes] Print Format on PO for Drop Shipping
2015-10-29 19:43:33 +05:30
Saurabh
5e0b0b4b97
[enhance] make PO from SO if supplier is specified
2015-10-29 19:43:33 +05:30
Saurabh
a4efbf0db7
[fixes] check for close status
2015-10-29 19:43:33 +05:30
Saurabh
e930f0f74e
[fixes] filter on supplier list for DropShip, checking closed status
2015-10-29 19:43:33 +05:30
Saurabh
99543f72d8
[fixes] test case for drop shipping and minor fixes for test_reserved_qty_for_partial_delivery & test_reserved_qty_for_partial_delivery_with_packing_list
2015-10-29 19:43:32 +05:30
Saurabh
1a9646739a
[fixes][rename-field-name] drop_ship to is_drop_ship
2015-10-29 19:43:32 +05:30
Saurabh
bd65cb8817
[fixes] field rename and test case for drop ship
2015-10-29 19:43:32 +05:30
Saurabh
98b287565a
[enhance] close purchase order
2015-10-29 19:43:32 +05:30
Saurabh
c6dbe70256
[Fixes] Drop Shipping
2015-10-29 19:43:32 +05:30
Saurabh
556536615e
[minor fix] Status fix in listview
2015-10-29 19:43:31 +05:30
Saurabh
8bd96f1c08
[Test Case] Test case to check drop shipping
2015-10-29 19:43:31 +05:30
Saurabh
5b7e9a1c94
[minor fixes]
2015-10-29 19:43:31 +05:30
Saurabh
c306b21415
[merge fixes]
2015-10-29 19:43:31 +05:30
Anand Doshi
c39cef363c
[fix] stop welcome video if user moves to another page
2015-10-29 18:37:17 +05:30
Nabin Hait
baefec4498
Merge branch 'develop'
2015-10-29 16:35:06 +05:30
Nabin Hait
02a56b4e1a
bumped to version 6.6.7
2015-10-29 17:05:06 +06:00
Nabin Hait
9a6df0341f
Merge pull request #4246 from anandpdoshi/welcome-to-erpnext
...
Show Welcome to ERPNext after completing Setup Wizard
2015-10-29 16:29:10 +05:30
Nabin Hait
5a90e3b2e9
Merge pull request #4254 from nabinhait/pr_qty
...
[fix] Consider Rejected Qty for Qty validation in Purchase Receipt
2015-10-29 16:27:02 +05:30
Anand Doshi
7dab3c1f85
Show Welcome to ERPNext after completing Setup Wizard
2015-10-29 15:32:00 +05:30
Nabin Hait
f9a974385a
[fix] Consider Rejected Qty for Qty validation in Purchase Receipt
2015-10-29 14:54:29 +05:30
Saurabh
20a653e829
[fixes] Test case fixes for leave application
2015-10-29 14:27:57 +05:30
Saurabh
a2c668cb77
[fixes] patch, test cases and validations
2015-10-29 14:27:57 +05:30
Saurabh
d0b0a80be3
[enhacement] remove fiscal year from leave allocation
2015-10-29 14:27:57 +05:30
Anand Doshi
532b9e8bfb
[fix] Edge case in variant selection in website - when variant has less number of attributes than template
2015-10-29 13:20:07 +05:30
Anand Doshi
32e48bb568
Merge pull request #4250 from anandpdoshi/disable-item
...
[enhancement] Ability to disable an Item
2015-10-29 13:12:20 +05:30
Anand Doshi
21e09a2bd8
[enhancement] Ability to disable an Item
2015-10-29 12:39:47 +05:30
Nabin Hait
1aa6e98136
Merge pull request #4249 from nabinhait/cc_fix
...
[fix] Default cost center as per company
2015-10-29 12:28:20 +05:30
Nabin Hait
023c036afa
Merge pull request #4248 from anandpdoshi/item-variant-expired
...
[fix] don't show expired items in website item list. Fixes #4210 .
2015-10-29 12:28:03 +05:30
Nabin Hait
8372c44262
[fix] Default cost center as per company
2015-10-29 11:50:36 +05:30
Anand Doshi
6d69ca6bac
[fix] don't show expired items in website item list. Fixes #4210 .
2015-10-29 11:35:16 +05:30
Nabin Hait
283b55f88c
Merge branch 'develop'
2015-10-28 16:07:13 +05:30
Nabin Hait
4757d0634a
bumped to version 6.6.6
2015-10-28 16:37:13 +06:00
Nabin Hait
dc8ce7f7e9
Merge pull request #4245 from nabinhait/sr_no
...
[fix] Serial No query in Warranty Claim
2015-10-28 15:51:32 +05:30
Nabin Hait
d02375e89d
Merge branch 'anandpdoshi-file-fix' into develop
2015-10-28 15:50:41 +05:30
Nabin Hait
a90a0528aa
Fixed conflict
2015-10-28 15:50:26 +05:30
Nabin Hait
350f9592d3
Merge pull request #4237 from sbkolate/develop
...
[minor] Update Help Video Links in Buying, CRM, Selling #4233
2015-10-28 15:44:39 +05:30
Nabin Hait
43e50de6ef
Merge pull request #4243 from nabinhait/last_pur_rate
...
[patch] Deleted Item-wise Last Purchase Rate report
2015-10-28 15:42:35 +05:30
Nabin Hait
a530f410e3
Merge pull request #4242 from nabinhait/to_warehouse_dn
...
[fix] Ignore users permission for To Warehouse field in Delivery Note
2015-10-28 15:42:16 +05:30
Nabin Hait
bdfb070ed6
[fix] Serial No query in Warranty Claim
2015-10-28 15:38:22 +05:30
Anand Doshi
caa9fc033f
[hotfix] vietnamese translation for Debit Note
2015-10-28 14:34:48 +05:30
Nabin Hait
15bf4e5599
[patch] Deleted Item-wise Last Purchase Rate report
2015-10-28 12:48:32 +05:30
Nabin Hait
6d490e530a
[fix] Ignore users permission for To Warehouse field in Delivery Note
2015-10-28 12:43:45 +05:30
Rushabh Mehta
9b363fe5f1
Merge pull request #4240 from hubdotcom/patch-1
...
change to JavaScript
2015-10-28 10:10:23 +05:30
Jamie
3c5df9f64c
change to JavaScript
2015-10-27 16:37:45 +00:00
Sambhaji Kolate
fd53991dfa
[minor] Update Help Video Links in Buying, CRM, Selling #4233
2015-10-27 17:01:27 +05:30
Anand Doshi
c794ca53fb
[fix] delete file records created via item.py even if website_image file didn't exist
2015-10-27 16:56:42 +05:30
Nabin Hait
fa0adafa82
Merge branch 'develop'
2015-10-27 11:29:35 +05:30
Nabin Hait
99f4b43641
bumped to version 6.6.5
2015-10-27 11:59:35 +06:00
Nabin Hait
fdeab29e94
Removed console.log
2015-10-27 11:23:43 +05:30
Nabin Hait
31755b485f
Merge pull request #4232 from anandpdoshi/variant-smart-selection
...
Numeric attribute selector, smart selection of variant based on attribute combinations
2015-10-27 11:22:54 +05:30
Anand Doshi
3f3696d1eb
[enhancement] [website] numeric attribute selector, smart selection of variant based on attribute combinations
2015-10-26 21:55:34 +05:30
Nabin Hait
e1a478779c
Merge pull request #4231 from nabinhait/pos_fix
...
[fix] Is POS trigger
2015-10-26 18:22:04 +05:30
Nabin Hait
6c6f3789d0
[fix] Is POS trigger
2015-10-26 18:01:12 +05:30
Nabin Hait
044c43a5cb
Merge pull request #4230 from nabinhait/fix26
...
minor fix
2015-10-26 17:43:17 +05:30
Nabin Hait
9ce9c052e4
Merge pull request #4229 from nabinhait/fix25
...
[fix] Account Type in Chart of Accounts
2015-10-26 17:43:11 +05:30
Nabin Hait
83e68bb837
minor fix
2015-10-26 17:40:31 +05:30
Nabin Hait
415df04834
[fix] Account Type in Chart of Accounts
2015-10-26 16:43:09 +05:30
Nabin Hait
6d2d6862d6
Merge pull request #4228 from nabinhait/exchange_rate
...
[fix] account currency is not mandatory in get exchange rate
2015-10-26 15:27:19 +05:30
Nabin Hait
13a65d52dd
Merge pull request #4226 from nabinhait/email_digest
...
[fix] Events in Email Digest
2015-10-26 14:47:09 +05:30
Nabin Hait
6485d4a749
[fix] account currency is not mandatory in get exchange rate
2015-10-26 14:31:17 +05:30
Nabin Hait
2e63c80523
Merge pull request #4220 from nabinhait/fix21
...
Don't delete tax template and pos profile while deleting company transactions
2015-10-26 14:14:44 +05:30
Nabin Hait
23bd21778e
[fix] Events in Email Digest
2015-10-26 14:14:09 +05:30
Nabin Hait
a3f490890d
Merge pull request #4227 from nabinhait/dn_to_wh
...
[fix] Label changed for Target Warehouse in Delivery Note
2015-10-26 13:02:59 +05:30
Nabin Hait
8e3ea32d6d
Merge pull request #4222 from nabinhait/tax_rule
...
Set tax rule based on date
2015-10-26 13:02:21 +05:30
Nabin Hait
c4a1a943ef
Merge pull request #4221 from nabinhait/fix22
...
[fix] Value mapping while making bank entry from Expense Claim
2015-10-26 13:00:52 +05:30
Nabin Hait
abc0b64b68
[fix] Label changed for Target Warehouse in Delivery Note
2015-10-26 11:58:43 +05:30
Nabin Hait
00818bfa90
Set tax rule based on date
2015-10-23 16:26:09 +05:30
Anand Doshi
b9bfe6117e
[optimization] Stock Projected Qty report
2015-10-23 14:49:09 +05:30
Nabin Hait
7a9f46d9d1
[fix] Value mapping while making bank entry from Expense Claim
2015-10-23 13:19:01 +05:30
Nabin Hait
a10b52c6e6
Don't delete tax template and pos profile while deleting company transactions
2015-10-23 13:02:55 +05:30
Rushabh Mehta
5033e7b431
[hot] fix stock projected qty
2015-10-23 10:51:56 +05:30
Rushabh Mehta
e6791ee78e
[fix] digest values in absolute
2015-10-23 10:39:46 +05:30
Anand Doshi
b84ba868e6
Merge branch 'develop'
2015-10-22 22:02:59 +05:30
Anand Doshi
1c501b6aac
bumped to version 6.6.4
2015-10-22 22:32:59 +06:00
Anand Doshi
9a2a6d8fcb
[hotfix] setup wizard is_pro_application if not service
2015-10-22 22:02:22 +05:30
Anand Doshi
0b59d1c78b
Merge branch 'develop'
2015-10-22 21:59:21 +05:30
Anand Doshi
0fbf10797c
bumped to version 6.6.3
2015-10-22 22:29:21 +06:00
Anand Doshi
58344cbb81
[hotfix] setup wizard is_pro_application if not service
2015-10-22 21:57:13 +05:30
Anand Doshi
c6e2c8f79e
Merge branch 'develop'
2015-10-22 19:36:09 +05:30
Anand Doshi
b64b461d53
bumped to version 6.6.2
2015-10-22 20:06:09 +06:00
Anand Doshi
0b93bdcf40
[fix] get_party_gle_currency caching
2015-10-22 19:33:08 +05:30
Anand Doshi
e3910d02a5
Merge branch 'develop'
2015-10-22 18:53:19 +05:30
Anand Doshi
0af146cea6
bumped to version 6.6.1
2015-10-22 19:23:19 +06:00
Anand Doshi
683f756d0f
[fix] Fetch company of employee in leave application
2015-10-22 18:52:15 +05:30
Anand Doshi
d905204e49
[fix] Update expense account in old purchase invoices if missing
2015-10-22 18:49:08 +05:30
Anand Doshi
d8bc40d7f0
[fix] party gle currency validation
2015-10-22 17:55:22 +05:30
Anand Doshi
54059b77a0
Merge branch 'develop'
2015-10-22 17:12:01 +05:30
Anand Doshi
f9f0e2591f
bumped to version 6.6.0
2015-10-22 17:42:00 +06:00
Anand Doshi
5810bf70c7
[change-log]
2015-10-22 17:02:44 +05:30
Anand Doshi
97d8db775e
Merge pull request #4208 from nabinhait/pcv
...
Period Closing Voucher as per multi currency
2015-10-22 16:46:26 +05:30
Nabin Hait
fbe08ec7d0
Period Closing Voucher Test Cases
2015-10-22 16:21:37 +05:30
Nabin Hait
0045c305ac
Period Closing Voucher as per multi currency
2015-10-22 16:21:37 +05:30
Anand Doshi
5dd0fb6e2a
Merge pull request #4213 from nabinhait/serial_no_fix
...
[fix] For Serial No Status
2015-10-22 15:25:11 +05:30
Anand Doshi
e99fff8d08
Merge pull request #4212 from anandpdoshi/leave-application-js-clenup
...
[minor] leave application cleanup
2015-10-22 15:19:57 +05:30
Anand Doshi
b61fed9106
Merge pull request #4205 from nabinhait/expenses_included_in_valuation
...
Expenses Included in Valuation
2015-10-22 15:19:38 +05:30
Nabin Hait
398c83afa5
[fix] For Serial No Status
2015-10-22 15:11:44 +05:30
Anand Doshi
c346484ca4
[minor] leave application cleanup
2015-10-21 19:56:14 +05:30
Nabin Hait
70b7f7f036
minor improvement in patch
2015-10-21 17:40:06 +05:30
Nabin Hait
31c51ef914
[fix] test case for purchase invoice gle
2015-10-21 17:40:06 +05:30
Nabin Hait
be464696cc
[fix][patch] Fix wrong gle for Purchase Invoice against Expenses Included in Valuation account
2015-10-21 17:40:06 +05:30
Anand Doshi
191b2970e9
[translations] updated
2015-10-21 16:59:33 +05:30
Anand Doshi
c50f033722
[language] Added Ukranian language - українська. Closes frappe/translator#57
2015-10-21 16:59:32 +05:30
Anand Doshi
e1e1414894
Merge pull request #4195 from anandpdoshi/journal-entry-posting-date
...
[enhancement] Quick Entry in Journal Entry, remember Posting Date
2015-10-21 16:50:40 +05:30
Anand Doshi
d1441245fb
[fix] variant website page render
2015-10-21 16:36:43 +05:30
Anand Doshi
87da662703
[enhancement] Quick Entry in Journal Entry, remember Posting Date
2015-10-21 16:27:13 +05:30
Anand Doshi
99ba924303
Merge pull request #4207 from rmehta/rename-tool
...
[feature] rename via console merge with frappe/frappe#1349
2015-10-21 14:27:49 +05:30
Anand Doshi
066ff9599a
Merge pull request #4206 from neilLasrado/variant
...
Prevent Template Item from going into infinite loop while saving
2015-10-21 14:20:49 +05:30
Rushabh Mehta
33ebaf479d
[feature] rename via console merge with frappe/frappe#1349
2015-10-21 12:26:37 +05:30
Neil Trini Lasrado
3a573d1a6d
Prevent Template Item from going into infinite loop while saving
2015-10-21 12:20:06 +05:30
Rushabh Mehta
7f66983309
[minor] added column type definition in batch-wise balance history
2015-10-21 12:04:27 +05:30
Rushabh Mehta
2c867fdd73
[fix] email digest cache
2015-10-21 11:13:40 +05:30
Anand Doshi
95dfc2730b
[fix] re-run thumbnail patch
2015-10-20 19:03:30 +05:30
Anand Doshi
558646c6b8
[fix] ignore mandatory when creating customer and contact in cart
2015-10-20 18:57:38 +05:30
Anand Doshi
ea0d98891f
[minor] don't display missing file doc message in item's make thumbnail
2015-10-20 18:57:38 +05:30
Anand Doshi
1b4c5ad1e1
Merge branch 'develop'
2015-10-20 18:35:49 +05:30
Anand Doshi
2678135f5e
bumped to version 6.5.3
2015-10-20 19:05:49 +06:00
Anand Doshi
25ef4ff373
[fix] variant selector display
2015-10-20 18:34:21 +05:30
Anand Doshi
c85a37fe00
Merge branch 'develop'
2015-10-20 17:53:37 +05:30
Anand Doshi
3c3d69f905
bumped to version 6.5.2
2015-10-20 18:23:37 +06:00
Anand Doshi
aed8da40ae
Merge pull request #4198 from nabinhait/mc_fix
...
[fix] Set higher precision for debit, credit and exchange rate field
2015-10-20 17:46:22 +05:30
Anand Doshi
3bc43682f1
Merge pull request #4199 from neilLasrado/item
...
Default value of allow production order in Item master changed to 1
2015-10-20 17:44:26 +05:30
Rushabh Mehta
725816e616
Merge pull request #4203 from anandpdoshi/item-variant-in-website
...
[fix] Patch template item to be shown in website, show variant's description and price on change of attribute
2015-10-20 17:41:26 +05:30
Anand Doshi
7c0eadb451
[fix] Patch template item to be shown in website, show variant's description and price on change of attribute
2015-10-20 17:30:02 +05:30
Neil Trini Lasrado
d4357e80d7
Fixed Test Cases
2015-10-20 16:21:02 +05:30
Neil Trini Lasrado
c0f88e4caf
Default value fot allow production order in Item master changed to 1
2015-10-20 15:51:04 +05:30
Anand Doshi
73286dd9f5
[minor] define email field for Issue
2015-10-20 14:53:22 +05:30
Anand Doshi
1f259ba73d
Merge pull request #4178 from anandpdoshi/item-reorder-if-no-bin
...
[fix] Item Re-order if Bin does not exists and fixed Stock Projected Qty report to show per Warehouse Re-order level
2015-10-20 14:43:20 +05:30
Anand Doshi
7b2b0cd73c
[fix] Item Re-order if Bin does not exists and fixed Stock Projected Qty report to show per Warehouse Re-order level
2015-10-20 14:29:47 +05:30
Anand Doshi
2c749db2a9
Merge pull request #4196 from neilLasrado/develop
...
Fixed issue in Item Variant for Numeric Attributes
2015-10-20 14:28:16 +05:30
Anand Doshi
17c633d00f
[fix] Set fieldtype of description field as Text Editor in Landed Cost Item
2015-10-20 14:26:44 +05:30
Anand Doshi
4ee5b75687
Merge pull request #4200 from nabinhait/fix16
...
[fix] Set fieldtype of description field as Text in Landed Cost Item
2015-10-20 14:24:36 +05:30
Neil Trini Lasrado
a4fad72a65
Considered greater precision of value and increment (better code)
2015-10-20 12:20:49 +05:30
Neil Trini Lasrado
e65ac00f36
Considered greater precision of value and increment
2015-10-20 12:20:49 +05:30
Neil Trini Lasrado
75bd0f7cfe
Fixed issue in Item Variant for Numeric Attributes
2015-10-20 12:20:49 +05:30
Nabin Hait
4d20f3029b
[fix] Set fieldtype of description field as Text in Landed Cost Item
2015-10-20 12:18:19 +05:30
Nabin Hait
c35b35abca
[fix] Set higher precision for exchange rate field
2015-10-20 12:11:51 +05:30
Anand Doshi
17dc249841
[fix] rollback if exception in bulk rename
2015-10-20 12:11:26 +05:30
Anand Doshi
12af47918d
[fix] rename tool
2015-10-20 12:02:39 +05:30
Anand Doshi
84ca0197e4
Merge pull request #4197 from saurabh6790/fixes
...
[minor][fix] set default fiscal year for holiday list calendar view
2015-10-20 11:40:00 +05:30
Anand Doshi
3395e7a2e4
[fix] Daily digest date format
2015-10-20 08:48:43 +05:30
Anand Doshi
25956d6282
[fix] Item thumbnail
2015-10-20 08:48:43 +05:30
Saurabh
ba2133cba2
[minor][fix] set default fiscal year for holiday list calendar view
2015-10-19 19:20:11 +05:30
Anand Doshi
28e3d63280
Merge branch 'develop'
2015-10-19 19:10:58 +05:30
Anand Doshi
414660313a
bumped to version 6.5.1
2015-10-19 19:40:58 +06:00
Anand Doshi
c52a601e87
Merge pull request #4189 from nabinhait/dn_target_wh_testcase
...
Test case fixed for swtiching valuation method
2015-10-19 19:09:27 +05:30
Anand Doshi
7a869b0dca
[hotfix] print in patch
2015-10-19 17:33:40 +05:30
Nabin Hait
6f64a78ecf
Test case fixed for swtiching valuation method
2015-10-19 16:53:35 +05:30
Nabin Hait
608bbc7850
Test case fixed for swtiching valuation method
2015-10-19 16:53:35 +05:30
Anand Doshi
639826e888
Merge branch 'develop'
2015-10-19 16:30:33 +05:30
Anand Doshi
16b2c51988
bumped to version 6.5.0
2015-10-19 17:00:33 +06:00
Anand Doshi
76e9ba1e76
[change-log]
2015-10-19 16:03:34 +05:30
Anand Doshi
9dad86c189
Merge pull request #4190 from nabinhait/income_expense_account_query
...
[fix] Allowed accounts with account type='Income Account' for default income account in item
2015-10-19 15:43:32 +05:30
Anand Doshi
5302b46955
Merge pull request #4183 from nabinhait/multi_currency_fix
...
Multi currency fix
2015-10-19 15:32:24 +05:30
Nabin Hait
afd14f6f0e
[fix] Allowed accounts with account type='Income Account' for default income account in item
2015-10-19 15:27:58 +05:30
Anand Doshi
05584d6d8b
Merge pull request #4191 from rmehta/email-digest-quotes
...
[enhancement] add a quote with email digest
2015-10-19 15:18:20 +05:30
Nabin Hait
aa015902d5
Validate currency of default receivable/payable accounts
2015-10-19 15:10:11 +05:30
Nabin Hait
2873f2e7de
Validate currency of default receivable/payable accounts
2015-10-19 15:10:11 +05:30
Rushabh Mehta
64fd970a8a
Merge pull request #4193 from anandpdoshi/attach-as-small-text
...
[fix] change attach fields to small text
2015-10-19 14:58:57 +05:30
Anand Doshi
b4e9c1da64
[fix] thumbnail generation for item
2015-10-19 12:57:19 +05:30
Anand Doshi
1d093a4039
[fix] change attach fields to small text
2015-10-19 12:56:29 +05:30
Rushabh Mehta
fe9717cb9c
[enhancement] add a quote with email digest
2015-10-19 12:35:07 +05:30
Anand Doshi
d665a07621
[fix] remove label 'Column Break'
2015-10-16 15:44:28 +05:30
Rushabh Mehta
2a1ba886f1
[patch-fix]
2015-10-15 16:56:53 +05:30
Rushabh Mehta
55f1ea05da
[release] Added change log
2015-10-15 16:32:36 +05:30
Rushabh Mehta
2e7f9d2b8f
[fixes] email digest
2015-10-15 16:31:16 +05:30
Rushabh Mehta
3a519f269d
Merge pull request #4175 from anandpdoshi/dynamic-linked-with
...
[fix] exclude gl entry and stock ledger entry in linked with. Depends on frappe/frappe#1339
2015-10-15 14:25:18 +05:30
Rushabh Mehta
4c0d0793a3
Merge pull request #4174 from saurabh6790/shopping_cart
...
[fix] order.html rate display
2015-10-15 14:01:46 +05:30
Rushabh Mehta
d3b8a74508
[test] fix, force values in target warehouse too
2015-10-15 13:23:10 +05:30
Anand Doshi
77760db89c
[fix] strip whitespace in setup wizard args
2015-10-15 12:54:40 +05:30
Anand Doshi
1d23ebb51d
[fix] exclude gl entry and stock ledger entry in linked with. Depends on frappe/frappe#1339
2015-10-15 12:54:40 +05:30
Rushabh Mehta
ba5b0e8458
[test] [fix] print values for failing test
2015-10-15 12:45:42 +05:30
Rushabh Mehta
14a908bdec
[test] [fix] abs(valuation_rate) for moving average
2015-10-15 12:28:20 +05:30
Rushabh Mehta
9f436a7c71
[fix] [exchange-rate] let user defined exchange rate take preceedence
2015-10-15 11:57:46 +05:30
Rushabh Mehta
746fd90625
[fix] [exchange-rate] let user defined exchange rate take preceedence
2015-10-15 11:50:38 +05:30
Rushabh Mehta
f861856ed9
[fix] do not check purchase invoice uniqueness for cancelled documents
2015-10-15 11:37:34 +05:30
Rushabh Mehta
f94f153078
[test] fixes
2015-10-15 11:31:59 +05:30
Rushabh Mehta
c9bacedbfe
[test] fixes
2015-10-15 11:00:34 +05:30
Saurabh
c0cee82727
[small fixes] frozen customer testcase
2015-10-14 18:03:07 +05:30
Saurabh
4c53931363
[fixes and test case] test case to avoid duplicate customer name exection
2015-10-14 18:03:07 +05:30
Saurabh
53f7e6281c
[fix] Duplicate Customer Name Error
2015-10-14 18:03:07 +05:30
Saurabh
9f235b891f
[fix] order.html rate display
2015-10-14 18:03:07 +05:30
Rushabh Mehta
c4d4c7feb0
[fix] repost_actual_qty fix
2015-10-14 17:37:28 +05:30
Rushabh Mehta
ee6862b277
[fix] VARCHAR lengths as 140
2015-10-14 17:28:35 +05:30
Rushabh Mehta
53f77ad5e8
Merge pull request #4125 from rmehta/variant-in-website
...
[enhancement] add variants in website
2015-10-14 16:22:36 +05:30
Rushabh Mehta
fb73151da6
[fixes]
2015-10-14 16:22:01 +05:30
Rushabh Mehta
6e322d0a02
[enhancement] use thumbnails in grid views, patch to make thumbnails
2015-10-14 16:21:24 +05:30
Rushabh Mehta
73e73795f1
[minor] Added 'Invite User' in Contact
2015-10-14 16:20:39 +05:30
Rushabh Mehta
80d2a55342
[enhancement] add variants in website
2015-10-14 16:16:00 +05:30
Rushabh Mehta
9cbf6b1b22
Merge pull request #4114 from anandpdoshi/varchar-140
...
Limit varchar length to 140 instead of 255 to mitigate Row Size Too Large error
2015-10-14 16:14:53 +05:30
Anand Doshi
41dd2c458b
[minor] pass does not exist error
2015-10-14 16:13:49 +05:30
Anand Doshi
71ebad5668
Limit varchar length to 140 instead of 255 to mitigate Row Size Too Large error
2015-10-14 16:13:49 +05:30
Rushabh Mehta
b4c0e94e99
Merge pull request #4113 from rmehta/email-digest-cleanup
...
[cleanup] Email Digest
2015-10-14 15:53:53 +05:30
Rushabh Mehta
73f1dc4edf
[cleanup] added unsubscribe to email digest
2015-10-14 15:53:37 +05:30
Rushabh Mehta
174299124f
[cleanup] [wip] email digest
2015-10-14 15:53:37 +05:30
Rushabh Mehta
c27748b2b3
Merge pull request #4040 from nabinhait/dn_target_warehouse
...
Delivery to target warehouse
2015-10-14 15:29:54 +05:30
Rushabh Mehta
626ba1bb81
[translations] added bn, da-DK, es-PE, si
2015-10-14 15:24:42 +05:30
Rushabh Mehta
591f047974
Merge pull request #4163 from neilLasrado/develop
...
Cost Center - Income Account
2015-10-14 15:20:11 +05:30
Nabin Hait
38e4c6f2af
Allow same serial nos for raw materials and fg item in repack / manufacture entry
2015-10-13 18:37:39 +05:30
Neil Trini Lasrado
58e9590850
Fixed issues with Permissions in Company Doctype
2015-10-13 17:45:43 +05:30
Nabin Hait
03afb45e34
[fix] Validate deletion of serial no
2015-10-13 15:46:42 +05:30
Nabin Hait
d91382dbf3
[fix] serial no status
2015-10-13 15:46:42 +05:30
Nabin Hait
e07958bbda
Change log and sopnsors for delivery to target warehouse
2015-10-13 15:46:42 +05:30
Nabin Hait
b445be3552
Test case for delivery to target warehouse
2015-10-13 15:46:42 +05:30
Nabin Hait
c865f229fb
Target Warehouse in Delivery Note and Sales Invoice and removed Serial No status
2015-10-13 15:46:42 +05:30
Neil Trini Lasrado
ec5deb6e48
Changed label in Company
2015-10-13 15:28:12 +05:30
Neil Trini Lasrado
486bf2e113
Added Change Log
2015-10-13 15:17:53 +05:30
Neil Trini Lasrado
f49b085625
Allowed Income account to be added to Cost Center
2015-10-13 14:54:39 +05:30
Rushabh Mehta
adcaf75bb0
Merge branch 'develop'
2015-10-13 14:46:15 +05:30
Rushabh Mehta
4f4fc45ae6
bumped to version 6.4.7
2015-10-13 15:16:15 +06:00
Rushabh Mehta
079d0b7108
Merge pull request #4161 from rmehta/sales-order-status
...
[fix] Sales Order status for Maintenance
2015-10-13 12:38:00 +05:30
Rushabh Mehta
86125b2b9f
[fix] sales order status for maintenance
2015-10-13 12:31:05 +05:30
Rushabh Mehta
22d0d586ab
[minor] [typo]
2015-10-13 12:30:21 +05:30
Rushabh Mehta
eb62aed8c7
Merge pull request #4157 from nabinhait/bin
...
[fix][patch] Delete duplicate bins
2015-10-12 18:39:16 +05:30
Rushabh Mehta
60f1739ca5
Merge pull request #4158 from rmehta/journal-entry-title-fix
...
[fix] set title in Journal Entry only if not set
2015-10-12 18:35:49 +05:30
Rushabh Mehta
5f349a67c9
Merge pull request #4156 from rmehta/item-section-fix
...
[fix] [minor] collapsible section for Item - removed custom script
2015-10-12 18:35:38 +05:30
Rushabh Mehta
fd294eb981
Merge pull request #4154 from rmehta/sales-analytics-fix
...
[minor] [fix] Use customer_name in Sales Analytics
2015-10-12 18:32:39 +05:30
Rushabh Mehta
d256055a8c
Merge pull request #4153 from rmehta/stock-entry-fix
...
[fix] [minor] stock_entry.py error for None qty
2015-10-12 18:32:28 +05:30
Rushabh Mehta
cefa106a06
Merge pull request #4151 from anandpdoshi/purchase-invoice-letterhead
...
[fix] Added Letter Head field to Purchase Invoice
2015-10-12 18:30:25 +05:30
Rushabh Mehta
67ecfcf52c
Merge pull request #4148 from saurabh6790/erp_support
...
[minor fix], escape % char
2015-10-12 18:30:13 +05:30
Nabin Hait
b7e46c4ed9
[fix][patch] Delete duplicate bins
2015-10-12 18:28:50 +05:30
Rushabh Mehta
bc5ecfff06
Merge pull request #4146 from nabinhait/fix10
...
[fix] Multiple minor fixes
2015-10-12 18:27:02 +05:30
Rushabh Mehta
8fa4845d00
[fix] set title in Journal Entry only if not set
2015-10-12 16:59:52 +05:30
Rushabh Mehta
d4882653c3
[fix] [minor] collapsible section for Item - removed custom script
2015-10-12 16:45:53 +05:30
Anand Doshi
9a4d165ba2
[fix] get_party_details.js - set posting_date if args are initialised
2015-10-12 16:23:51 +05:30
Rushabh Mehta
a7099eaa8d
[minor] [fix] Use customer_name in Sales Analytics
2015-10-12 16:22:10 +05:30
Anand Doshi
4b72d05793
[fix] get allocated_percentage from party's sales team
2015-10-12 16:15:52 +05:30
Rushabh Mehta
a30f3ea1f9
[fix] [minor] stock_entry.py error for None qty
2015-10-12 16:12:52 +05:30
Rushabh Mehta
3b6a8af0da
Merge pull request #4150 from rmehta/project-title-fix
...
[fix] copy task titles with project
2015-10-12 15:57:04 +05:30
Anand Doshi
4fa69780a8
[fix] Added Letter Head field to Purchase Invoice
2015-10-12 15:55:24 +05:30
Rushabh Mehta
2dc619ae1f
[fix] copy task titles with project
2015-10-12 15:55:12 +05:30
Nabin Hait
fc9031924e
[fix] Field type of Age field converted to Int
2015-10-12 15:47:07 +05:30
Saurabh
e14124198d
minor fix, escape % char
2015-10-12 15:08:09 +05:30
Nabin Hait
51e980dd2c
[fix] Multiple minor fixes
2015-10-10 18:10:05 +05:30
Rushabh Mehta
95781919fb
[fix] sales order notification
2015-10-08 11:50:04 +05:30
Rushabh Mehta
c03cba9d17
[fix] sales order notification
2015-10-08 11:46:32 +05:30
Nabin Hait
72cd206286
Merge branch 'develop'
2015-10-07 17:27:23 +05:30
Nabin Hait
9801745090
bumped to version 6.4.6
2015-10-07 17:57:23 +06:00
Anand Doshi
7866c6e6db
[fix] modified in sales order and purchase order
2015-10-07 17:26:19 +05:30
Nabin Hait
5812fdb574
Merge branch 'develop'
2015-10-07 14:40:32 +05:30
Nabin Hait
4c502bcd26
bumped to version 6.4.5
2015-10-07 15:10:32 +06:00
Nabin Hait
714948c867
Merge pull request #4136 from nabinhait/uom
...
[fix] Fetch UOM Conversion Factor from template if not specified in variants
2015-10-07 14:30:18 +05:30
Nabin Hait
8f3b360f83
Merge pull request #4133 from saurabh6790/erp_support
...
Calendar view for holiday listing
2015-10-07 14:29:38 +05:30
Nabin Hait
314086d6c0
[fix] Fetch UOM Conversion Factor from template if not specified in variants
2015-10-07 11:55:08 +05:30
Nabin Hait
bcd655a985
Merge pull request #4109 from rmehta/fix-sales-purchase-order-status
...
[fix] sales & purchase order status
2015-10-07 11:34:30 +05:30
Saurabh
b0dbdc1439
minor fixes
2015-10-07 11:27:25 +05:30
Nabin Hait
37b0bf257d
Merge pull request #4117 from nabinhait/sample_data
...
[fix] Create sample opportunity and quotation only if Customer exists
2015-10-07 11:25:50 +05:30
Nabin Hait
c5a25f44e1
Merge pull request #4119 from nabinhait/fix3
...
[fix] Return account currency only if account provided
2015-10-07 11:25:19 +05:30
Nabin Hait
8dafa376ab
Merge pull request #4123 from nabinhait/fix4
...
[fix] allowed more than 2 currencies in Journal Entry
2015-10-07 11:24:45 +05:30
Saurabh
74eb8e34da
[Fixes] minor fix for fiscal year in holiday list
2015-10-07 11:17:14 +05:30
Nabin Hait
5c66fb7631
Merge pull request #4130 from nabinhait/reports
...
[fix][report] Left join used in pending reports
2015-10-07 11:15:36 +05:30
Nabin Hait
be3b3b2107
Merge pull request #4132 from nabinhait/credit_limit
...
minor fix in credit limit
2015-10-07 11:15:02 +05:30
Nabin Hait
9ab09fd1d6
Merge pull request #4134 from nabinhait/valuation_rate
...
[fix] Valuation Rate in Stock Balance report
2015-10-07 11:09:56 +05:30
Nabin Hait
8a7bdd5a92
[fix] Valuation Rate in Stock Balance report
2015-10-06 18:46:56 +05:30
Saurabh
1d753c92b1
Calendar view for holiday listing
2015-10-06 15:21:23 +05:30
Nabin Hait
54ecc8ebba
minor fix in credit limit
2015-10-06 14:28:41 +05:30
Nabin Hait
f4edaef481
[fix][report] Left join used in pending reports
2015-10-06 12:48:04 +05:30
Nabin Hait
ebbd163903
[fix] allowed more than 2 currencies in Journal Entry
2015-10-05 13:21:38 +05:30
Nabin Hait
8954b24b22
[fix] Return account currency only if account provided
2015-10-04 12:27:46 +05:30
Nabin Hait
ae92fc7f35
[fix] Create sample opportunity and quotation only if Customer exists
2015-10-03 13:42:44 +05:30
Rushabh Mehta
0bc3ca02f3
[fix] default contact for website
2015-10-03 12:08:43 +05:30
Rushabh Mehta
d10ba853e6
[fix] sales & purchase order status
2015-10-02 17:16:51 +05:30
Anand Doshi
5bcf8315de
Merge branch 'develop'
2015-10-02 16:35:36 +05:30
Anand Doshi
789a798e36
bumped to version 6.4.4
2015-10-02 17:05:36 +06:00
Nabin Hait
ee1169dac7
Merge pull request #4112 from nabinhait/fix1
...
Minor fix
2015-10-02 16:27:49 +05:30
Nabin Hait
fbef1fdf3a
Minor fix
2015-10-02 16:26:18 +05:30
Anand Doshi
4358e1cd46
Merge pull request #4111 from nabinhait/payment_reco_patch
...
[patch] Fix affected Journal Entries due to reconciliation
2015-10-02 16:05:03 +05:30
Nabin Hait
7a287a9153
[patch] Fix affected Journal Entries due to reconciliation
2015-10-02 16:00:42 +05:30
Anand Doshi
5a49ded5d9
Merge branch 'develop'
2015-10-02 12:43:27 +05:30
Anand Doshi
71f23acc2b
bumped to version 6.4.3
2015-10-02 13:13:27 +06:00
Anand Doshi
1a1f790150
[fix] test case
2015-10-02 12:34:18 +05:30
Rushabh Mehta
3c54e9779b
Merge pull request #4108 from nabinhait/payment_reco
...
[fix] Payment Reconciliation in multi-currency
2015-10-02 12:32:54 +05:30
Nabin Hait
db48b7d764
[fix] Payment Reconciliation in multi-currency
2015-10-02 12:05:55 +05:30
Rushabh Mehta
83c0899c83
[fix] [minor] default ranges for demo
2015-10-02 11:31:37 +05:30
Nabin Hait
e5047ec90a
Merge pull request #4106 from anandpdoshi/payment-tool-amount
...
In Payment Tool, Set Payment Amount = Outstanding Amount if checked
2015-10-02 10:39:57 +05:30
Anand Doshi
d9ab725be4
[fix] In Payment Tool, Set Payment Amount = Outstanding Amount if checked
2015-10-01 19:17:02 +05:30
Anand Doshi
7afaeb0820
[fix] the case when party account currency is missing
2015-10-01 18:55:43 +05:30
Anand Doshi
da2d8b958d
Merge branch 'develop'
2015-10-01 14:01:22 +05:30
Anand Doshi
ba48f82e03
bumped to version 6.4.2
2015-10-01 14:31:22 +06:00
Anand Doshi
8e7e128e81
Merge pull request #4104 from nabinhait/addresses_and_contacts
...
[fix] get permission query condition if no permitted links
2015-10-01 14:00:38 +05:30
Anand Doshi
0353569e8b
Merge pull request #4103 from nabinhait/monthly_attendance_sheet
...
[fix] Month issue fixed in Monthly Attendance Sheet
2015-10-01 13:58:33 +05:30
Anand Doshi
665e2f5418
Merge pull request #4100 from nabinhait/general_ledger_report
...
[fix] General Ledger report fixed
2015-10-01 13:56:13 +05:30
Nabin Hait
dace2b6796
[fix] get permission query condition if no permitted links
2015-10-01 13:54:46 +05:30
Nabin Hait
712b02593a
[fix] Month issue fixed in Monthly Attendance Sheet
2015-10-01 12:35:54 +05:30
Anand Doshi
d2a60fd727
Merge pull request #4102 from nabinhait/lead_email
...
[fix] Validate duplicate email ids in Lead
2015-10-01 12:07:37 +05:30
Nabin Hait
f924e08b93
[fix] Validate duplicate email ids in Lead
2015-10-01 11:51:48 +05:30
Nabin Hait
5c623dae4d
[fix] General Ledger report fixed
2015-10-01 11:22:15 +05:30
Anand Doshi
e2c3d40b57
[hotfix] Payment Reconciliation Invoice Type
2015-10-01 11:21:26 +05:30
Anand Doshi
673887455f
[fix] Show Contribution (%) in Sales Team table in Customer Form
2015-10-01 11:21:25 +05:30
Anand Doshi
63199e486b
Merge branch 'develop'
2015-09-30 20:51:00 +05:30
Anand Doshi
bf7294cf5c
bumped to version 6.4.1
2015-09-30 21:20:59 +06:00
Anand Doshi
8aa06a809a
Merge pull request #4096 from nabinhait/jv_reference
...
Repost GL Entries for Journal Entries where reference name is missing
2015-09-30 19:44:21 +05:30
Nabin Hait
72d2d682ae
Repost GL Entries for Journal Entries where reference name is missing
2015-09-30 18:50:54 +05:30
Anand Doshi
21f6ea6f7e
[hotfix] remove allow on submit from item tables
2015-09-30 18:45:29 +05:30
Anand Doshi
185f488c51
Merge branch 'develop'
2015-09-30 17:23:52 +05:30
Anand Doshi
f3006972d5
bumped to version 6.4.0
2015-09-30 17:53:52 +06:00
Anand Doshi
dccc6bc11d
[change-log]
2015-09-30 17:19:51 +05:30
Anand Doshi
15d2c89939
Merge remote-tracking branch 'upstream/master' into develop
...
Conflicts:
erpnext/accounts/report/general_ledger/general_ledger.py
2015-09-30 17:13:58 +05:30
Anand Doshi
ca4c8a2a46
[translations]
2015-09-30 17:10:58 +05:30
Anand Doshi
c320fe541d
Merge pull request #4067 from anandpdoshi/remove-party-account-currency
...
Remove party_account_currency from Customer and Supplier, and use currency derived from get_party_account
2015-09-30 16:55:24 +05:30
Anand Doshi
f40a87511e
Merge pull request #4091 from rmehta/repack-allow-low-rate
...
[fix] remove validation to disallow lower rate
2015-09-30 16:46:31 +05:30
Anand Doshi
4945b94950
[fix] added validation to match account currency with existing gle and test case
2015-09-30 16:41:15 +05:30
Rushabh Mehta
cb96b61449
[fix] remove validation to disallow lower rate
2015-09-30 16:22:05 +05:30
Anand Doshi
248c867a2c
[minor] removed test case for party multi-currency validation, since party multi-currency is now based on account
2015-09-30 15:11:13 +05:30
Anand Doshi
da98ab6f3c
[fix] Only 1 account per company for a party
2015-09-30 15:11:12 +05:30
Anand Doshi
cd0989e051
Added method get_account_currency
2015-09-30 15:11:12 +05:30
Anand Doshi
b20baf894f
[fix] Remove party_account_currency from Customer and Supplier, and use currency derived from get_party_account
2015-09-30 15:11:12 +05:30
Nabin Hait
d3cf4f1264
Merge pull request #4075 from anandpdoshi/journal-entry-get-exchange-rate
...
return exchange rate as 1 if no account is specified
2015-09-30 15:05:41 +05:30
Anand Doshi
2dbe2b63b2
Merge pull request #4088 from anandpdoshi/address-contact-permissions
...
Apply permissions on address and contact based on permissions of Customer, Supplier
2015-09-30 12:19:50 +05:30
Anand Doshi
edba8f5582
[fix] Print 'Attach' field in Stock Entry Detail
2015-09-30 11:50:08 +05:30
Anand Doshi
89b8d11f9c
[fix] Apply permissions on address and contact based on permissions of Customer, Supplier
2015-09-29 20:11:57 +05:30
Anand Doshi
19a33994da
[cleanup] removed desk_home and desk_home_flows from conf.js
2015-09-29 20:06:22 +05:30
Rushabh Mehta
89349d3ae3
[fix] [payment-reconciliation] ignore rows with blank invoice numbers
2015-09-29 16:39:53 +05:30
Anand Doshi
f6a31a568a
Merge pull request #4085 from rmehta/bulk-priority
...
[enhancement] lower priority for newsletter emails
2015-09-29 15:25:13 +05:30
Rushabh Mehta
4bcbcd29f7
[enhancement] lower priority for newsletter emails
2015-09-29 14:58:45 +05:30
Anand Doshi
740a11263f
[minor] validate invoice number is selected in Payment Reconciliation
2015-09-29 12:55:11 +05:30
Anand Doshi
142859f36e
Merge pull request #4076 from anandpdoshi/shopping-cart-order
...
check doc.has_website_permission in order.html. Merge after frappe/frappe#1316
2015-09-28 19:40:17 +05:30
Anand Doshi
6534ad082d
Merge pull request #4069 from anandpdoshi/round-status-updater-percentages
...
Round status update percentages to 2 decimals
2015-09-28 19:40:01 +05:30
Anand Doshi
6361ae3495
Merge branch 'rmehta-backup-cleanup' into develop
2015-09-28 19:38:06 +05:30
Rushabh Mehta
7f75dbf061
[cleanup] remove backup manager
2015-09-28 19:12:54 +05:30
Anand Doshi
199d8a44fc
[fix] check doc.has_website_permission in order.html
2015-09-28 19:04:42 +05:30
Rushabh Mehta
72b1128467
[fixes] accounts controller add flt
2015-09-28 17:29:46 +05:30
Anand Doshi
d6cb55ad1a
[fix] return exchange rate as 1 if no account is specified
2015-09-28 17:20:02 +05:30
Anand Doshi
c76e34d7de
[fix] In get_bom_items_as_dict don't filter by is_pro_applicable for multi-level bom
2015-09-28 17:01:44 +05:30
Anand Doshi
33b10faf94
Merge pull request #4074 from anandpdoshi/multi-level-bom-fetch
...
[fix] In get_bom_items_as_dict don't filter by is_pro_applicable for multi-level bom
2015-09-28 17:00:52 +05:30
Anand Doshi
d970b001a4
[fix] Round status update percentages to 2 decimals
2015-09-28 16:52:22 +05:30
Anand Doshi
d767fb6134
[fix] In get_bom_items_as_dict don't filter by is_pro_applicable for multi-level bom
2015-09-28 16:44:48 +05:30
Rushabh Mehta
6239923340
Merge pull request #4071 from gmarke/patch-2
...
Update get_item_details.py
2015-09-28 10:18:56 +05:30
gmarke
e5a31462fe
Update get_item_details.py
...
like this it will be possible to correctly handle cost center for stock entries when no default cost center per company is set
2015-09-27 09:38:01 +02:00
Anand Doshi
6f39300d43
Merge pull request #4068 from anandpdoshi/due-date-validation
...
if no party, don't validate due date based on credit days
2015-09-25 17:31:33 +05:30
Anand Doshi
0ca587e018
[fix] if no party, don't validate due date based on credit days
2015-09-25 16:32:14 +05:30
Rushabh Mehta
8ffe12ebe4
[chart-of-accounts] added default for Guatemala
2015-09-25 15:40:33 +05:30
Anand Doshi
8579af371c
Merge pull request #4057 from rmehta/gl-report-fix
...
GL Report Fix
2015-09-25 12:30:26 +05:30
Rushabh Mehta
b5ff9421e1
[optimize] customer outstanding query
2015-09-25 12:25:12 +05:30
Rushabh Mehta
ba8ec17f0b
Merge pull request #4065 from nabinhait/receivable_payable
...
[fix] Fetch gl entries in receivable/payable report only if party mentioned
2015-09-25 11:34:14 +05:30
Nabin Hait
44bd3b2601
[fix] Fetch gl entries in receivable/payable report only if party mentioned
2015-09-25 10:33:51 +05:30
Rushabh Mehta
9d40eca428
Merge pull request #4064 from nabinhait/trial_balance_for_party
...
[report] Trial Balance for Party
2015-09-25 10:01:44 +05:30
Nabin Hait
1b6c00e2c7
[report] Trial Balance for Party
2015-09-25 09:18:03 +05:30
Anand Doshi
52efde31e7
Merge branch 'develop'
2015-09-24 17:31:12 +05:30
Anand Doshi
f723032fd7
bumped to version 6.3.2
2015-09-24 18:01:11 +06:00
Anand Doshi
3297c43bdf
[fix] Tax Rule permission to Account Manager
2015-09-24 17:29:28 +05:30
Anand Doshi
aea250bc5a
[fix] [patch] fix missing default lead
2015-09-24 16:31:36 +05:30
Anand Doshi
d37d4dfdec
[fix] applicable territory patch and tax rule tests
2015-09-24 15:44:39 +05:30
Anand Doshi
0ea68b33ed
Merge branch 'develop'
2015-09-24 15:23:05 +05:30
Anand Doshi
7f96c20f5b
bumped to version 6.3.1
2015-09-24 15:53:05 +06:00
Anand Doshi
e75d947867
[fix] [patch] convert applicable territory
2015-09-24 15:22:12 +05:30
Anand Doshi
bba0a5d38f
[fix] [patch] tax rule
2015-09-24 15:11:24 +05:30
Anand Doshi
953e97536a
[fix] [patch] tax rule
2015-09-24 15:05:06 +05:30
Anand Doshi
e74d7ca33e
[fix] [patch] tax rule
2015-09-24 15:04:15 +05:30
Rushabh Mehta
8f2b8afcb7
[fix] gl entry report if not filtered
2015-09-24 15:03:53 +05:30
Anand Doshi
b3f12c3109
[fix] [patch] convert_applicable_territory
2015-09-24 15:01:27 +05:30
Anand Doshi
f66e6aacd4
[fix] [patch] convert_applicable_territory
2015-09-24 14:59:26 +05:30
Anand Doshi
1d621be1f7
Merge branch 'develop'
2015-09-24 14:35:36 +05:30
Anand Doshi
ab57e52cbd
bumped to version 6.3.0
2015-09-24 15:05:35 +06:00
Anand Doshi
e63da9813c
Merge remote-tracking branch 'frappe/master' into develop
...
Conflicts:
erpnext/patches.txt
2015-09-24 14:34:50 +05:30
Anand Doshi
c020e42d20
[fix] [patch] convert applicable territory
2015-09-24 13:08:35 +05:30
Anand Doshi
b126ba0132
[change-log]
2015-09-24 13:06:00 +05:30
Anand Doshi
20ae349ebd
Merge pull request #4055 from anandpdoshi/project-sales-order-query
...
Project's Sales Order - get_query fix
2015-09-24 12:49:54 +05:30
Anand Doshi
c6e4b5978d
[fix] Sales Order - get_query fix
2015-09-24 11:32:54 +05:30
Anand Doshi
361eca4cae
Merge pull request #4054 from anandpdoshi/sales-team-update-after-submit
...
Sales Team editable after submit
2015-09-24 11:30:31 +05:30
Anand Doshi
9fc03b6c10
Merge pull request #4052 from rmehta/fix-operation-name
...
[fix] minor, remove operation naming field from operation
2015-09-24 11:30:07 +05:30
Anand Doshi
e2d46d0474
[fix] Allow Sales Team to be added/updated after submit
2015-09-23 19:26:29 +05:30
Rushabh Mehta
dd2f2f5321
[fix] minor, remove operation naming field from operation
2015-09-23 17:06:01 +05:30
Anand Doshi
6e4f5a214a
Merge pull request #4033 from rmehta/portal-fixes
...
Portal Fixes
2015-09-23 16:05:12 +05:30
Anand Doshi
b07b0a9e54
[fix] Sales Order indicators for Maintenance
2015-09-23 15:52:11 +05:30
Rushabh Mehta
307978fea9
[test-fixes]
2015-09-23 15:43:09 +05:30
Anand Doshi
06ad308ca1
[fixes] setup wizard and other fixes related to cart
2015-09-23 12:50:35 +05:30
Anand Doshi
52dfc32eca
[fix] validate_valuation_rate for Repack
2015-09-23 12:50:35 +05:30
Rushabh Mehta
72fbf902d7
[cleanup] added single price list for shopping cart, removed Applicable Territory
2015-09-23 12:50:34 +05:30
Rushabh Mehta
8ffd483e24
[wip] shopping cart shipping rule, price list cleanup
2015-09-23 12:49:16 +05:30
Rushabh Mehta
3d76686b82
[shopping-cart] cart via Jinja WIP
2015-09-23 12:49:16 +05:30
Rushabh Mehta
156ce607e2
[cleanup] [wip] portal, shopping cart cleanup
2015-09-23 12:49:16 +05:30
Anand Doshi
65b6762247
Merge pull request #4049 from bobzz-zone/patch-11
...
Update item_grid.html
2015-09-23 12:09:26 +05:30
Rushabh Mehta
abdfb4d3db
[fixed] New button in POS Sales Invoice, reported via forum
2015-09-23 12:05:51 +05:30
bobzz-zone
3bcb13b1b8
Update item_grid.html
...
Change the colour of the indicator to be green when delivered qty is bigger than ordered qty
2015-09-23 11:42:06 +07:00
Anand Doshi
b6ec680c46
[fix] round percentages in get_indicator
2015-09-22 16:36:20 +05:30
Anand Doshi
53a0de7607
[fix] Recalculate rate after applying Pricing Rule
2015-09-22 15:26:53 +05:30
Anand Doshi
0a1d037f01
Merge pull request #3974 from rmehta/dms
...
[enhancement] document management system
2015-09-22 14:51:01 +05:30
Anand Doshi
ce3e15d30c
Merge pull request #4042 from anandpdoshi/fix-payment-reconciliation-invoice
...
[fix] Show payment's invoice number as 'Invoice Type | Invoice Number' for better unsability
2015-09-22 14:21:23 +05:30
Nabin Hait
5b649521d1
[fix] Get outstanding invoices in Payment Reconciliation and Payment Tool
2015-09-22 13:06:34 +05:30
Anand Doshi
798e75832c
[fix] Show payment's invoice number as 'Invoice Type | Invoice Number' for better unsability
2015-09-22 12:59:43 +05:30
Anand Doshi
aa95a1b1ef
Merge pull request #4047 from nabinhait/payment_reco
...
[fix] Get outstanding invoices in Payment Reconciliation and Payment Tool
2015-09-22 12:55:27 +05:30
Nabin Hait
c0c94aef44
[fix] Get outstanding invoices in Payment Reconciliation and Payment Tool
2015-09-22 08:37:37 +05:30
Anand Doshi
e4dfeb651f
[optimization] get balance on
2015-09-21 19:31:43 +05:30
Anand Doshi
f7e6eb4fd7
[optimization] get balance on
2015-09-21 19:30:21 +05:30
Rushabh Mehta
97c858a5e3
[fix] pull sales team from customer
2015-09-21 10:03:38 +05:30
Rushabh Mehta
974892bf87
Merge pull request #4036 from rmehta/no-party-currency
...
[fix] no default party currency
2015-09-18 13:40:42 +05:30
Rushabh Mehta
361df8993f
[fix] no default party currency
2015-09-18 12:59:51 +05:30
Anand Doshi
b8b8de7a49
[hotfix] multicurrency gl entry
2015-09-17 21:07:45 +05:30
Anand Doshi
be6cfddc4d
[hotfix] multicurrency gl entry
2015-09-17 21:07:04 +05:30
Anand Doshi
bf8c8df9ce
Revert "[hotfix] set_balance_in_account_currency"
...
This reverts commit 9acd6a2629 .
2015-09-17 20:55:50 +05:30
Anand Doshi
40759c284c
Revert "[hotfix] set_balance_in_account_currency"
...
This reverts commit 9acd6a2629 .
2015-09-17 20:51:41 +05:30
Nabin Hait
a48d754158
[fix] minor issue
2015-09-17 20:37:07 +05:30
Anand Doshi
26bcd89d10
[hotfix] journal entry - get balance
2015-09-17 20:36:44 +05:30
Anand Doshi
20fd360a63
[hotfix] journal entry - get balance
2015-09-17 20:36:19 +05:30
Anand Doshi
df8efce36f
[hotfix] set_balance_in_account_currency
2015-09-17 20:29:57 +05:30
Anand Doshi
9acd6a2629
[hotfix] set_balance_in_account_currency
2015-09-17 20:29:31 +05:30
Anand Doshi
779ae439cd
Merge pull request #4034 from nabinhait/mc5
...
[fix] minor issue
2015-09-17 20:10:19 +05:30
Nabin Hait
a8ef4c9220
[fix] minor issue
2015-09-17 19:38:11 +05:30
Anand Doshi
ce6b61b41e
[fix] customer naming series validation and patch to fix missing default taxes and lead
2015-09-17 19:02:59 +05:30
Anand Doshi
0332f83bc2
[fix] customer naming series validation and patch to fix missing default taxes and lead
2015-09-17 19:01:48 +05:30
Nabin Hait
926ae17e5a
Update journal_entry.py
2015-09-17 18:42:55 +05:30
Nabin Hait
8adb5f3e32
Update journal_entry.py
2015-09-17 18:40:35 +05:30
Anand Doshi
5532a14938
[hotfix] create customer contact and address from lead only on create
2015-09-17 18:27:56 +05:30
Anand Doshi
a69682c4e0
[hotfix] create customer contact and address from lead only on create
2015-09-17 18:27:36 +05:30
Anand Doshi
d20120e649
[fix] remove duplicate newsletter subscribers
2015-09-17 17:47:26 +05:30
Anand Doshi
e9b14e497b
[fix] remove duplicate newsletter subscribers
2015-09-17 17:46:40 +05:30
Anand Doshi
ba0bf9e13d
[hotfix] multicurrency patch
2015-09-17 17:36:20 +05:30
Anand Doshi
cba5a684cb
[hotfix] multicurrency patch
2015-09-17 17:36:05 +05:30
Anand Doshi
c439b87ccc
[hotfix] multicurrency patch
2015-09-17 17:28:58 +05:30
Anand Doshi
340709b2da
[hotfix] multicurrency patch
2015-09-17 17:28:39 +05:30
Nabin Hait
a8de61e24b
[fix] Multi currency patch
2015-09-17 17:16:58 +05:30
Anand Doshi
28386f551b
Merge pull request #4032 from nabinhait/mc4
...
[fix] Multi currency patch
2015-09-17 17:16:08 +05:30
Nabin Hait
9ff52cd57e
[fix] Multi currency patch
2015-09-17 17:07:26 +05:30
Rushabh Mehta
e3401182c8
Merge pull request #4012 from saurabh6790/cart
...
Taxation for Shopping Cart based on Tax Rule template
2015-09-17 16:26:35 +05:30
Anand Doshi
7523429ded
Merge branch 'develop'
2015-09-17 15:35:09 +05:30
Anand Doshi
0401e418be
bumped to version 6.2.0
2015-09-17 16:05:08 +06:00
Anand Doshi
ff6fd7fa9d
[change-log]
2015-09-17 15:27:01 +05:30
Anand Doshi
7620393b9b
Merge pull request #4031 from anandpdoshi/translations
...
Translations
2015-09-17 15:13:19 +05:30
Anand Doshi
6489e97726
[translations]
2015-09-17 15:08:09 +05:30
Anand Doshi
8c1a4c0c48
Merge branch 'nabinhait-mc3' into develop
2015-09-17 14:43:58 +05:30
Nabin Hait
77ca80217c
[fix] Account Currency and Balance fixed in chart of accounts #4019
2015-09-17 14:43:33 +05:30
Nabin Hait
8247ad4028
[fix] Currency symbol fixed in Accounts receivable/payable report #4020
2015-09-17 14:40:15 +05:30
Anand Doshi
1194c6ef4b
[fix] use the new split_emails method to split emails by comma
2015-09-17 14:40:15 +05:30
Anand Doshi
70fed64cd5
Merge pull request #4029 from nabinhait/mc2
...
[fix] Account Currency and Balance fixed in chart of accounts #4019
2015-09-17 14:37:00 +05:30
Nabin Hait
87c2d1d634
[fix] Dashboard info in accounting currency for Customer and Supplier #4017
2015-09-17 14:16:01 +05:30
Anand Doshi
d4aa27cbb8
Merge pull request #4025 from anandpdoshi/split-emails
...
use the new split_emails method to split emails by comma. Merge this after Communication CC is merged.
2015-09-17 14:00:03 +05:30
Nabin Hait
59f4fa9a8c
[fix] Account Currency and Balance fixed in chart of accounts #4019
2015-09-17 13:57:42 +05:30
Anand Doshi
3b0c0a76b4
Merge pull request #4028 from nabinhait/mc1
...
[fix] Currency symbol fixed in Accounts receivable/payable report #4020
2015-09-17 13:38:32 +05:30
Nabin Hait
262ac09305
[fix] Currency symbol fixed in Accounts receivable/payable report #4020
2015-09-17 13:24:14 +05:30
Anand Doshi
2a04d98c16
Merge pull request #4023 from saurabh6790/error_report
...
[Fixes] Check Warehouse for Company Delete and Variant Attribute Value
2015-09-17 13:20:05 +05:30
Anand Doshi
fec9f75707
Merge pull request #4021 from anandpdoshi/payment-tool-ignore-journal-entry
...
ignore journal entry based invoice in payment tool and payment reconciliation tool
2015-09-17 13:19:06 +05:30
Anand Doshi
12106725fb
[fix] set Payment Amount in Payment Tool
2015-09-17 12:59:44 +05:30
Anand Doshi
c5f919eb68
[fix] use the new split_emails method to split emails by comma
2015-09-16 19:20:55 +05:30
Saurabh
5fe0086d9a
[Fixes] Warehouse check while company delete & Variant Attribute value check
2015-09-16 16:59:24 +05:30
Anand Doshi
0b031cdd6c
[fix] ignore journal entry based invoice in payment tool and payment reconciliation tool
2015-09-16 12:46:54 +05:30
Anand Doshi
c19afa140d
[fix] reload time log in update projects patch
2015-09-16 12:44:22 +05:30
Saurabh
0bd145a608
[fixes] test cases and tax rule validation
2015-09-15 17:06:52 +05:30
Saurabh
c663f5c2bd
[Test] test state based taxasion
2015-09-15 15:41:01 +05:30
Saurabh
adde1cff48
[Enhancement] add state ccriteria in tax rule
2015-09-15 15:41:01 +05:30
Saurabh
bb9427d1ef
[Fixes] deprecated
2015-09-15 15:41:01 +05:30
Saurabh
052babc6b6
[Fixes] [Minor] removed console statement
2015-09-15 15:41:01 +05:30
Saurabh
24fa06bc53
[Fixes] rebase conflict fixes
2015-09-15 15:41:01 +05:30
Saurabh
7c867ae9ad
[Fixes] Tax Rule preparation and test taxes creation, remove dummy quotation
2015-09-15 15:41:01 +05:30
Saurabh
8f7317175d
[enhancement] bring taxes from tax rules and test cases
2015-09-15 15:41:01 +05:30
Saurabh
957e7a37be
[Shopping Cart][Fixes] tax calculation based on tax rule
2015-09-15 15:41:01 +05:30
Saurabh
def71d4d5d
[Shopping Cart][Fixes] tax calculation based on tax rule
2015-09-15 15:41:00 +05:30
Neil Trini Lasrado
ef511b160e
Added Tax Rule under ERPNext > Accounts > Setup
2015-09-15 15:41:00 +05:30
Neil Trini Lasrado
09f9c96c53
Fixes in Tax Rule
2015-09-15 15:41:00 +05:30
Neil Trini Lasrado
1a2d121073
Removed default taxes and charges from customer and supplier master. Added patch to create tax rules against customer/supplier
2015-09-15 15:41:00 +05:30
Neil Trini Lasrado
810bd35609
Apply Tax Rule based on Customer Selection in Sales / Purchase Transactions
2015-09-15 15:41:00 +05:30
Neil Trini Lasrado
949d7dbaba
Added validations, test-cases to Tax Rule
2015-09-15 15:41:00 +05:30
Neil Trini Lasrado
72e6aa160c
Added New Doctype Tax Rule
2015-09-15 15:41:00 +05:30
Anand Doshi
0870b185de
Merge pull request #4015 from anandpdoshi/use-add-fetch
...
Use add_fetch in Product Bundle, Maintenance Visit and Maintenance Schedule instead of redundant get_item_details method
2015-09-15 14:02:06 +05:30
Anand Doshi
69f2cc8d24
[fix] don't fetch template item in get items of stock reconciliation
2015-09-15 11:54:13 +05:30
Anand Doshi
86102064a5
[fix] Use add_fetch in Product Bundle, Maintenance Visit and Maintenance Schedule instead of redundant get_item_details method
2015-09-15 11:50:30 +05:30
Anand Doshi
0fd3347148
[fix] handle invalid date in get_retirement_date
2015-09-15 11:29:51 +05:30
Anand Doshi
b74265c842
[minor] [patch] reload activity cost in default_activity_rate
2015-09-15 11:27:19 +05:30
Anand Doshi
1fef2fad2d
[minor] fixes in queries and payment tool
2015-09-14 18:27:21 +05:30
Anand Doshi
9345240ff1
Merge pull request #4007 from anandpdoshi/setup-wizard-duplicate-entry
...
catch DuplicateEntryError in install_fixtures step of Setup Wizard
2015-09-14 16:33:16 +05:30
Anand Doshi
9ab23231e6
Merge pull request #4011 from anandpdoshi/defaults-during-creation
...
[fix] Use User Permission value as default only if the document type is Setup. Merge with frappe/frappe#1304
2015-09-14 16:33:00 +05:30
Anand Doshi
dbe623b167
[fix] Use User Permission value as default only if the document type is Setup
2015-09-14 13:08:53 +05:30
Anand Doshi
71e51c179c
[fix] changed modified for multi-currency sync
2015-09-11 16:55:11 +05:30
Anand Doshi
4b8dbbdf98
[minor] Change modified of Sales Invoice.json
2015-09-11 16:39:03 +05:30
Anand Doshi
aaf1895a12
Merge branch 'nabinhait-multi-currency' into develop
...
Conflicts:
erpnext/accounts/doctype/journal_entry/journal_entry.json
2015-09-11 16:35:17 +05:30
Anand Doshi
979326b0b1
minor fixes in multi-currency
2015-09-11 16:33:45 +05:30
Anand Doshi
5d9cfc76cd
Don't copy title field in Duplicate
2015-09-11 15:35:26 +05:30
Nabin Hait
8db7bd2d8f
[fix] Igonre permissions while saving Company and Warehouse from Accounts Settings
2015-09-11 15:34:42 +05:30
Rushabh Mehta
d461d462aa
[minor] rename notified_modifed > notified_update. Merge with #1296
2015-09-11 15:34:41 +05:30
Anand Doshi
e67fa424b2
[fix] catch DuplicateEntryError in install_fixtures step of Setup Wizard
2015-09-11 15:32:06 +05:30
Anand Doshi
121176f0e9
Merge pull request #4002 from rmehta/notify-update-rename
...
[minor] rename notified_modifed > notified_update. Merge with #1296
2015-09-11 15:11:57 +05:30
Anand Doshi
1c2636e7b3
Merge pull request #4003 from nabinhait/fix8
...
[fix] Igonre permissions while saving Company and Warehouse from Accounts Settings
2015-09-11 15:00:13 +05:30
Anand Doshi
840cad0ff7
Don't copy title field in Duplicate
2015-09-11 12:26:57 +05:30
Nabin Hait
f76d63b92a
Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency
...
[fix][patch] delete item variant attributes if no variants exists against that item
2015-09-10 19:26:02 +05:30
Nabin Hait
71ef6675ce
[fix] Journal Entry client side minor fixes
2015-09-10 19:25:50 +05:30
Anand Doshi
793b87948c
[fix] [patch] item template attributes
2015-09-10 18:10:15 +05:30
Anand Doshi
a1b0ff09a8
Merge pull request #4004 from nabinhait/fix9
...
[fix] Bypass Root Not Editable validation from Setup Wizard
2015-09-10 15:56:45 +05:30
Nabin Hait
5a803d76ad
[fix] Bypass Root Not Editable validation from Setup Wizard
2015-09-10 13:20:35 +05:30
Nabin Hait
9513025130
[fix] Igonre permissions while saving Company and Warehouse from Accounts Settings
2015-09-10 12:13:27 +05:30
Rushabh Mehta
a13c60bf9f
[minor] fix title in readme
2015-09-10 10:43:43 +05:30
Rushabh Mehta
bc23e5ac5c
[minor] rename notified_modifed > notified_update. Merge with #1296
2015-09-10 10:30:41 +05:30
Nabin Hait
2377cdfa4e
Fixed conflict
2015-09-09 18:45:41 +05:30
Nabin Hait
e3ae05aabd
Multi-currency: Exchange Rate in Journal Entry
2015-09-09 18:43:12 +05:30
Anand Doshi
a2fda1c779
Merge branch 'develop'
2015-09-09 18:42:49 +05:30
Anand Doshi
a29577ca71
bumped to version 6.1.1
2015-09-09 19:12:48 +06:00
Anand Doshi
b1454cdf9f
[fix] fix planned qty
2015-09-09 18:00:09 +05:30
Anand Doshi
f668a4d03c
Merge branch 'develop'
2015-09-09 15:32:03 +05:30
Anand Doshi
c2b4ae6667
bumped to version 6.1.0
2015-09-09 16:02:03 +06:00
Anand Doshi
1857bb8b0b
[change-log]
2015-09-09 15:23:16 +05:30
Anand Doshi
888a70c2d4
[fix] Setup Wizard - the case of forgetting mute emails
2015-09-09 15:14:54 +05:30
Anand Doshi
9d5b84e78a
Merge pull request #3996 from nabinhait/fix6
...
Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order
2015-09-09 15:11:12 +05:30
Anand Doshi
bdc125ad0f
Merge pull request #3999 from nabinhait/planned_qty
...
Planned Qty logic fixed and reposted for existing
2015-09-09 13:14:09 +05:30
Nabin Hait
f0b3014a23
Planned Qty logic fixed and reposted for existing
2015-09-09 11:04:10 +05:30
Nabin Hait
0b17a91aba
Merge pull request #3998 from nabinhait/fix7
...
[fix] Gross Profit report should not include return entries
2015-09-09 10:37:30 +05:30
Nabin Hait
83dd3e14e5
[fix] Gross Profit report should not include return entries
2015-09-09 10:37:04 +05:30
Anand Doshi
38f64ea3ab
Merge pull request #3991 from anandpdoshi/apply-user-permissions-fix
...
[minor] Unset Apply User Permissions in default permissions
2015-09-08 22:09:44 +05:30
Nabin Hait
cd103c05d6
Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order
2015-09-08 19:24:35 +05:30
Anand Doshi
bc1e8b4408
[minor] Unset Apply User Permissions in default permissions
2015-09-08 19:23:23 +05:30
Nabin Hait
6c3ff3e2ed
Fixed conflict
2015-09-08 18:09:03 +05:30
Anand Doshi
4fb7f881c8
Merge branch 'nabinhait-fix4' into develop
2015-09-08 16:37:52 +05:30
Nabin Hait
83a358afc1
Fix invoice outstanding where party missing
...
Conflicts:
erpnext/accounts/doctype/gl_entry/gl_entry.py
erpnext/patches.txt
2015-09-08 16:37:26 +05:30
Nabin Hait
96bb070781
Payment against invoices where party not specified
...
Conflicts:
erpnext/accounts/doctype/gl_entry/gl_entry.py
2015-09-08 16:36:44 +05:30
Nabin Hait
d387dd3bc6
[fix] Project: round percent_complete to 2 decimals
2015-09-08 16:15:00 +05:30
Anand Doshi
9f25575e0c
Merge pull request #3988 from nabinhait/fix2
...
Set expense account in stock reco only if company available
2015-09-08 15:59:18 +05:30
Anand Doshi
e1af7f1a0f
[minor] default mins_between_operations = 10
2015-09-08 15:55:09 +05:30
Anand Doshi
c35df5ce80
Merge branch 'rmehta-stock-settings' into develop
...
Conflicts:
erpnext/patches.txt
2015-09-08 15:54:17 +05:30
Anand Doshi
2c2868db11
[translations]
2015-09-08 15:53:54 +05:30
Anand Doshi
17f28c13ed
[fix] Customer match condition in autosuggest
2015-09-08 15:53:54 +05:30
Anand Doshi
3f1f2dd307
[fix] setup wizard - industry type
2015-09-08 15:53:53 +05:30
Anand Doshi
ab05dcd9f9
[fix] [patch] reload item attribute + value
2015-09-08 15:53:53 +05:30
Rushabh Mehta
f21edba97f
[fixes] to task test case and fix tree ui for mobile
2015-09-08 15:53:53 +05:30
Rushabh Mehta
91b0e2348c
[minor] task not mandatory for Time Log and Expense Claim #3904
2015-09-08 15:53:53 +05:30
Nabin Hait
4de91887db
[patch] Re-run the 'default_title' patch
2015-09-08 15:53:35 +05:30
Anand Doshi
9b1288605f
bumped to version 6.0.1
2015-09-08 15:53:05 +05:30
Anand Doshi
43888546f6
Merge pull request #3968 from rmehta/task-not-mandatory
...
[minor] task not mandatory for Time Log and Expense Claim #3904
2015-09-08 15:47:11 +05:30
Anand Doshi
68d2e317d2
Merge pull request #3992 from anandpdoshi/translations
...
[translations]
2015-09-08 15:45:08 +05:30
Nabin Hait
2249eea59f
Fixed conflict
2015-09-08 12:55:21 +05:30
Nabin Hait
d608363d7b
[fix] Map amount in advance payment entry agaionst SO/PO based on party account currency
2015-09-08 12:53:59 +05:30
Nabin Hait
b2739cbb79
Get average exchange rate in case of bank transfer
2015-09-08 12:18:45 +05:30
Anand Doshi
f5940907ae
[translations]
2015-09-07 18:47:04 +05:30
Anand Doshi
90162078d5
Merge pull request #3989 from anandpdoshi/customer-query-match-condition
...
Customer match condition in autosuggest
2015-09-07 14:52:49 +05:30
Anand Doshi
cba99743a4
[fix] Customer match condition in autosuggest
2015-09-07 14:51:30 +05:30
Nabin Hait
f44128f81c
Set expense account in stock reco only if company available
2015-09-07 10:45:15 +05:30
Nabin Hait
3607737b5e
Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency
2015-09-07 10:41:01 +05:30
Nabin Hait
bf9691ed39
Multiple fixes
2015-09-07 10:40:48 +05:30
Anand Doshi
bbca95fd1b
[fix] setup wizard - industry type
2015-09-07 10:11:46 +05:30
Anand Doshi
4df98d52c1
[fix] setup wizard - industry type
2015-09-07 10:11:23 +05:30
Nabin Hait
e9b445c853
[fix] Stock Entry additional costs patch fix for v4 accounts
2015-09-05 11:17:11 +05:30
Anand Doshi
28f8664b93
[fix] [patch] reload item attribute + value
2015-09-04 16:41:27 +05:30
Nabin Hait
216aaaf1d6
Set currency and exchange rate based on Customer's currency while making Quotation from Opportunity
2015-09-04 16:41:04 +05:30
Rushabh Mehta
be9edae961
[fixes] to task test case and fix tree ui for mobile
2015-09-04 16:18:17 +05:30
Rushabh Mehta
4223d7c044
[minor] task not mandatory for Time Log and Expense Claim #3904
2015-09-04 16:18:17 +05:30
Nabin Hait
3a53d49b7e
[fix] Set account and party balance in Journal Entry
2015-09-04 15:46:47 +05:30
Nabin Hait
4d62d7867e
[report] Bank Reconciliation Statement in account currency
2015-09-04 13:26:45 +05:30
Nabin Hait
c0e3b1a0c7
Removed account and party balance in company currency from Journal Entry
2015-09-04 13:26:23 +05:30
Nabin Hait
34fe81f7eb
Patch fixed
2015-09-03 19:18:00 +05:30
Nabin Hait
11a746d363
Fixed conflict
2015-09-03 16:04:11 +05:30
Nabin Hait
1609933748
Test cases for multi currency
2015-09-03 16:03:07 +05:30
Anand Doshi
5f90f7096d
Merge pull request #3976 from nabinhait/fixes1
...
[patch] Re-run the 'default_title' patch
2015-09-03 11:15:53 +05:30
Nabin Hait
59c4ae5a46
[patch] Re-run the 'default_title' patch
2015-09-03 10:46:48 +05:30
Rushabh Mehta
85abdc4fad
[minor] added stock settings for serial no. #3967 . Merge with https://github.com/frappe/frappe/pull/1291
2015-09-03 10:29:38 +05:30
Nabin Hait
98096771c2
[multi currency] Introduced Accounting Currency in Customer and Supplier, and validation according to that
2015-09-03 10:28:08 +05:30
Anand Doshi
ba51ebd1b7
Merge branch 'develop'
2015-09-02 18:58:14 +05:30
Anand Doshi
be090fa512
bumped to version 6.0.1
2015-09-02 19:28:14 +06:00
Rushabh Mehta
c2283ca304
[hot] [fix] remove test options in Opportunity
2015-09-02 18:56:35 +05:30
Rushabh Mehta
deb38f7a68
[enhancement] document management system
2015-09-02 18:34:24 +05:30
Anand Doshi
283850ce47
Merge pull request #3971 from anandpdoshi/fix-item-variant-attributes
...
Attributes in the variant should be in the same order as in the Template
2015-09-02 16:09:09 +05:30
Anand Doshi
caa839003b
Merge branch 'develop'
2015-09-02 16:02:45 +05:30
Anand Doshi
a6130dc918
bumped to version 6.0.0
2015-09-02 16:32:45 +06:00
Anand Doshi
099bbbded0
Attributes in the variant should be in the same order as in the Template
...
- Moved Item Variant code from item.py to controllers/item_variant.py
- Use Template Item's order of Attribute for Variant Item
2015-09-02 15:56:55 +05:30
Anand Doshi
c3796d273c
[change-log]
2015-09-02 15:54:53 +05:30
Anand Doshi
28700d6404
Merge pull request #3973 from nabinhait/fix14
...
[Fix] Delete Company Transactions
2015-09-02 14:59:44 +05:30
Anand Doshi
38f400ea87
Merge pull request #3972 from nabinhait/fix
...
Item Price Fix
2015-09-02 14:57:26 +05:30
Anand Doshi
f5793fff3c
Merge pull request #3966 from rmehta/calendar-for-sales-order
...
[enhancement] calendar for sales order and other related fixes #3542
2015-09-02 14:52:21 +05:30
Nabin Hait
e1d2bef389
[fix] Dont delete Employee while deleting company transactions
2015-09-02 14:07:46 +05:30
Nabin Hait
0ca3e3d89e
[fix] Clear notification count while deleting company transactions
2015-09-02 13:09:48 +05:30
Nabin Hait
a1fa659475
[fix] Delete Time Logs while deleting company transactions
2015-09-02 12:56:29 +05:30
Nabin Hait
906bf64f04
[fix] Insert Item Price automatically based on Rate in Stock UOM
2015-09-02 11:32:14 +05:30
Nabin Hait
e52ee553c0
Removed debug flag
2015-09-02 11:32:14 +05:30
Anand Doshi
409c1e494b
Updated CONTRIBUTING.md
2015-09-02 10:55:45 +05:30
Rushabh Mehta
19e560e73f
[fix] dropbox backup check not working
2015-09-01 09:57:25 +05:30
Nabin Hait
bac9b8eef6
Payment Tool changes due to multi currency
2015-08-31 19:01:11 +05:30
Nabin Hait
76bb927337
Fixed conflict
2015-08-31 17:28:05 +05:30
Nabin Hait
699751c531
[report] Accounts Receivable / Payable in multi currency
2015-08-31 17:02:04 +05:30
Nabin Hait
06b15bfd63
[report] General Ledger in multi currency
2015-08-31 15:39:03 +05:30
Rushabh Mehta
8f1391dc96
[enhancement] calendar for sales order and other related fixes #3542
2015-08-31 12:42:45 +05:30
Anand Doshi
0161b40aa9
Merge pull request #3965 from nabinhait/gross_profit
...
[fix] Fixed gross profit report due to removal of designation field from Sales Team table
2015-08-31 12:26:11 +05:30
Nabin Hait
1901ca5a45
[fix] Fixed gross profit report due to removal of designation field from Sales Team table
2015-08-31 12:02:50 +05:30
Nabin Hait
c68f68d6cc
[fix] Patch fixed for account_currency field rename
2015-08-28 19:26:28 +05:30
Nabin Hait
6e439a5e53
Multi currency: test case and fixes
2015-08-28 19:24:22 +05:30
Anand Doshi
610ad47676
[hotfix] reload Delivery Note, Sales Invoice and Purchase Receipt in return entry patch
2015-08-28 11:40:14 +05:30
Anand Doshi
42701b2160
Merge branch 'nabinhait-notifications' into develop
...
Conflicts:
erpnext/selling/doctype/sales_order/sales_order.py
2015-08-27 17:05:32 +05:30
Anand Doshi
3d9d2d1dd1
Exported all doctypes
2015-08-27 17:04:39 +05:30
Anand Doshi
3ea7ce84ed
[fix] print hide additional discount, reload doctypes in sales return patch
2015-08-27 17:04:39 +05:30
Anand Doshi
002049eb85
[minor] show Inventory section for new Item if Maintain Stock is checked
2015-08-27 17:04:06 +05:30
Anand Doshi
57a51351d3
[fix] Changed more section label to 'More Information'
2015-08-27 17:04:06 +05:30
Anand Doshi
77a2107973
[minor] In Sales Order, changed label from PO No. to Customer's Purchase Order
2015-08-27 17:04:05 +05:30
Rushabh Mehta
c5346c99de
[enhancement] allow user to set warning for multiple items and sales order against multiple purchase orders #3699
2015-08-27 17:03:37 +05:30
Anand Doshi
8b66f2a691
Exported all doctypes
2015-08-27 16:45:52 +05:30
Nabin Hait
78be566428
minor fix
2015-08-27 16:27:44 +05:30
Nabin Hait
f6f38f2f2d
[new fields] Exchange Rate in Journal Entry and some properties changes in Journal Entry Account
2015-08-27 16:27:33 +05:30
Nabin Hait
9a9a4293b3
[new fields] Party Account Currency, Paid Amount and Write Off Amount in Acompany Currency
2015-08-27 16:26:38 +05:30
Anand Doshi
f370b0c6a4
[fix] print hide additional discount, reload doctypes in sales return patch
2015-08-27 16:03:29 +05:30
Nabin Hait
09c68c9ad0
Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency
2015-08-27 14:55:55 +05:30
Nabin Hait
13d8835b75
Fixed merge conflict
2015-08-27 14:55:34 +05:30
Anand Doshi
b8610e1079
[fix] removed update_stock_ledger from delivery note
2015-08-27 14:46:47 +05:30
Anand Doshi
41e948b00a
[hotfix] update reserved quantity in delivery note
2015-08-27 14:42:25 +05:30
Nabin Hait
2091f0c97e
Checked out json files from upstream
2015-08-27 14:35:17 +05:30
Anand Doshi
c6802ca6d0
[minor] show Inventory section for new Item if Maintain Stock is checked
2015-08-27 13:21:43 +05:30
Anand Doshi
282e4947fa
[fix] Changed more section label to 'More Information'
2015-08-27 13:11:46 +05:30
Nabin Hait
54fe26dcfb
[patch] Multi currency
2015-08-27 12:55:24 +05:30
Nabin Hait
4ffd7f3d05
Outstanding, paid and write-off amount in Invoice
2015-08-27 12:28:36 +05:30
Nabin Hait
a12d959729
GL Entries for Sales/Purchase Invoice in multi currency
2015-08-27 12:27:24 +05:30
Anand Doshi
b99c180466
Merge branch 'rmehta-validation-settings' into develop
2015-08-27 12:22:06 +05:30
Anand Doshi
6cf193d432
[minor] In Sales Order, changed label from PO No. to Customer's Purchase Order
2015-08-27 12:21:17 +05:30
Nabin Hait
35a5c87cbf
[fix] Clear notifications for Sales / Purchase Order on stop/unstop
2015-08-27 12:06:11 +05:30
Rushabh Mehta
740db53b86
[fix] returned_qty reapply and change-log
2015-08-27 12:00:16 +05:30
Anand Doshi
69b6195d3b
Merge branch 'validation-settings' of https://github.com/rmehta/erpnext into rmehta-validation-settings
...
Conflicts:
erpnext/stock/doctype/delivery_note/delivery_note.py
2015-08-27 11:39:20 +05:30
Rushabh Mehta
cd2d8a0410
[merge] re-applied changes to sales invoice & delivery note
2015-08-27 11:05:26 +05:30
Rushabh Mehta
5bec301929
Merge branch 'layout-cleanup' into develop
...
Conflicts:
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
erpnext/stock/doctype/delivery_note/delivery_note.json
2015-08-27 11:01:39 +05:30
Rushabh Mehta
491df14426
[minor] catch invalid item code in pricing list (via support ticket)
2015-08-27 10:31:28 +05:30
Rushabh Mehta
00eba4d7f6
[minor] show price list in sales order (via support ticket)
2015-08-27 10:25:07 +05:30
Rushabh Mehta
17679c6902
[layout cleanup] purchase, stock, journal entry
2015-08-26 22:20:38 +05:30
Anand Doshi
fa65c7bf29
[minor] stopped or cancelled message
2015-08-26 19:15:24 +05:30
Rushabh Mehta
f7800c053b
[layout cleanup] in Quotation, Sales Order, Delivery Note
2015-08-26 18:53:37 +05:30
Anand Doshi
10fc83d369
Merge branch 'develop'
2015-08-26 17:57:24 +05:30
Anand Doshi
eed8906a1e
bumped to version 5.8.2
2015-08-26 18:27:24 +06:00
Anand Doshi
414248b792
[fix] event creation on Contact Date
2015-08-26 17:56:55 +05:30
Anand Doshi
e91b3ea407
Merge branch 'develop'
2015-08-26 17:43:27 +05:30
Anand Doshi
28d53be50c
bumped to version 5.8.1
2015-08-26 18:13:26 +06:00
Anand Doshi
cb2f9a863d
[hotfix] reload Sales and Purchase Order Item
2015-08-26 17:42:40 +05:30
Anand Doshi
2b6bdc1edb
[fix] filter and validation of Debit To and Credit To accounts
2015-08-26 17:42:40 +05:30
Anand Doshi
f326c63588
Merge branch 'develop'
2015-08-26 16:55:08 +05:30
Anand Doshi
8ca72d8883
bumped to version 5.8.0
2015-08-26 17:25:08 +06:00
Anand Doshi
ab9f03d557
Merge pull request #3952 from neilLasrado/variant-duplication
...
Fixed validation to prevent duplication of Item Variants in case of Numeric Attributes
2015-08-26 16:52:25 +05:30
Anand Doshi
7fa8fb984e
[fix] Show write off account
2015-08-26 16:48:41 +05:30
Anand Doshi
f29628072f
[change-log]
2015-08-26 14:50:05 +05:30
Anand Doshi
cb3a4caa44
[fix] removed validate due date in Journal Entry
2015-08-26 14:50:04 +05:30
Neil Trini Lasrado
755f1f6841
Fixed validation to prevent duplication of Item Variants in case of Numeric Attributes
2015-08-26 12:59:29 +05:30
Anand Doshi
80a784fdc5
Merge pull request #3943 from nabinhait/fix4
...
[fix] Print Delivery Note without amount
2015-08-26 12:29:24 +05:30
Rushabh Mehta
678a4e24ff
[cleanup] Opportunity
2015-08-26 12:27:25 +05:30
Rushabh Mehta
b8a6f40370
[cleanup] layouts of item, customer, supplier, lead
2015-08-26 10:51:45 +05:30
Rushabh Mehta
f24f6044bd
[layout] cleaned up Sales Invoice
2015-08-26 10:51:44 +05:30
Rushabh Mehta
b6398be232
[minor] [fix] project query
2015-08-26 10:51:04 +05:30
Anand Doshi
007e2d0015
Merge branch 'nabinhait-return_improvements' into develop
2015-08-25 19:11:29 +05:30
Anand Doshi
fe13bfed44
Fixes to Return Improvements pull request
...
- Added "Returned Qty" in Sales and Purchase Order
- Map Expense Account in Return Delivery Note
- Defined some No Copy fields
- Added "Credit Note" and "Debit Note" Print Headings
- Fixed patch
2015-08-25 19:07:04 +05:30
Rushabh Mehta
3c107cdbf8
[enhancement] allow user to set warning for multiple items and sales order against multiple purchase orders #3699
2015-08-25 14:26:42 +05:30
Nabin Hait
b719c469c8
Allow different rate in Return Entry
2015-08-25 14:11:13 +05:30
Nabin Hait
3f321ebfde
utilities/repost_stock file renamed to stock/stock_balance
2015-08-25 14:11:13 +05:30
Nabin Hait
047ecd1eb9
Update order reference in return entries and repost reserved / ordered qty
2015-08-25 14:11:13 +05:30
Nabin Hait
1f94fa25a8
Update delivered / ordered qty in sales/purchase order from return entry
...
Reserved Qty logic cleaned up
2015-08-25 14:11:12 +05:30
Rushabh Mehta
ddd79f43d2
[fix] [hot] erpnext contact page
2015-08-25 14:03:43 +05:30
Nabin Hait
a7c013c030
[fix] Print Delivery Note without amount
2015-08-24 18:43:19 +05:30
Anand Doshi
f7cfaf58b5
Merge pull request #3927 from neilLasrado/default-warehouse
...
Fetch default WIP Warehouse and FG Warehouse on load of Production Order
2015-08-24 18:17:30 +05:30
Anand Doshi
82366e4b3f
Merge pull request #3941 from nabinhait/fix2
...
[fix] Stock Entry additional costs patch fix for v4 accounts
2015-08-24 17:49:47 +05:30
Anand Doshi
b0d4162ca6
Merge pull request #3942 from nabinhait/fix3
...
[fix] In general ledger report, consider cost center in group by voucher
2015-08-24 17:42:51 +05:30
Anand Doshi
b968772e97
Merge pull request #3939 from neilLasrado/variant
...
Fixes in Item Variants
2015-08-24 17:42:23 +05:30
Nabin Hait
3a990d946d
[fix] In general ledger report, consider cost center in group by voucher
2015-08-24 17:21:01 +05:30
Neil Trini Lasrado
db189d7f19
Fixed test case for Item Variants
2015-08-24 16:59:24 +05:30
Nabin Hait
b69eb84936
[fix] Stock Entry additional costs patch fix for v4 accounts
2015-08-24 16:55:10 +05:30
Anand Doshi
00c5875ff7
Merge branch 'develop'
2015-08-24 16:53:51 +05:30
Anand Doshi
5c9bd5e650
bumped to version 5.7.7
2015-08-24 17:23:51 +06:00
Neil Trini Lasrado
92a3dbb5d3
Fixes in Default Warehouse
2015-08-24 15:52:56 +05:30
Neil Trini Lasrado
75d90b1c00
Fixed Produciton Planning Tool
2015-08-24 15:23:58 +05:30
Neil Trini Lasrado
72e4cdcb25
Added default WIP Warehouse and FG Warehouse to Manufacturing Settings
...
Fetch default WIP Warehouse and FG Warehouse on load of Production Order
2015-08-24 15:23:58 +05:30
Neil Trini Lasrado
4c614bd59a
Fixed validation for numeric variants to check with values from template instead of master
2015-08-24 15:13:01 +05:30
Neil Trini Lasrado
7a6f048928
Fixed issue while creating item variants with decimal values (precision error)
2015-08-24 15:13:01 +05:30
Anand Doshi
96773bdc0e
Merge pull request #3926 from neilLasrado/prod-order
...
Production Order - Validation Added
2015-08-24 14:44:44 +05:30
Anand Doshi
d092fd918a
Merge pull request #3937 from rmehta/purchase-order-fix
...
[hot] make_stock_entry button in purchase order
2015-08-24 14:41:40 +05:30
Anand Doshi
50e2e1d9af
Merge pull request #3936 from rmehta/customer-report-fix
...
[fix] Customer Address and Contact report
2015-08-24 14:35:42 +05:30
Rushabh Mehta
da24698cf7
[minor] in ap, ar renamed label for date as 'as on date' as it was confusing
2015-08-24 14:31:07 +05:30
Rushabh Mehta
d999dd1bb9
[minor] fix setup wizard buying_items query
2015-08-24 14:23:55 +05:30
Rushabh Mehta
c8a5a2cc4a
[hot] make_stock_entry button in purchase order
2015-08-24 13:12:45 +05:30
Rushabh Mehta
12fb0d998f
[fix] Customer Address and Contact report
2015-08-24 12:21:04 +05:30
Neil Trini Lasrado
17231e39cc
Added validation in Production Order. Operations Time made mandatory
2015-08-21 16:52:04 +05:30
Anand Doshi
4451db2db4
Merge branch 'develop'
2015-08-21 14:57:19 +05:30
Anand Doshi
d7a6c11a92
bumped to version 5.7.6
2015-08-21 15:27:19 +06:00
Anand Doshi
bcb386fb64
Merge pull request #3922 from nabinhait/fraction_gle
...
Divisonal loss adjustment in purchase receipt
2015-08-21 14:55:44 +05:30
Anand Doshi
3709668464
Merge pull request #3925 from nabinhait/uom_replace
...
[fix]Stock UOM Replace Utility: Multiply Qty after Transaction by conversion factor as well, as there is no qty mentioned for stock reconciliation
2015-08-21 14:47:27 +05:30
Nabin Hait
7c2901fb56
[fix]Stock UOM Replace Utility: Multiply Qty after Transaction by conversion factor as well, as there is no qty mentioned for stock reconciliation
2015-08-21 14:45:59 +05:30
Anand Doshi
b5d9ab24ec
Merge pull request #3921 from nabinhait/uom_replace
...
[fix]Stock UOM Replace Utility: Multiply Qty after Transaction by conversion factor as well, as there is no qty mentioned for stock reconciliation
2015-08-21 14:39:25 +05:30
Nabin Hait
895029dc15
Validate currency in transactions
2015-08-21 14:31:47 +05:30
Nabin Hait
c561a499d7
Multi currency GL entry fixes
2015-08-21 14:31:47 +05:30
Nabin Hait
69c1401764
Multi currency patch initialized
2015-08-21 14:31:47 +05:30
Nabin Hait
50ba6faaf6
Currency input from Chart of Accounts page
2015-08-21 14:31:47 +05:30
Nabin Hait
46bcbaf97b
GL Entry in account currency
2015-08-21 14:31:47 +05:30
Nabin Hait
0e46a9b86e
Journal Entry: client side triggers
2015-08-21 14:31:46 +05:30
Nabin Hait
e459cb4d09
Journal Entry: validate and post gle in multi currency
2015-08-21 14:31:46 +05:30
Nabin Hait
7dbd395781
Toggle alternative currency fields
2015-08-21 14:31:46 +05:30
Nabin Hait
6aea1c0da5
Currency validation in gl entry
2015-08-21 14:31:46 +05:30
Rushabh Mehta
aeab6c559c
[enhancement] multi-currency, added fields #1002
2015-08-21 14:31:46 +05:30
Nabin Hait
597a402dff
Divisonal loss adjustment in purchase receipt
2015-08-21 14:13:55 +05:30
Nabin Hait
1b6fd1ba5b
[fix]Stock UOM Replace Utility: Multiply Qty after Transaction by conversion factor as well, as there is no qty mentioned for stock reconciliation
2015-08-21 13:05:19 +05:30
Anand Doshi
ac35b8af55
Merge pull request #3912 from nabinhait/jv1
...
[fix] payment amt against invoice outstanding
2015-08-21 13:01:53 +05:30
Anand Doshi
9b02aa722c
Merge pull request #3920 from nabinhait/advances
...
[fix] Fetch advances in Sales/Purchase Invoice
2015-08-21 13:01:39 +05:30
Anand Doshi
32f3426007
Merge pull request #3919 from nabinhait/conv_factor
...
[fix] UOM Conversion factor mandatory in stock entry
2015-08-21 12:59:19 +05:30
Nabin Hait
046db626a2
[fix] Fetch advances in Sales/Purchase Invoice
2015-08-21 12:34:41 +05:30
Nabin Hait
d7ed197131
[fix] UOM Conversion factor mandatory in stock entry
2015-08-21 12:00:32 +05:30
Anand Doshi
f37884472d
Merge branch 'develop'
2015-08-20 18:47:19 +05:30
Anand Doshi
e9cebd4de3
bumped to version 5.7.5
2015-08-20 19:17:19 +06:00
Anand Doshi
db1a9edbdf
[minor] removed test case of template cannot have stock
2015-08-20 18:20:06 +05:30
Anand Doshi
5c85740aab
[minor] don't validate stock for template item
2015-08-20 17:43:35 +05:30
Anand Doshi
8554cbf001
[minor] fixed patch item template attributes
2015-08-20 17:43:35 +05:30
Anand Doshi
0e90e8e8dc
Merge branch 'develop'
2015-08-20 15:45:07 +05:30
Anand Doshi
30d3eb3d4b
bumped to version 5.7.4
2015-08-20 16:15:07 +06:00
Anand Doshi
cf7adb5c02
[patch] re-run repost_reserved_qty
2015-08-20 15:42:58 +05:30
Anand Doshi
a5dce0adea
Merge branch 'develop'
2015-08-20 15:42:23 +05:30
Anand Doshi
ac9a94f421
bumped to version 5.7.3
2015-08-20 16:12:23 +06:00
Anand Doshi
62cae01542
Merge branch 'develop'
2015-08-20 15:34:47 +05:30
Anand Doshi
4488764cd0
bumped to version 5.7.2
2015-08-20 16:04:47 +06:00
Anand Doshi
f6abfbffbc
Merge pull request #3914 from nabinhait/patchfix
...
[fix][patch] Repost reserved qty for stock item
2015-08-20 15:33:49 +05:30
Nabin Hait
24998a6ca7
[fix][patch] Delete Bin for non-stock item
2015-08-20 15:21:42 +05:30
Nabin Hait
712fccd876
[fix][patch] Repost reserved qty for stock item
2015-08-20 14:59:44 +05:30
Anand Doshi
35cd427463
Merge branch 'develop'
2015-08-20 11:57:31 +05:30
Anand Doshi
7299026729
bumped to version 5.7.1
2015-08-20 12:27:31 +06:00
Anand Doshi
98c3aec274
[minor] hide Attribute Value using script so that it is visible in data import
2015-08-20 11:56:31 +05:30
Anand Doshi
807c6af571
[minor] fix item template attributes
2015-08-20 11:42:05 +05:30
Nabin Hait
efc89f4395
[fix] payment amt against invoice outstanding
2015-08-20 11:30:44 +05:30
Anand Doshi
f3eeb601ad
Merge pull request #3908 from rmehta/text-editor
...
[fix] changed text > text editor for description fields in tables
2015-08-19 16:48:06 +05:30
Anand Doshi
701b994671
Merge branch 'develop'
2015-08-19 14:34:30 +05:30
Anand Doshi
139283fbf7
bumped to version 5.7.0
2015-08-19 15:04:30 +06:00
Anand Doshi
89cac6c8a6
Merge pull request #3909 from nabinhait/testcase1
...
Testcase and Patch Fix
2015-08-19 14:33:50 +05:30
Nabin Hait
3922823bd6
[fix] Test case fixed for purchase cost against project
2015-08-19 14:23:13 +05:30
Nabin Hait
6ce72c5b07
[fix] Update project cost for draft project only
2015-08-19 14:15:28 +05:30
Anand Doshi
548f7e8c74
[change-log] for v5.7.0
2015-08-19 13:31:35 +05:30
Anand Doshi
e270c7261d
[minor] project cost
2015-08-19 13:02:30 +05:30
Rushabh Mehta
81e9d4e8f5
[fix] changed text > text editor for description fields in tables
2015-08-19 13:00:03 +05:30
Anand Doshi
4765d75b83
[minor] fix typo
2015-08-19 12:50:44 +05:30
Anand Doshi
8af567a229
[minor] import error
2015-08-19 12:10:03 +05:30
Anand Doshi
6e82d7b50d
Merge pull request #3899 from nabinhait/project
...
[fix] Purchase cost against project
2015-08-19 11:58:12 +05:30
Nabin Hait
fa5fcf5405
[fix] Purchase cost against project
2015-08-19 11:56:23 +05:30
Anand Doshi
ffca81dbc1
[fix] added test cases and fixes to Item Variants
2015-08-19 11:52:05 +05:30
Rushabh Mehta
b52724f5b9
[minor] should fix #3884
2015-08-19 11:41:41 +05:30
Anand Doshi
b82961e8dd
Merge pull request #3898 from nabinhait/reserved_qty
...
[fix][patch] Reserved Qty logic fixed and reposted for existing items
2015-08-19 11:22:03 +05:30
Nabin Hait
1826791891
[fix][patch] Reserved Qty logic fixed and reposted for existing items
2015-08-19 11:00:00 +05:30
Anand Doshi
df469c3e02
Merge pull request #3901 from rmehta/notify
...
[minor] notify stop/unstop (merge after merging realtime in frappe)
2015-08-19 10:31:41 +05:30
Anand Doshi
79cb7bffab
Merge pull request #3906 from anandpdoshi/item-variant-fixes
...
Fixes to Item Variant Attribute
2015-08-19 10:31:11 +05:30
Anand Doshi
90fd6fee23
[fix] generate item code for variant
2015-08-19 10:21:24 +05:30
Anand Doshi
2538e51887
Fixes to Item Variant Attribute. Fixes #3905
2015-08-19 09:33:07 +05:30
Anand Doshi
1d2bde3b56
Merge pull request #3900 from nabinhait/fix6
...
Note files deleted, shifted to frappe repo
2015-08-18 18:35:17 +05:30
Anand Doshi
cf2c624c03
Merge pull request #3902 from rmehta/pos-print
...
[enhancement] POS print after save #3853
2015-08-18 18:32:04 +05:30
Rushabh Mehta
ad9156a6ae
[enhancement] POS print after save #385:wq:wq
2015-08-18 18:05:43 +05:30
Anand Doshi
2f01f96ae3
[fix] [patch] item template attributes
2015-08-18 17:52:50 +05:30
Anand Doshi
2235caebee
Merge pull request #3903 from anandpdoshi/fix-item-variant-attribute
...
patch and rename Variant Attribute to Item Variant Attribute
2015-08-18 17:44:21 +05:30
Anand Doshi
afbe39a559
[fix] patch and rename Variant Attribute to Item Variant Attribute
2015-08-18 17:30:44 +05:30
Rushabh Mehta
1d1f1b06d9
[minor] notify stop/unstop
2015-08-18 17:26:50 +05:30
Anand Doshi
b6c5b21dd0
[fix] [patch] typo and remove Bulk SMS
2015-08-18 16:27:20 +05:30
Anand Doshi
71c33823f6
Merge pull request #3806 from neilLasrado/item-variants
...
Improvements in Item Variants
2015-08-18 16:13:10 +05:30
Anand Doshi
82988be79f
Merge pull request #3846 from rmehta/add-to-learn
...
Learn module
2015-08-18 12:10:03 +05:30
Nabin Hait
5b19dc3a5f
Note files deleted, shifted to frappe repo
2015-08-18 11:46:53 +05:30
Anand Doshi
09ba897297
[fix] [patch] Item Template Attributes - migration from v4 and v5
2015-08-17 19:21:29 +05:30
Anand Doshi
2e0d90a7b9
[fix] travis
2015-08-17 17:58:53 +05:30
Anand Doshi
ddcc766a55
bumped to version 5.6.4
2015-08-17 17:58:53 +05:30
Nabin Hait
9495adc9d7
Update patches.txt
2015-08-17 17:58:53 +05:30
Nabin Hait
26bc1a58af
[fix] Get Balance only if account or party mentioned
2015-08-17 17:58:53 +05:30
Nabin Hait
91e1077e4c
[fix] precision issue in stock entry
2015-08-17 17:58:52 +05:30
Nabin Hait
3278ea177d
[fix] Additional Costs patch fixed for version 4 to 5 migration
2015-08-17 17:58:52 +05:30
Nabin Hait
f1b2032466
Included Party and reference name in Journal Entry Account grid view
2015-08-17 17:58:52 +05:30
Nabin Hait
1c98886c85
[fix] Get stock and rate function restored
2015-08-17 17:58:52 +05:30
Anand Doshi
92d8a9b2d5
bumped to version 5.6.3
2015-08-17 17:58:52 +05:30
Anand Doshi
fd67ebf66d
Show Communication in CRM
2015-08-17 17:58:51 +05:30
Anand Doshi
720ccabfe9
[fix] Journal Entry Reference Name query
2015-08-17 17:58:51 +05:30
Anand Doshi
d4cb1045ed
[fix] Show 'Backflush Raw Materials Based On' in Manufacturing Settings
2015-08-17 17:58:51 +05:30
Anand Doshi
4f3eadc488
bumped to version 5.6.2
2015-08-17 17:58:51 +05:30
Anand Doshi
5dc7ff1355
[hotfix] [patch] cleanup journal entry
2015-08-17 17:58:51 +05:30
Anand Doshi
bfbf768daa
[hotfix] [patch] cleanup journal entry
2015-08-17 17:58:51 +05:30
Anand Doshi
b334065977
[hotfix] translation in es.csv
2015-08-17 17:58:50 +05:30
Anand Doshi
d74d121199
[hotfix] [report] payment period based on invoice date
2015-08-17 17:58:50 +05:30
Anand Doshi
d726ce5e9e
[fix] travis
2015-08-17 15:14:25 +05:30
Anand Doshi
5e35590bc9
Merge pull request #3871 from anandpdoshi/append-to-communication
...
Show Communication in CRM
2015-08-17 14:48:08 +05:30
Anand Doshi
41793bddd2
Merge branch 'develop'
2015-08-17 14:36:48 +05:30
Anand Doshi
b23049a55e
bumped to version 5.6.4
2015-08-17 15:06:48 +06:00
Nabin Hait
99bf6c0927
Update patches.txt
2015-08-17 14:31:29 +05:30
Anand Doshi
b528c5cad2
Merge pull request #3893 from nabinhait/fix2
...
[fix] Get Balance only if account or party mentioned
2015-08-17 14:29:03 +05:30
Nabin Hait
dc76823a81
[fix] Get Balance only if account or party mentioned
2015-08-17 14:28:19 +05:30
Anand Doshi
862c36832a
Merge pull request #3892 from nabinhait/fix1
...
[fix] Get stock and rate function restored
2015-08-17 14:26:01 +05:30
Anand Doshi
bd9dad96ae
Merge pull request #3894 from nabinhait/fix3
...
Included Party and reference name in Journal Entry Account grid view
2015-08-17 14:24:52 +05:30
Anand Doshi
8ca933a83f
Merge pull request #3895 from nabinhait/fix4
...
[fix] Additional Costs patch fixed for version 4 to 5 migration
2015-08-17 14:24:30 +05:30
Anand Doshi
f0107db3ca
Merge pull request #3896 from nabinhait/fix5
...
[fix] precision issue in stock entry
2015-08-17 14:20:51 +05:30
Nabin Hait
c01342190c
[fix] precision issue in stock entry
2015-08-17 14:18:44 +05:30
Nabin Hait
f763c1af25
[fix] Additional Costs patch fixed for version 4 to 5 migration
2015-08-17 12:06:53 +05:30
Nabin Hait
cbfd387c0b
Included Party and reference name in Journal Entry Account grid view
2015-08-17 11:42:48 +05:30
Nabin Hait
ac07b1cc07
[fix] Get stock and rate function restored
2015-08-17 10:50:30 +05:30
Anand Doshi
4a1319289e
Merge branch 'develop'
2015-08-14 17:53:41 +05:30
Anand Doshi
c5a43e46d8
bumped to version 5.6.3
2015-08-14 18:23:40 +06:00
Anand Doshi
1a2e6bf718
Show Communication in CRM
2015-08-14 17:51:14 +05:30
Anand Doshi
04dfd7b98f
[fix] Journal Entry Reference Name query
2015-08-14 17:34:43 +05:30
Anand Doshi
85e0e87f01
[fix] Show 'Backflush Raw Materials Based On' in Manufacturing Settings
2015-08-14 12:55:27 +05:30
Anand Doshi
e7a3c7c5ab
Merge branch 'develop'
2015-08-14 12:21:37 +05:30
Anand Doshi
acc32fe7f7
bumped to version 5.6.2
2015-08-14 12:51:37 +06:00
Anand Doshi
487454e817
[hotfix] [patch] cleanup journal entry
2015-08-14 12:17:34 +05:30
Anand Doshi
dc278a7427
[hotfix] [patch] cleanup journal entry
2015-08-14 12:05:50 +05:30
Anand Doshi
698ee434c0
[hotfix] translation in es.csv
2015-08-14 11:45:43 +05:30
Neil Trini Lasrado
68f66a7e8b
fixed Test Cases
2015-08-13 17:34:25 +05:30
Anand Doshi
e116cb596c
[hotfix] [report] payment period based on invoice date
2015-08-13 17:25:20 +05:30
Neil Trini Lasrado
6cce304b27
Changelog added
2015-08-13 16:19:55 +05:30
Neil Trini Lasrado
9710eede00
Fixed Test Cases
2015-08-13 16:19:55 +05:30
Neil Trini Lasrado
62dba50e9b
Multiple Fixes
2015-08-13 16:18:55 +05:30
Neil Trini Lasrado
cdc060cb7c
Allow Editing variant attribute in Variant. Add validation to check duplication.
2015-08-13 16:17:36 +05:30
Neil Trini Lasrado
b9b49632f2
Added patch to fetch Item Template Attributes
2015-08-13 16:17:36 +05:30
Neil Trini Lasrado
ebf4cbeae3
Fixed Manage Variant
2015-08-13 16:17:01 +05:30
Neil Trini Lasrado
8b608c9043
Search Variants added to Item Master
...
Added feature for Variants to hande numeric values
2015-08-13 16:17:01 +05:30
Anand Doshi
169c3ed09d
Merge branch 'develop'
2015-08-13 15:54:41 +05:30
Anand Doshi
d7ba618b92
bumped to version 5.6.1
2015-08-13 16:24:41 +06:00
Anand Doshi
0a37f5575f
[hotfix] [patch] stock entry additional cost for docstatus < 2
2015-08-13 15:53:40 +05:30
Anand Doshi
b1bae1bde8
Merge branch 'develop'
2015-08-13 15:44:03 +05:30
Anand Doshi
bcfd4277f4
bumped to version 5.6.0
2015-08-13 16:14:03 +06:00
Anand Doshi
2b6915519f
[change-log]
2015-08-13 15:36:18 +05:30
Anand Doshi
5eb84352ec
Merge pull request #3868 from nabinhait/price_list_rate
...
[fix] Reset price list rate based on Pricing Rule type
2015-08-13 15:10:08 +05:30
Anand Doshi
1580bf9ca4
Merge pull request #3869 from rmehta/pricing-rule-layout
...
[minor] pricing rule layout
2015-08-13 15:08:54 +05:30
Rushabh Mehta
4c4c534dcd
[minor] pricing rule layout
2015-08-13 15:00:54 +05:30
Nabin Hait
0da11f1b10
[fix] Reset price list rate based on Pricing Rule type
2015-08-13 14:58:19 +05:30
Anand Doshi
cb4784c940
Merge pull request #3822 from neilLasrado/item-uom
...
Changed UOM validation for Item Master
2015-08-13 14:36:37 +05:30
Nabin Hait
4c8ee279f3
Merge branch 'bobzz-zone-patch-7' into develop
2015-08-13 14:15:45 +05:30
Nabin Hait
58aea1f819
minor fix
2015-08-13 14:15:27 +05:30
Nabin Hait
760bfb27d0
Merge branch 'patch-7' of https://github.com/bobzz-zone/erpnext into bobzz-zone-patch-7
2015-08-13 14:14:26 +05:30
Anand Doshi
c0c4e866be
Merge branch 'nabinhait-item_description' into develop
...
Conflicts:
erpnext/patches.txt
2015-08-13 13:40:33 +05:30
Anand Doshi
b16474e606
[minor] Reload Journal Entry Account
2015-08-13 13:38:22 +05:30
Rushabh Mehta
bbed8972c3
[minor] pincode label changed to postal code, #3770
2015-08-13 13:38:21 +05:30
Rushabh Mehta
35f94dfbc6
[patch] cleanup_journal_entry
2015-08-13 13:38:21 +05:30
Rushabh Mehta
832fa2e76b
[patch] cleanup_journal_entry
2015-08-13 13:38:21 +05:30
Rushabh Mehta
682ce24f8c
[patch] cleanup_journal_entry
2015-08-13 13:38:21 +05:30
Nabin Hait
9f02b08427
minor fix
2015-08-13 13:38:20 +05:30
Rushabh Mehta
2645980f62
[patch] cleanup_journal_entry
2015-08-13 13:38:20 +05:30
Anand Doshi
ae1a91835e
Merge pull request #3866 from nabinhait/fix3
...
[fix] fraction issue in gl entry
2015-08-13 13:35:57 +05:30
Anand Doshi
094755415a
Merge pull request #3867 from rmehta/salary-slip-fix
...
[fix] salary slip to consider disable rounded total, #3792
2015-08-13 13:35:02 +05:30
Anand Doshi
746eae4d1a
[minor] Reload Journal Entry Account
2015-08-13 12:52:13 +05:30
Rushabh Mehta
cdbb448f6c
[fix] salary slip to consider disable rounded total, #3792
2015-08-13 12:48:04 +05:30
Rushabh Mehta
907ea7dd8a
[minor] pincode label changed to postal code, #3770
2015-08-13 12:35:43 +05:30
Neil Trini Lasrado
9a73b7a319
Changed UOM validation for Item Master
2015-08-13 12:21:32 +05:30
Nabin Hait
2e54da2ea5
[fix] fraction issue in gl entry
2015-08-13 12:19:27 +05:30
Rushabh Mehta
7e4b93f48e
[patch] cleanup_journal_entry
2015-08-13 12:10:21 +05:30
Rushabh Mehta
b01cc1b449
[patch] cleanup_journal_entry
2015-08-13 11:54:04 +05:30
Rushabh Mehta
f738b951c5
[patch] cleanup_journal_entry
2015-08-13 11:50:51 +05:30
Anand Doshi
bb1679b74b
Merge pull request #3865 from nabinhait/fix3
...
minor fix
2015-08-13 11:48:47 +05:30
Nabin Hait
6ddcac7cee
minor fix
2015-08-13 11:47:35 +05:30
Rushabh Mehta
bcf7da6b1e
[patch] cleanup_journal_entry
2015-08-13 11:46:01 +05:30
Nabin Hait
c51d5ba5df
[patch] Update item description in Production Order based on item master
2015-08-13 11:39:45 +05:30
Anand Doshi
57ca765d9e
Merge pull request #3848 from rmehta/journal-entry-refactor
...
[refactor] added dynamic link in journal entry, #3847 , #3814
2015-08-13 11:39:13 +05:30
Anand Doshi
92e7d1f41d
Merge pull request #3855 from nabinhait/discount
...
discount percentage should not be reset to zero on applying price list
2015-08-13 11:39:03 +05:30
Rushabh Mehta
ed40542658
[fix] minor auto-select party type and add has_permission in whitelisted methods
2015-08-13 10:34:49 +05:30
Rushabh Mehta
207b3efed7
[fix] journal entry get_query
2015-08-12 15:18:35 +05:30
Rushabh Mehta
3131c732ff
[fix] capacity planning error
2015-08-12 12:29:16 +05:30
Rushabh Mehta
1828c12481
[refactor] added dynamic link in journal entry, #3847
2015-08-12 12:28:33 +05:30
Nabin Hait
4a91c49e0d
discount percentage should not be reset to zero on applying price list
2015-08-11 18:16:10 +05:30
Anand Doshi
ba1f4263dd
Added Rohit Industries as sponsors for #3546
2015-08-11 17:05:17 +05:30
Anand Doshi
7d45929872
Merge pull request #3829 from dottenbr/customer-taxid
...
Tax ID added and Customer Details description updated
2015-08-11 12:33:32 +05:30
Rushabh Mehta
b70f871592
Merge pull request #3850 from dottenbr/patch-1
...
Update README.md
2015-08-11 10:15:42 +05:30
Rushabh Mehta
d58df13150
Merge pull request #3849 from dottenbr/phone-mandatory-removed
...
Phone removed from mandatory in Address
2015-08-11 10:03:28 +05:30
Dominik
4101a48869
Update README.md
2015-08-10 23:59:16 +05:30
Dominik
28eff7fb91
Phone removed from mandatory in Address
2015-08-10 20:22:21 +05:30
Nabin Hait
6dc40e9baf
Update accounts_controller.py
2015-08-10 19:18:39 +05:30
Nabin Hait
ac6d11eb3c
minor improvements
2015-08-10 19:14:43 +05:30
Neil Trini Lasrado
1c6eeb228f
Fixes in Stock Entry
2015-08-10 19:14:43 +05:30
Neil Trini Lasrado
b44f26d1ba
Fixed Max value for update FG Item in Production Order
2015-08-10 19:14:43 +05:30
Neil Trini Lasrado
8ea2f45713
Renamed update_fg_goods_based_on in Manufacturing Settings to backflush_raw_materials_based_on
2015-08-10 19:14:43 +05:30
Neil Trini Lasrado
dde65752b6
Fixed code to consider partial FG entry
2015-08-10 19:14:43 +05:30
Neil Trini Lasrado
845980c010
Added Feature - Update FG based on Material Transfer For Manufacturing
2015-08-10 19:14:43 +05:30
Rushabh Mehta
6f593130d0
Merge pull request #3823 from nabinhait/stock-entry-tax
...
Stock entry tax
2015-08-10 14:31:20 +05:30
Nabin Hait
52f3bfca73
change log and sponsors page
2015-08-10 14:07:45 +05:30
Nabin Hait
3c3a3ecea8
Additional Costs in Stock Entry
2015-08-10 14:07:45 +05:30
Nabin Hait
246e47e76e
[fix] Dashboard in customer / supplier
2015-08-10 14:07:02 +05:30
Nabin Hait
f6aad5ed2d
Distribute tax amount between items in stock entry
2015-08-10 14:07:01 +05:30
Nabin Hait
aa87931172
Show only active BOM in stock entry
2015-08-10 14:07:01 +05:30
Nabin Hait
fc155c7712
Added tax table in stock entry
2015-08-10 14:07:01 +05:30
Rushabh Mehta
bf4f99adf1
[learn] added modules #3841
2015-08-10 13:21:57 +05:30
Rushabh Mehta
47b5e6272d
Merge pull request #3844 from nabinhait/fix12
...
[fix] Made expense account non-mandatory in POS Profile
2015-08-10 13:16:39 +05:30
Rushabh Mehta
eae56cae54
Merge pull request #3843 from thecarly/patch-1
...
[minor] fixed typo
2015-08-10 13:13:00 +05:30
Nabin Hait
ea925d26a8
[fix] Made expense account non-mandatory in POS Profile
2015-08-10 12:57:05 +05:30
thecarly
56f5156f3c
[minor] fixed typo
2015-08-10 12:50:44 +05:30
Rushabh Mehta
ee069d47b5
Merge pull request #3797 from anandpdoshi/fix-missing-item-images
...
Rename old filenames for Item
2015-08-10 11:58:54 +05:30
Rushabh Mehta
6c83b6bddc
Merge pull request #3811 from rmehta/opportunity-customer
...
[minor] add close button in opportunity and project links in customer
2015-08-10 11:57:23 +05:30
Rushabh Mehta
815b460ddd
Merge pull request #3809 from nabinhait/journal_entry_fix
...
[fix] Party / Account Validation message against Invoice
2015-08-10 11:57:01 +05:30
Rushabh Mehta
5f7166de83
[minor] remove section break in opportunity
2015-08-10 11:30:47 +05:30
Dominik
d1416542a0
Tax ID added and Customer Details description updated
...
Tax ID is a relatively generic descriptor for VAT (Value Added Tax) or any other countrie's tax identification system and should be required by most users of an ERP system. Since this removes the necessity to put the VAT into the Customer Description (not the ideal place to begin with) the description was updated and slimmed down.
2015-08-08 00:05:38 +05:30
Rushabh Mehta
69095e7285
[fix] website search
2015-08-07 15:48:53 +05:30
Rushabh Mehta
d6bdad7adf
[fix] [hot] total in time log batch
2015-08-06 15:46:42 +05:30
Rushabh Mehta
48cccca9af
[minor] add close button in opportunity and project links in customer
2015-08-06 15:37:01 +05:30
Nabin Hait
7c5124140e
[fix] Party / Account Validation message against Invoice
2015-08-06 12:58:53 +05:30
Nabin Hait
143f384986
Merge branch 'develop'
2015-08-05 19:14:37 +05:30
Nabin Hait
37fdc43c88
bumped to version 5.5.1
2015-08-05 19:44:37 +06:00
Nabin Hait
ceb761852e
Merge pull request #3807 from nabinhait/hotfix
...
[fix] fifo in stock ledger
2015-08-05 19:13:12 +05:30
Nabin Hait
65d8de36d0
Merge pull request #3804 from nabinhait/fix1
...
Fixes
2015-08-05 19:04:41 +05:30
Nabin Hait
8142cd2865
[fix] fifo in stock ledger
2015-08-05 18:57:37 +05:30
Anand Doshi
ed3a6cf748
[minor] removed print
2015-08-05 18:38:33 +05:30
Nabin Hait
2285eb7649
Merge pull request #3801 from bobzz-zone/patch-8
...
Update buying_controller.py
2015-08-05 16:15:02 +05:30
Nabin Hait
1648605950
[fix] Disabled OHADA system while fetching COA based on country
2015-08-05 15:56:05 +05:30
Nabin Hait
039154faa9
[fix] Asynchronus issue while fetching item description in Production Order
2015-08-05 15:56:05 +05:30
Rushabh Mehta
147acfd502
[fix] [mobile] abs url erpnext icon
2015-08-05 14:49:32 +05:30
bobzz-zone
b4c7bad33d
Update buying_controller.py
...
dont force change conversion factor
2015-08-05 11:30:12 +07:00
bobzz-zone
ff04bf6346
Update stock_entry.py
...
fixed for null expense account
2015-08-05 11:28:11 +07:00
Anand Doshi
aa5182bb9e
[fix] rename old filenames that start with FileData and fix missing Item images
2015-08-04 23:06:01 +05:30
Anand Doshi
329afe88f9
Merge branch 'develop'
2015-08-04 16:12:22 +05:30
Anand Doshi
ffa1e1c3bc
bumped to version 5.5.0
2015-08-04 16:42:22 +06:00
Anand Doshi
f6616b6cbd
[change-log]
2015-08-04 16:02:37 +05:30
Anand Doshi
d95b8e530a
Merge pull request #3794 from nabinhait/serial_no
...
[fix] serial no validation in return entry
2015-08-04 15:43:23 +05:30
Nabin Hait
0e1314c5b5
[fix] serial no validation in return entry
2015-08-04 15:22:48 +05:30
Anand Doshi
cc920a7e4c
Merge pull request #3780 from rmehta/service-product-bundle
...
[enhancement] make service type product bundle #3452
2015-08-04 15:05:05 +05:30
Rushabh Mehta
5bd394278d
[fix] test-case, warehouse mandatory for mix type product bundle
2015-08-04 14:49:25 +05:30
Rushabh Mehta
a208c56813
[enhancement] auto insert item price if missing, #3533
2015-08-04 14:48:52 +05:30
Rushabh Mehta
862a2eb975
[enhancement] make service type product bundle:
2015-08-04 14:47:45 +05:30
Anand Doshi
1385f20042
Merge pull request #3791 from rmehta/update-translations
...
[translations] updated
2015-08-04 14:45:58 +05:30
Anand Doshi
950250d444
Merge pull request #3793 from nabinhait/serial_no
...
Validate serial no in return entry with against document
2015-08-04 14:45:30 +05:30
Rushabh Mehta
63b98ec113
[translations] updated
2015-08-04 12:43:37 +05:30
Anand Doshi
4a0edd04c4
Merge pull request #3779 from nabinhait/fifo_stack
...
[fix] Get fifo rate only qty exists in batch
2015-08-04 12:26:42 +05:30
Nabin Hait
b7c0c55d61
Validate serial no in return entry with against document
2015-08-04 12:18:12 +05:30
Nabin Hait
232ad777c9
[fix][patch] Remove fifo stack entry if qty after transaction is zero via stock reconciliation
2015-08-04 11:40:38 +05:30
Nabin Hait
7edb951fdb
[fix] Get fifo rate only qty exists in batch
2015-08-04 11:09:14 +05:30
Nabin Hait
845bbe3e27
Update fix_invoice_outstanding.py
2015-08-04 10:48:05 +05:30
Nabin Hait
f7bf50d6fe
Merge pull request #3786 from nabinhait/fix4
...
[fix] Ignore if error coming while sending emails to system managers
2015-08-03 19:27:04 +05:30
Nabin Hait
374559bfad
[fix] Ignore if error coming while sending emails to system managers
2015-08-03 19:26:32 +05:30
Anand Doshi
e7c6605455
Merge pull request #3761 from nabinhait/fix1
...
Fixes
2015-08-03 19:20:31 +05:30
Nabin Hait
5bbe823106
[patch] Fix outstanding amount for original invoice for return entry
2015-08-03 19:19:11 +05:30
Nabin Hait
ad44b00f33
[patch] Fix outstanding amount for original invoice for return entry
2015-08-03 19:19:11 +05:30
Nabin Hait
893db7a5c3
Allow payment against invoice with negative outstanding
2015-08-03 19:18:22 +05:30
Nabin Hait
433cdc960d
Update outstanding in original invoice from return invoice
2015-08-03 19:18:22 +05:30
Nabin Hait
4f2832ecd2
[fix] Allow against purchase invoice against credit amount row
2015-08-03 19:18:22 +05:30
Nabin Hait
1755a5f298
[fix] get items from bom in material request
2015-08-03 19:18:21 +05:30
Nabin Hait
b3b059b0ea
[fix] payment reconciliation
2015-08-03 19:18:21 +05:30
Anand Doshi
d615d4fdcd
Merge pull request #3785 from nabinhait/fix3
...
[fix] newsletter list unique check
2015-08-03 19:18:07 +05:30
Anand Doshi
da77abc25b
Merge pull request #3767 from nabinhait/tax_calc
...
[fix] Tax calculation while discount applied on net total
2015-08-03 19:17:04 +05:30
Anand Doshi
7cb19f6e9f
Merge pull request #3783 from nabinhait/fix2
...
[fix] Get open SO in production planning tool
2015-08-03 19:14:24 +05:30
Anand Doshi
441a75b1d4
Merge pull request #3782 from rmehta/uom-fix
...
[fix] force stock_uom in item and stock ledger entry
2015-08-03 19:13:38 +05:30
Nabin Hait
03bccb81d8
[test case] Test case for discount amount on net total
2015-08-03 19:11:44 +05:30
Nabin Hait
1db0b6de0c
Patch to notify system managers if there are any wrong entries due to bug related to discount amount on net total
2015-08-03 19:11:44 +05:30
Nabin Hait
db53a789be
[fix] Tax calculation while discount applied on net total
2015-08-03 19:10:59 +05:30
Nabin Hait
c3e1f6bb96
[fix] newsletter list unique check
2015-08-03 19:09:05 +05:30
Anand Doshi
f2e5e7fc22
Merge pull request #3776 from nabinhait/account_type
...
Propogate root type and report type into children based on parent
2015-08-03 19:04:42 +05:30
Nabin Hait
541927d58a
[fix] Get open SO in production planning tool
2015-08-03 16:39:20 +05:30
Rushabh Mehta
b16b9cd7a0
[fix] force stock_uom in item and stock ledger entry
2015-08-03 16:13:33 +05:30
Nabin Hait
94f15fcec6
Propogate root type and report type into children based on parent
2015-08-03 11:17:07 +05:30
Anand Doshi
ba9dbb1b09
[minor] removed Link/DocType in Payment Period Based on Invoice Date
2015-08-03 11:05:45 +05:30
Nabin Hait
b7f2066250
Merge pull request #3768 from nabinhait/uom
...
[fix] UOM conversion factor in stock entry
2015-07-31 20:11:23 +05:30
Nabin Hait
b30c40ec8a
[fix] UOM conversion factor in stock entry
2015-07-31 19:48:57 +05:30
Rushabh Mehta
2f5587ab25
[fix] uom conversion factor in stock entry, #3734
2015-07-31 15:20:29 +05:30
Nabin Hait
75e9733283
Merge branch 'develop'
2015-07-30 16:47:49 +05:30
Nabin Hait
69588f57e7
bumped to version 5.4.2
2015-07-30 17:17:48 +06:00
Nabin Hait
88d8c164f7
Merge pull request #3757 from nabinhait/fix1
...
[hotfix] item search in production order
2015-07-30 16:46:27 +05:30
Nabin Hait
c330a49e9d
[hotfix] item search in production order
2015-07-30 16:45:58 +05:30
Nabin Hait
b75f5fd5ab
Merge branch 'develop'
2015-07-30 14:59:01 +05:30
Nabin Hait
6f5815838e
bumped to version 5.4.1
2015-07-30 15:29:01 +06:00
Nabin Hait
fe53651287
Merge pull request #3755 from nabinhait/fix1
...
repost stock for product bundle materials
2015-07-30 14:54:21 +05:30
Nabin Hait
d8546c4316
Fixed include holiday logic in leave calculation
2015-07-30 14:53:27 +05:30
Nabin Hait
17405d4130
repost stock for product bundle materials
2015-07-30 14:53:27 +05:30
Anand Doshi
2f443a5789
[hotfix] Item checkbox mandatory and removed Module Def Contacts
2015-07-30 14:44:43 +05:30
Nabin Hait
a5e11d7195
Merge branch 'develop'
2015-07-30 11:57:53 +05:30
Nabin Hait
3832e1f9be
bumped to version 5.4.0
2015-07-30 12:27:53 +06:00
Nabin Hait
67079d292c
Merge pull request #3725 from neilLasrado/test
...
Fixed test cases related to Time Logs
2015-07-30 11:51:26 +05:30
Nabin Hait
01a3a81f71
Merge pull request #3753 from nabinhait/return1
...
[fix] Actual tax amount should be negative while creating return entry
2015-07-30 11:50:45 +05:30
Nabin Hait
befa8d613f
Merge pull request #3750 from nabinhait/payreco
...
Minor fixes
2015-07-30 11:50:19 +05:30
Nabin Hait
9e26bcfeeb
[fix] Actual tax amount should be negative while creating return entry
2015-07-30 11:48:18 +05:30
Neil Trini Lasrado
f948fea3bf
simulate added to make_time_log in test_time_log
2015-07-29 18:48:58 +05:30
Neil Trini Lasrado
d851bd8d85
Fixed test cases related to Time Logs
2015-07-29 18:48:58 +05:30
Nabin Hait
30672c6b55
Merge pull request #3751 from neilLasrado/leave-application
...
Fixes in leave application
2015-07-29 18:47:59 +05:30
Neil Trini Lasrado
e73941b9cc
Fixes in leave application
2015-07-29 18:39:27 +05:30
Nabin Hait
f33787a706
[fix] Get serial nos using FIFO in Return Delivery Note
2015-07-29 18:08:10 +05:30
Nabin Hait
fcc4021e44
minor fix in payment reconciliation
2015-07-29 17:41:51 +05:30
Nabin Hait
3b67c89e0b
Merge pull request #3749 from nabinhait/changelog
...
Change log added
2015-07-29 16:41:57 +05:30
Nabin Hait
7364ebaff6
minor fix
2015-07-29 16:41:23 +05:30
Nabin Hait
fd8f34018d
Change log added
2015-07-29 16:38:02 +05:30
Nabin Hait
799fa09a23
Merge pull request #3748 from nabinhait/fix7
...
[fix][patch] Reload Leave Type
2015-07-29 16:37:29 +05:30
Nabin Hait
d1dc622914
[fix][patch] Reload Leave Type
2015-07-29 16:37:02 +05:30
Nabin Hait
8ce47862f9
Merge branch 'meatechsupport-develop' into develop
2015-07-29 16:15:27 +05:30
Nabin Hait
b24d2efc4b
[fix] Updated 'Include Holiday' in existing and default leave type records
2015-07-29 16:15:08 +05:30
Nabin Hait
a184fbfa66
Merge branch 'develop' of https://github.com/meatechsupport/erpnext into meatechsupport-develop
2015-07-29 16:05:47 +05:30
Nabin Hait
763821d57d
Merge pull request #3746 from nabinhait/get_item_details
...
[fix] Get item details based on selected company
2015-07-29 16:02:39 +05:30
Nabin Hait
a132767126
Merge pull request #3739 from nabinhait/packed-items
...
Packed items in sales invoice
2015-07-29 16:01:30 +05:30
Nabin Hait
453cc374d4
- Fixed logic of reserved qty calculation while delivered product bundle via Sales Invoice
...
- Delete stock ledger entries on cancellation of Sales Invoice while product bundle delivered
- Make packing list on validate
2015-07-29 15:59:57 +05:30
Nabin Hait
43e46a8506
Merge pull request #3733 from nabinhait/fix3
...
POS Profile: removed income account, cost center, territory and bank/cash account from mandatory
2015-07-29 15:57:05 +05:30
Nabin Hait
2c95130451
Merge pull request #3741 from nabinhait/sponsors
...
sponsors page updated
2015-07-29 15:54:58 +05:30
Nabin Hait
d46fb5eb8c
Merge pull request #3743 from rmehta/indicator-fix
...
[fix] indicators for sales order, purchase order #3736
2015-07-29 15:53:44 +05:30
Nabin Hait
e95c18a42d
Merge pull request #3744 from nabinhait/return
...
Sales / Purchase Return Improvements
2015-07-29 15:51:34 +05:30
Nabin Hait
18c2c54633
Merge pull request #3718 from rmehta/item-cleanup
...
[cleanup] yes/no selects changed to checks in Item
2015-07-29 15:49:54 +05:30
Nabin Hait
0edec9d25b
Merge pull request #3730 from nabinhait/fix1
...
minor fixes
2015-07-29 15:48:24 +05:30
Nabin Hait
15216fdd6f
[fix] Get item details based on selected company
2015-07-29 15:47:45 +05:30
Nabin Hait
9117af3077
[fix] Uncheck Is POS option while creating return entry against POS Invoice
2015-07-29 15:40:59 +05:30
Rushabh Mehta
92b6f76612
[fix] disable save in naming series
2015-07-29 15:17:30 +05:30
Rushabh Mehta
8bf0b89595
[minor] currency field in list view for item price
2015-07-29 14:55:48 +05:30
Nabin Hait
746c162055
Return status in listview for return entry
2015-07-29 14:54:33 +05:30
Nabin Hait
9eb9ccd785
Make Debit / Credit Note button in Purchase / Sales Invoice
2015-07-29 13:23:37 +05:30
Nabin Hait
1e046aa49a
Hide buttons for return entry
2015-07-29 13:16:37 +05:30
Nabin Hait
3ad26e4dd1
Fix Against Voucher in GL Entry for return against purchase invoice
2015-07-29 13:15:57 +05:30
Rushabh Mehta
2f3b097d63
[fix] indicators for sales order, purchase order #3736
2015-07-29 13:08:27 +05:30
Nabin Hait
c505cbc988
sponsors page updated
2015-07-29 12:34:18 +05:30
Rushabh Mehta
1e8025b327
[cleanup] yes/no selects changed to checks in Item
2015-07-29 11:38:33 +05:30
Anand Doshi
0e6f2474e8
[minor] removed trailing space in offer letter status
2015-07-29 11:27:02 +05:30
Meatechsupport
e102332f08
removed testcase
2015-07-28 19:03:30 +04:00
Meatechsupport
145227e4ec
Edited the Test case
2015-07-28 18:39:04 +04:00
Nabin Hait
18e033514e
Merge pull request #3679 from neilLasrado/freeze-customer
...
Added ability to freeze Customer/Supplier
2015-07-28 15:21:06 +05:30
Nabin Hait
26052df76e
POS Profile: removed income account, cost center, territory and bank-cash account from mandatory
2015-07-28 15:12:54 +05:30
Nabin Hait
b2f354a614
Merge pull request #3731 from nabinhait/fix2
...
[fix] Contact section visibility in Warranty Claim
2015-07-28 15:12:22 +05:30
Rushabh Mehta
49a59c075f
[minor] [setup-wizard] add check for sample data
2015-07-28 12:23:40 +05:30
Neil Trini Lasrado
ff3b220c79
Fixed gl_entry Validation
2015-07-28 12:23:14 +05:30
Neil Trini Lasrado
cc7cb2a70a
Allowed frozen_accounts_modifier to create records against frozen customer/supplier
2015-07-28 12:17:03 +05:30
Neil Trini Lasrado
79bf233734
Test Cases added to check if customer is frozen
2015-07-28 12:17:03 +05:30
Neil Trini Lasrado
3698b84d7c
Typo fixes in Supplier and Customer Document
2015-07-28 12:17:02 +05:30
Neil Trini Lasrado
3fbbb71afc
Added ability to freeze Customer/Supplier
2015-07-28 12:17:02 +05:30
Nabin Hait
a2f18ba794
[fix] Contact section visibility in Warranty Claim
2015-07-28 12:00:45 +05:30
Nabin Hait
9088432f10
Fetch default expense account and cost center from item if company matches, otherwise fetch from company master
2015-07-28 11:16:22 +05:30
Nabin Hait
c80059e10e
[fix] Ignore making SLE for opening stock reco with zero qty
2015-07-28 11:16:22 +05:30
Anand Doshi
8e8e9c61ca
[minor] Show description in Sales Order
2015-07-28 10:46:14 +05:30
Rushabh Mehta
424f0c7b84
[fix] [setup wizard] ignore fiscal year
2015-07-28 10:36:33 +05:30
Rushabh Mehta
aa5fb5e50e
[fix] [setup wizard] ignore if user is the primary user
2015-07-28 10:31:09 +05:30
Rushabh Mehta
08a60653ba
[fix] [setup wizard] ignore if user is the primary user
2015-07-28 09:22:36 +05:30
Meatechsupport
8b96fdac12
Indentation Error
...
realligned
2015-07-27 16:55:54 +04:00
Meatechsupport
e319598c51
IndentationError
...
alligned code
2015-07-27 16:42:22 +04:00
Nabin Hait
0c7fd6cd94
Merge branch 'develop'
2015-07-27 17:11:16 +05:30
Nabin Hait
0b5260acf0
bumped to version 5.3.1
2015-07-27 17:41:16 +06:00
Nabin Hait
d4be82cf9b
corrected typo
2015-07-27 17:09:54 +05:30
Nabin Hait
0166e9e47a
Merge pull request #3726 from nabinhait/fix1
...
minor fix
2015-07-27 17:09:38 +05:30
Nabin Hait
b71471fcb5
minor fix
2015-07-27 17:09:07 +05:30
Nabin Hait
7e8d7d05ef
Merge branch 'develop'
2015-07-27 15:55:57 +05:30
Nabin Hait
228ff87ea2
bumped to version 5.3.0
2015-07-27 16:25:56 +06:00
Nabin Hait
8d8655e1cd
Change log added
2015-07-27 15:54:39 +05:30
Meatechsupport
5c73bafeaa
Modifying the number of leave days calculation part.
...
we don't need to exclude the Holiday list (that comes in between) from the total number of leaves applied.
Add option in the leave type
added a field in the leave type to include and exclude the holidays from
the tolal leave applied days
Added the field
Added a field Include Holiday to leave Type doctype
changed the lable
changed the lable from "Include Holiday" to "Include holidays within leaves
as leaves"
Rearranged the function
moved holidays = leave_app.get_holidays() under if
Corrected 'total_leave_days' : flt(tot_days)-flt(holidays)
Adding test case
added the test case
Added test case
Added test case to test_leave_application.py
adding default value
added default value and corrected the syntax.
IndentationError
removed extra tabs after
2015-07-27 13:46:00 +04:00
Anand Doshi
14859faf17
[minor] Accounts Payable Report Type='Script Report'
2015-07-24 17:30:39 +05:30
Nabin Hait
2b7eda8135
Merge pull request #3683 from nabinhait/return
...
Sales / Purchase Return Enhancement
2015-07-24 16:53:01 +05:30
Anand Doshi
751d7ecd85
Merge pull request #3716 from tmimori/develop
...
Removed HTML from messages
2015-07-24 14:28:59 +05:30
Nabin Hait
6a09b3f7ef
Merge pull request #3702 from neilLasrado/capacity-planning
...
Global switch to set capacity planning in manufacturing
2015-07-24 14:26:28 +05:30
Nabin Hait
21897e3c52
Merge pull request #3714 from nabinhait/fix4
...
[fix] gross profit report
2015-07-24 14:25:35 +05:30
Nabin Hait
15b4f6310c
Merge pull request #3701 from neilLasrado/po
...
Disallowed End of Life Items from getting selected in Production Orders and Stock Reconciliation
2015-07-24 14:25:13 +05:30
Tsutomu Mimori
196a0bc675
Amend for frappe/erpnext/pull/3716
2015-07-24 17:06:00 +09:00
Tsutomu Mimori
7c011985f0
Merge remote-tracking branch 'frappe/develop' into develop
2015-07-24 17:02:13 +09:00
Nabin Hait
3cf67a462b
Cleanup and test cases for serialized item
2015-07-24 13:26:54 +05:30
Nabin Hait
f061877b4f
[fix] Stock Entry permissions
2015-07-24 13:26:54 +05:30
Nabin Hait
04d244a360
Credit Note print format
2015-07-24 13:26:54 +05:30
Nabin Hait
b74999da82
[testcase] Testcase for return purchase invoice
2015-07-24 13:26:53 +05:30
Nabin Hait
061f7079ed
Test case for purchase return
2015-07-24 13:26:53 +05:30
Nabin Hait
246ed3f122
Test cases for sales return
2015-07-24 13:26:53 +05:30
Nabin Hait
6b25708b7a
Minor fixes
2015-07-24 13:26:53 +05:30
Nabin Hait
623ed57663
Removed Sales/Purchase Return option from Stock Entry
2015-07-24 13:26:53 +05:30
Nabin Hait
1d21842f68
Sales / Purchase Return redesigned via negative DN / SI / PR / PI
2015-07-24 13:26:53 +05:30
Nabin Hait
ada485f096
Outgoing rate in Purchase Return based on reference/original Purchase Receipt rate
2015-07-24 13:26:53 +05:30
Neil Trini Lasrado
8a9d41a92e
Modified Test Cases for Production Order
2015-07-24 13:18:45 +05:30
Neil Trini Lasrado
f965c5d203
now_datetime changed to nowdate
2015-07-24 13:14:57 +05:30
Neil Trini Lasrado
21647974c4
Test Cases Added to Production Order
2015-07-24 13:14:57 +05:30
Neil Trini Lasrado
9c3dca63fa
Disallowed End of Life Items from getting selected in Production Orders and Stock Reconciliation
2015-07-24 13:14:56 +05:30
Tsutomu Mimori
c40b99be26
Merge remote-tracking branch 'frappe/develop' into develop
2015-07-23 22:10:40 +09:00
Tsutomu Mimori
982f4ae44d
Removed HTML from messages
2015-07-23 22:09:35 +09:00
Anand Doshi
9257413b68
[minor] Added 'Import Data' in sample data
2015-07-23 18:16:44 +05:30
Neil Trini Lasrado
c723c8b5aa
Disable Capacity Planning label changed to Disable Capacity Planning & Time Tracking in Manufacturing Settings
2015-07-23 17:43:27 +05:30
Neil Trini Lasrado
2771b7d828
Track Operations removed and Global Switch added to disable capacity planning in manufacturing settings
2015-07-23 17:39:35 +05:30
Anand Doshi
75ebed815f
Merge pull request #3711 from nabinhait/budget
...
Validation on Account for assigning budget
2015-07-23 17:26:56 +05:30
Nabin Hait
975ef07c48
Merge pull request #3706 from neilLasrado/variant
...
Fetch Template Bom if no BOM is set against Item Variant in Production Order
2015-07-23 17:26:11 +05:30
Nabin Hait
f666535223
[fix] gross profit report
2015-07-23 17:08:44 +05:30
Nabin Hait
08fb19ac8c
Validation on Account for assigning budget
2015-07-23 16:59:43 +05:30
Anand Doshi
db9762be3f
Merge pull request #3712 from rmehta/setup-wizard-fix
...
[fix] contact name in setup wizard
2015-07-23 16:46:09 +05:30
Anand Doshi
03ae61afce
Merge pull request #3681 from rmehta/sample-data
...
[enhancement] update to setup wizard, added users, employees, sample data
2015-07-23 16:45:28 +05:30
Anand Doshi
1847b705fe
Merge pull request #3704 from nabinhait/fix2
...
[fix] SMS status and log
2015-07-23 16:45:00 +05:30
Anand Doshi
4a573a7e8b
Merge pull request #3709 from nabinhait/contacts
...
[cleanup] Party Type deleted
2015-07-23 16:41:36 +05:30
Nabin Hait
f74b9b06f7
Merge pull request #3708 from neilLasrado/material-request
...
Fetch items from Packing List if Exists in Sales Order while raising …
2015-07-23 15:21:50 +05:30
Nabin Hait
2820a8749f
Merge pull request #3710 from neilLasrado/stock-report
...
Opening Balance row added to Stock Ledger Report
2015-07-23 15:21:26 +05:30
Rushabh Mehta
41b4864f0c
Merge pull request #3713 from neilLasrado/manage-variants
...
Fixes for Item Variants
2015-07-23 15:01:28 +05:30
Neil Trini Lasrado
13df8a40ef
Validation added to prevent user to Manage Variants if Item Template is Unsaved. Prevented message stating variants updated while saving item template if there are no variants against that item Template
2015-07-23 12:46:59 +05:30
Rushabh Mehta
7cfa5f0508
[fix] contact name in setup wizard
2015-07-23 12:39:44 +05:30
Nabin Hait
bb274fce2e
[cleanup] Party Type deleted
2015-07-23 11:45:30 +05:30
Rushabh Mehta
fec61fe33e
[minor] fix report type for Accounts Payable
2015-07-23 10:39:13 +05:30
Neil Trini Lasrado
d0387f41df
Opening Balance row added to Stock Ledger Report
2015-07-22 18:44:59 +05:30
Neil Trini Lasrado
05d8174696
Fetch items from Packing List if Exists in Sales Order while raising Material Request against SO
2015-07-22 16:31:34 +05:30
Rushabh Mehta
ba02ce6adc
[docs] added description
2015-07-22 15:07:48 +05:30
Anand Doshi
886def0a69
[fix] convert Item and Item Grid images to absolute urls
2015-07-22 14:43:37 +05:30
Anand Doshi
7590aa2524
[minor] raise EmptyStockReconciliationItemsError when no change in any of the items
2015-07-22 14:43:36 +05:30
Neil Trini Lasrado
8b48ceab8c
Removed logic for get_item_details in Production Planning Tool, Used get_item_details function of Production Order instead
2015-07-22 12:42:21 +05:30
Nabin Hait
d900e12ae7
Change log for sms
2015-07-22 12:21:55 +05:30
Nabin Hait
098760f0e2
[fix] SMS status and log
2015-07-22 12:17:48 +05:30
Neil Trini Lasrado
cc431716ed
Fetch Template Bom if no BOM is set against Item Variant in Production Order
2015-07-22 12:13:47 +05:30
Anand Doshi
f5ea801b69
Merge pull request #3700 from nabinhait/fix1
...
[report] Letter Head option in General Ledger
2015-07-21 12:19:57 +05:30
Nabin Hait
e2b8ccf1bb
[report] Letter Head option in General Ledger report
2015-07-21 12:02:36 +05:30
Anand Doshi
f447c8258a
[minor] Newsletter Message should be mandatory
2015-07-20 16:10:04 +05:30
Nabin Hait
f78ffd84b4
Merge branch 'develop'
2015-07-20 15:22:10 +05:30
Nabin Hait
63d345c6ab
bumped to version 5.2.1
2015-07-20 15:52:10 +06:00
Anand Doshi
d0d1af2072
Merge pull request #3696 from nabinhait/fix1
...
[fix][report] Show only active employee in Employee leave balance report
2015-07-20 13:27:47 +05:30
Anand Doshi
83694fd180
[minor] removed is_group from search fields of Account
2015-07-20 13:26:22 +05:30
Anand Doshi
fc353efeca
Merge pull request #3670 from neilLasrado/expense-claim
...
Default Expense Account added to Expense Claim Type.
2015-07-20 13:04:33 +05:30
Anand Doshi
16edf8b478
Merge pull request #3685 from nabinhait/fix6
...
[fix] Fetch debit/credit from reference journal entry
2015-07-20 13:00:10 +05:30
Nabin Hait
c9e4fbeda0
[fix][report] Show only active employee in Employee leave balance report
2015-07-20 12:57:48 +05:30
Anand Doshi
46ae789f2f
Merge pull request #3682 from anandpdoshi/anand-july-17
...
Remove 'Stopped' banner in Sales Order, show ERPNext icon instead of 'ERPNext'
2015-07-20 12:57:17 +05:30
Anand Doshi
a9a284a5ae
Merge pull request #3693 from rmehta/close-task
...
[minor] close button for task and item not found error fix
2015-07-20 12:56:50 +05:30
Rushabh Mehta
823e88d5bd
[minor] close button for task and item not found error fix
2015-07-20 10:56:39 +05:30
Nabin Hait
1be94efcfa
[fix] Fetch debit/credit from reference journal entry
2015-07-17 17:25:52 +05:30
Anand Doshi
a5e9c71397
[ui] changed Learn icon
2015-07-17 15:55:10 +05:30
Anand Doshi
285135da8e
[ui] Remove 'Stopped' alert banner in Sales Order
2015-07-17 15:14:40 +05:30
Anand Doshi
906c2babaa
[ui] Show ERPNext icon instead of ERPNext in navbar
2015-07-17 15:14:39 +05:30
Nabin Hait
14a394cde1
Update fields_to_be_renamed.py
2015-07-17 15:14:19 +05:30
Nabin Hait
3c821c89f2
Update rename_table_fieldnames.py
2015-07-17 15:13:29 +05:30
Nabin Hait
a041297861
Update rename_total_fields.py
2015-07-17 15:12:52 +05:30
Rushabh Mehta
856ee10dc4
[enhancement] update to setup wizard, added users, employees, sample data
2015-07-17 15:03:18 +05:30
Nabin Hait
1401e3f679
Update rename_total_fields.py
2015-07-17 14:43:19 +05:30
Nabin Hait
dae29bf2d4
Update fields_to_be_renamed.py
2015-07-17 14:42:46 +05:30
Nabin Hait
0a3be6da27
Update rename_table_fieldnames.py
2015-07-17 14:39:41 +05:30
Nabin Hait
3631e9cbe0
Merge branch 'develop'
2015-07-16 17:15:41 +05:30
Nabin Hait
1c9a7d2a1b
bumped to version 5.2.0
2015-07-16 17:45:40 +06:00
Anand Doshi
972f2f9194
[change-log]
2015-07-16 16:19:30 +05:30
Anand Doshi
239296d16a
Merge pull request #3657 from nabinhait/fix4
...
Reserved warehouse should not be validated on cancellation of sales order
2015-07-16 15:57:59 +05:30
Anand Doshi
3210db9056
Merge pull request #3656 from rmehta/sms-log
...
[fix] create SMS Log
2015-07-16 15:56:08 +05:30
Neil Trini Lasrado
feda4f9bc9
Default Expense Account added to Expense Claim Type. Fetch account while making Bank Entry
2015-07-16 15:44:56 +05:30
Anand Doshi
f6954fb798
Merge pull request #3663 from neilLasrado/bom
...
Bom
2015-07-16 15:02:40 +05:30
Anand Doshi
c6656e68b8
Merge pull request #3666 from nabinhait/patch-fix
...
[patch][fix] Sales BOM should be renamed before rename_table_fields patch
2015-07-16 14:55:35 +05:30
Anand Doshi
a39387d352
Merge pull request #3664 from rmehta/develop
...
[cleanup] removed welcome emails
2015-07-16 14:25:24 +05:30
Rushabh Mehta
f3791797d6
[fix] [patch]
2015-07-16 14:17:59 +05:30
Rushabh Mehta
ea4d63cef3
[cleanup] removed welcome emails
2015-07-16 14:17:59 +05:30
Nabin Hait
5464ca8a73
[patch][fix] Sales BOM should be renamed before rename_table_fields patch
2015-07-16 12:19:57 +05:30
Rushabh Mehta
6c6875f503
[cleanup] removed welcome emails
2015-07-16 11:53:18 +05:30
Neil Trini Lasrado
20523c45c7
Patch for default BOM
2015-07-16 11:27:06 +05:30
Neil Trini Lasrado
0248811e53
Fixed deafault BOM problem
2015-07-16 11:26:40 +05:30
Rushabh Mehta
93416ee72c
Update sponsors.md
2015-07-15 16:42:46 +05:30
Rushabh Mehta
51e7086a08
[patch] rename roles
2015-07-15 16:30:49 +05:30
Anand Doshi
5e849ae53e
[help] added new links to Learn
2015-07-15 15:23:02 +05:30
Rushabh Mehta
de0db0d000
Merge pull request #3658 from anandpdoshi/anand-july-15
...
[fix] Mozilla hack for images in table for print
2015-07-15 12:58:19 +05:30
Anand Doshi
f3a67c4533
[fix] Mozilla hack for images in table for print
2015-07-15 12:37:45 +05:30
Nabin Hait
0847f9a074
Reserved warehouse should not be validated on cancellation of sales order
2015-07-14 18:23:05 +05:30
Anand Doshi
9490c21b8a
Merge pull request #3641 from rmehta/role-rename
...
[rename] Material User > Stock User
2015-07-14 12:10:48 +05:30
Rushabh Mehta
bdb71bca4e
[perm] added stock, project user for company
2015-07-14 11:54:42 +05:30
Anand Doshi
e8861e2871
Merge pull request #3649 from rmehta/purchase-invoice-fix
...
[fix] supplier invoice number fix
2015-07-14 11:50:07 +05:30
Anand Doshi
b084b5e449
Merge pull request #3651 from rmehta/pos-default-pay-fix
...
[fix] pos default payment #3631
2015-07-14 11:49:46 +05:30
Anand Doshi
41d3e57702
Merge pull request #3650 from rmehta/time-log-fix-2
...
[fix] overlap fix in time log #3647
2015-07-14 11:45:49 +05:30
Anand Doshi
9df2899f72
Merge pull request #3648 from rmehta/time-log-fix
...
[fixes] hours in time-log #3644 , project buttons on condition, removed Guest permission in notification_control
2015-07-14 11:25:46 +05:30
Rushabh Mehta
dacf127f1b
[fix] time log overlap condition, #SavedByATestCase
2015-07-14 11:06:28 +05:30
Rushabh Mehta
2b49f9b30a
[fix] pos default payment #3631
2015-07-14 11:01:42 +05:30
Rushabh Mehta
533434e878
[fix] overlap fix in time log #3647
2015-07-14 10:39:33 +05:30
Rushabh Mehta
1956028ddc
[fix] supplier invoice number fix
2015-07-14 10:26:50 +05:30
Rushabh Mehta
a87dc3b4e6
[minor] move position in accounts settings
2015-07-14 10:22:07 +05:30
Rushabh Mehta
97b3f750c9
[fixes] hours in time-log #3644 , project buttons on condition, removed Guest permission in notification_control
2015-07-14 10:14:48 +05:30
Anand Doshi
c41b63eff1
Merge pull request #3642 from anandpdoshi/anand-july-13
...
Fixes to Cart
2015-07-13 16:56:37 +05:30
Anand Doshi
e6f7ac961f
[fix] Add to Cart visibility, Customer's Price List in Shopping Cart and Address creation from Shopping Cart
2015-07-13 16:24:37 +05:30
Rushabh Mehta
cf26964deb
Merge pull request #3640 from anandpdoshi/anand-july-13
...
Fixes to Issues
2015-07-13 15:37:11 +05:30
Rushabh Mehta
94157334a7
[rename] Material User > Stock User
2015-07-13 15:06:12 +05:30
Anand Doshi
c530161de0
[fix] Item image urls can now have paranthesis
2015-07-13 15:05:39 +05:30
Nabin Hait
2212ae12d8
Merge branch 'develop'
2015-07-13 14:26:23 +05:30
Nabin Hait
54ade0d26c
bumped to version 5.1.6
2015-07-13 14:56:23 +06:00
Nabin Hait
f043760526
Merge pull request #3639 from neilLasrado/develop
...
Sales BOM to Product Bundle rename changes
2015-07-13 14:22:10 +05:30
Neil Trini Lasrado
1cd049d824
Sales BOM to Product Bundle rename changes
2015-07-13 14:17:42 +05:30
Nabin Hait
0a45260ed9
Merge branch 'develop'
2015-07-13 13:09:05 +05:30
Nabin Hait
1540ad12f9
bumped to version 5.1.5
2015-07-13 13:39:05 +06:00
Nabin Hait
76bd015b2c
Merge pull request #3637 from rmehta/time-log-filter
...
[minor] [enhancement] added employee filter in timelog #3607
2015-07-13 13:04:03 +05:30
Rushabh Mehta
5054a3955b
Update CONTRIBUTING.md
2015-07-13 12:54:08 +05:30
Nabin Hait
1a0713e4b9
Merge pull request #3584 from neilLasrado/develop
...
Minor fixes
2015-07-13 12:49:46 +05:30
Rushabh Mehta
e9604d8484
[minor] [enhancement] added employee filter in timelog #3607
2015-07-13 12:47:45 +05:30
Neil Trini Lasrado
008d1a0334
Fixes in Stock Entry
2015-07-13 12:41:28 +05:30
Neil Trini Lasrado
fe2ffaeafa
Fixes in Production Planning Tool
2015-07-13 12:41:28 +05:30
Neil Trini Lasrado
dcef448f1e
Planned Start Date added to Production Planning Tool
2015-07-13 12:41:28 +05:30
Neil Trini Lasrado
6224cfc414
Manage Variants added in Tools under Stock Module
2015-07-13 12:41:28 +05:30
Neil Trini Lasrado
700434ff37
has_variants made 'no copy' in Item Master
2015-07-13 12:41:28 +05:30
Neil Trini Lasrado
4089b3d376
Salary Slip renamed to Process Payroll
2015-07-13 12:41:28 +05:30
Neil Trini Lasrado
6cfab43d5f
Renamed Depends on LWP field in the Earning and Deduction table of Salary Slip.
2015-07-13 12:41:27 +05:30
Neil Trini Lasrado
09a66c4201
Fixed issue with Customer Contacts in Transaction Documents
2015-07-13 12:41:27 +05:30
Neil Trini Lasrado
ed8cecbdd8
Sales BOM renamed to Product Bundle
2015-07-13 12:41:27 +05:30
Neil Trini Lasrado
c70109d0c5
Item table made mandatory in Stock Reconciliation
2015-07-13 12:40:57 +05:30
Neil Trini Lasrado
ccf8c337f7
Expected Delivery date validation changed to message
2015-07-13 12:40:57 +05:30
Nabin Hait
6809b4d86c
Merge pull request #3636 from neilLasrado/po
...
Patch for Production Order Track Operation
2015-07-13 12:38:45 +05:30
Neil Trini Lasrado
cc08c68153
Patch for Production Order Track Operation
2015-07-13 12:35:20 +05:30
Nabin Hait
7daa7900ea
Merge pull request #3614 from neilLasrado/po
...
Track Operations added to Production Order
2015-07-13 12:29:45 +05:30
Nabin Hait
7641f3fe53
Merge pull request #3635 from nabinhait/fix3
...
Reserved warehouse should not be validated on cancellation of sales order
2015-07-13 12:28:49 +05:30
Nabin Hait
fe2f51bbbc
Merge pull request #3628 from nabinhait/sponsors
...
Change log and Sponsors page
2015-07-13 12:27:30 +05:30
Neil Trini Lasrado
4f33249e1c
Fixes in Production Order
2015-07-13 12:26:33 +05:30
Nabin Hait
b95b606f25
sponsors page and change log
2015-07-13 12:26:24 +05:30
Nabin Hait
e690f245f2
Change log and Sponsors page
2015-07-13 12:26:24 +05:30
Neil Trini Lasrado
5da4d857c9
Track Operations added to Production Order
2015-07-13 12:01:57 +05:30
Nabin Hait
6e38e917eb
Reserved warehouse should not be validated on cancellation of sales order
2015-07-13 11:36:36 +05:30
Rushabh Mehta
f3b0b95b15
[fix] [filter] for general ledger
2015-07-13 10:24:25 +05:30
Nabin Hait
7b0f1ffb2d
Merge pull request #3627 from nabinhait/fix2
...
PP Tool: Create production order if applicable for item
2015-07-10 17:32:16 +05:30
Nabin Hait
97bb6bbaf4
Merge pull request #3621 from neilLasrado/batch
...
Validation added to prevent adding items with expired batch numbers t…
2015-07-10 17:31:52 +05:30
Neil Trini Lasrado
cb4b2ec52a
Fixes in validate baatch function
2015-07-10 17:31:06 +05:30
Nabin Hait
f18bbcef86
PP Tool: Create production order if applicable for item
2015-07-10 17:31:03 +05:30
Nabin Hait
27976382d8
Merge pull request #3626 from nabinhait/credit_days
...
minor fix in due date validation
2015-07-10 17:13:15 +05:30
Nabin Hait
93d3c82737
minor fix in due date validation
2015-07-10 17:12:08 +05:30
Neil Trini Lasrado
03bf529622
Validation added to prevent adding items with expired batch numbers to stock ledger entry
2015-07-10 16:20:21 +05:30
Nabin Hait
6c4085fc0c
Merge pull request #3616 from nabinhait/credit_days
...
Customer's credit days based on fixed days / last day of the next month
2015-07-10 16:16:14 +05:30
Nabin Hait
c37484c8da
Merge pull request #3622 from rmehta/minor-fixes
...
[fix] cart and general leger report
2015-07-10 16:12:01 +05:30
Rushabh Mehta
b4ec294463
Merge pull request #3625 from neilLasrado/task
...
Validation added to prevent task being closed with open dependent tasks
2015-07-10 14:30:46 +05:30
Neil Trini Lasrado
58406a920c
Validation added to prevent task being closed with open dependent tasks
2015-07-10 12:57:49 +05:30
Rushabh Mehta
98311f4394
Merge pull request #3624 from pdvyas/lang
...
Fix lang code for česky and update translations
2015-07-10 12:37:31 +05:30
Pratik Vyas
53829707ad
Fix lang code for česky
2015-07-10 12:05:53 +05:30
Pratik Vyas
fcc31028c6
Update translations
2015-07-10 12:05:24 +05:30
Rushabh Mehta
fc3d87181a
[fix] cart and general leger report
2015-07-10 10:11:07 +05:30
Nabin Hait
6336ff7323
minor fixes
2015-07-09 19:48:21 +05:30
Nabin Hait
fde13e666a
Merge pull request #3609 from rmehta/address-link
...
[fix] link address via owner, if created in portal #3540
2015-07-09 19:09:39 +05:30
Nabin Hait
f80c09290e
Merge pull request #3610 from nabinhait/variants
...
Adding rows not allowed in Variant table in Manage Variants and Item
2015-07-09 19:07:56 +05:30
Nabin Hait
b797963bd8
Merge pull request #3618 from neilLasrado/naming
...
Validation added in Production Order
2015-07-09 18:53:39 +05:30
Nabin Hait
03b42a7934
Merge pull request #3619 from neilLasrado/contact
...
Allowed same contact to be Linked to Customer AND Supplier AND Sales …
2015-07-09 18:52:22 +05:30
Nabin Hait
7e9ff99a6c
Merge pull request #3620 from nabinhait/currency_symbol
...
Currency symbol fixed in sales invoice outstanding and advance amount
2015-07-09 18:51:38 +05:30
Nabin Hait
5cbe3441e8
Reload doctype in patch
2015-07-09 18:42:15 +05:30
Nabin Hait
0724449d0e
[patch] Set 'Credit days based on' in existing customer, customer group and company
2015-07-09 17:49:50 +05:30
Neil Trini Lasrado
5a6ff218e8
Allowed same contact to be Linked to Customer AND Supplier AND Sales Partner
2015-07-09 17:49:40 +05:30
Nabin Hait
122e4e0a96
Currency symbol fixed in sales invoice outstanding and advance amount
2015-07-09 17:36:58 +05:30
Neil Trini Lasrado
e233f0e2ff
Validation added in Production Order to prevent PO against Item Template or if Allow PO is No in Item Master
2015-07-09 17:35:51 +05:30
Nabin Hait
40e92b679b
Posting date trigger function commonified
2015-07-09 17:12:23 +05:30
Nabin Hait
4770a1abb5
Customer's credit days based on fixed days / last day of the next month
2015-07-09 16:35:53 +05:30
Rushabh Mehta
ccb9117ba5
[minor] Added employees in Newsletter List
2015-07-09 13:56:02 +05:30
Nabin Hait
db938762c7
[fix] Adding rows not allowed in Variant table in Manage Variants and Item form
2015-07-09 11:55:38 +05:30
Nabin Hait
0910fc3b25
Merge pull request #3605 from nabinhait/testcases
...
Test case fixed
2015-07-09 11:28:36 +05:30
Rushabh Mehta
f0737667c6
[fix] link address via owner, if created in portal #3540
2015-07-09 11:09:01 +05:30
Nabin Hait
2d83122c6b
removed client side test cases
2015-07-08 18:02:42 +05:30
Nabin Hait
e2b7f832cc
Test case fixed
2015-07-08 17:56:06 +05:30
Nabin Hait
6a6958db5c
Merge branch 'develop'
2015-07-08 16:53:55 +05:30
Nabin Hait
ab1acb460b
bumped to version 5.1.4
2015-07-08 17:23:55 +06:00
Nabin Hait
48d71fa7f7
Merge pull request #3602 from nabinhait/develop
...
Change log
2015-07-08 16:47:14 +05:30
Nabin Hait
30960e6a06
Change log added
2015-07-08 16:46:28 +05:30
Nabin Hait
736000c223
Merge pull request #3600 from neilLasrado/batch
...
Fixed issues in Expired Batches while making Stock Entry
2015-07-08 16:10:21 +05:30
Nabin Hait
4017bfcd2e
Merge pull request #3591 from rmehta/salary-manager-fix
...
[fixes] salary manager #3554
2015-07-08 15:39:33 +05:30
Nabin Hait
e594e5de49
Merge pull request #3596 from neilLasrado/pos
...
Mode of Payment added to POS Profile
2015-07-08 15:36:30 +05:30
Nabin Hait
1f1f14be39
Merge pull request #3599 from nabinhait/develop
...
Multiple fixes
2015-07-08 15:33:57 +05:30
Neil Trini Lasrado
ebb60f5dbc
Fixed issues in Expired Batches while making Stock Entry
2015-07-08 15:24:02 +05:30
Neil Trini Lasrado
75b00e3958
Mode of Payment added to POS Profile
2015-07-08 14:43:47 +05:30
Nabin Hait
5e3646ad6e
validation message fix
2015-07-08 14:39:03 +05:30
Nabin Hait
4439d8264f
minor fix
2015-07-08 14:32:56 +05:30
Nabin Hait
00d79eb68d
minor fix
2015-07-08 14:32:27 +05:30
Nabin Hait
28a9e35de9
Validate item rate with reference document with tolerance 0.009
2015-07-08 13:10:59 +05:30
Nabin Hait
c450536a2c
[fix] Map values in Debit / Credit Note from Stock Entry
2015-07-08 13:10:59 +05:30
Nabin Hait
3b3c48c877
[fix] Set Customer name in opportunity as per company name in lead
2015-07-08 13:10:59 +05:30
Rushabh Mehta
621d6eac3c
[minor] added calendar hooks
2015-07-08 12:39:27 +05:30
Rushabh Mehta
f9b356992a
[fixes] salary manager #3554
2015-07-07 16:30:29 +05:30
Nabin Hait
c516e1871d
Merge branch 'develop'
2015-07-06 15:32:32 +05:30
Nabin Hait
9a38e669ef
bumped to version 5.1.3
2015-07-06 16:02:32 +06:00
Nabin Hait
143f2c6faf
Merge pull request #3585 from nabinhait/change_log
...
Added change log
2015-07-06 15:15:29 +05:30
Nabin Hait
9269813207
Added change log
2015-07-06 15:13:35 +05:30
Nabin Hait
0e6f92efa8
Merge pull request #3571 from neilLasrado/item-varients
...
Fixes for Item Attributes
2015-07-06 14:56:33 +05:30
Neil Trini Lasrado
1a0e86f11d
Update item_attribute.py
...
Error Description Changed
2015-07-06 14:46:06 +05:30
Nabin Hait
73b7efd61d
Merge pull request #3583 from rmehta/quotation-list-fix
...
[fix] quotation list #3492
2015-07-06 14:31:23 +05:30
Nabin Hait
4c4a5b968c
Merge pull request #3576 from nabinhait/variant
...
[fix][patch] delete item variant attributes if no variants exists against that item
2015-07-06 14:30:48 +05:30
Nabin Hait
7b5ac6396a
Merge pull request #3575 from nabinhait/batch_report
...
[fix] Hide zero balance rows in batch-wise balance history report
2015-07-06 14:30:23 +05:30
Nabin Hait
01771e8afc
Merge pull request #3573 from rmehta/fix-labels
...
[fix] [minor] fix customer_name, supplier_name labels
2015-07-06 14:30:13 +05:30
Nabin Hait
347c4affe9
Merge pull request #3567 from rmehta/item-description-mozilla-fix
...
[fix] item image in mozilla #3412 #3413
2015-07-06 14:27:34 +05:30
Nabin Hait
526957505f
Merge pull request #3569 from rmehta/employee-unset-user-id
...
[fix] remove user permission if user id is unset #3447
2015-07-06 14:27:22 +05:30
Nabin Hait
faa3416852
Merge pull request #3570 from rmehta/remove-masters-from-setup
...
[minor] remove the term 'Masters' from setup, it is confusing and not used anywhere, add Company to Accounts tab
2015-07-06 14:26:51 +05:30
Rushabh Mehta
56912791e2
[fix] quotation list #3492
2015-07-06 11:14:31 +05:30
Rushabh Mehta
38647c68b9
Merge pull request #3579 from neilLasrado/autocomplete
...
Autocomplete issues fixed in Manage Variants
2015-07-05 13:52:56 +05:30
Neil Trini Lasrado
4d64acfafc
Autocomplete issues fixed in Manage Variants
2015-07-04 14:50:00 +05:30
Nabin Hait
d7441ec051
[fix][patch] delete item variant attributes if no variants exists against that item
2015-07-03 19:20:27 +05:30
Rushabh Mehta
0f15273bd7
Merge pull request #3572 from tmimori/develop
...
Fix for Monthly Attendance Report #3402
2015-07-03 15:49:26 +05:30
Nabin Hait
24efb3122a
[fix] Hide zero balance rows in batch-wise balance history report
2015-07-03 15:20:14 +05:30
Rushabh Mehta
85e6f5d04e
[fix] [minor] fix customer_name, supplier_name labels
2015-07-03 12:59:08 +05:30
Neil Trini Lasrado
1faaf71dfc
Auto-Capitalize Item Attribute Abbreation, Prevent attribute to be deleated if Variant exists
2015-07-03 12:44:01 +05:30
Tsutomu Mimori
5a0fbff1a3
#3402
2015-07-03 16:08:02 +09:00
Rushabh Mehta
7278c0ae85
[minor] remove the term 'Masters' from setup, it is confusing and not used anywhere, add Company to Accounts tab
2015-07-03 12:21:50 +05:30
Rushabh Mehta
5688a6c31a
[fix] remove user permission if user id is unset #3447
2015-07-03 11:34:53 +05:30
Rushabh Mehta
71349d221b
[fix] item image in mozilla #3412 #3413
2015-07-03 10:43:35 +05:30
Nabin Hait
b7219dc698
Merge branch 'develop'
2015-07-02 17:58:40 +05:30
Nabin Hait
37c6ce7b1e
bumped to version 5.1.2
2015-07-02 18:28:40 +06:00
Nabin Hait
7028ba507e
Merge pull request #3561 from nabinhait/develop
...
Fixes
2015-07-02 17:55:18 +05:30
Nabin Hait
fcee17fd16
Removed purchase item validation
2015-07-02 17:51:35 +05:30
Nabin Hait
5906f02e3a
update item image in invoice if item exists
2015-07-02 17:51:35 +05:30
Nabin Hait
721dcb1870
Merge branch 'develop'
2015-07-02 16:33:52 +05:30
Nabin Hait
6385967ccd
bumped to version 5.1.1
2015-07-02 17:03:52 +06:00
Nabin Hait
81a977cacf
Merge pull request #3559 from nabinhait/develop
...
Fixes
2015-07-02 16:32:34 +05:30
Nabin Hait
34058ded0e
[fix] Update item image in sales invoice
2015-07-02 16:31:55 +05:30
Nabin Hait
e98120b716
[fix] Change log path
2015-07-02 16:29:28 +05:30
Nabin Hait
50e363b24e
Merge branch 'develop'
2015-07-02 15:28:49 +05:30
Nabin Hait
bc176b6bf8
bumped to version 5.1.0
2015-07-02 15:58:49 +06:00
Nabin Hait
784b49e54e
change log
2015-07-02 15:28:15 +05:30
Nabin Hait
04fb6e1a45
Merge pull request #3558 from nabinhait/develop
...
Change log
2015-07-02 15:22:20 +05:30
Nabin Hait
dffd7c3889
Change log
2015-07-02 15:21:25 +05:30
Nabin Hait
0c7594e5ed
Merge pull request #3557 from rmehta/item-description-in-form
...
[fix] show item description in form grid based on in_list_view
2015-07-02 15:19:24 +05:30
Rushabh Mehta
5105f909d6
[fix] show item description in form grid based on in_list_view
2015-07-02 15:09:18 +05:30
Nabin Hait
2ab9d6e92c
Merge pull request #3552 from nabinhait/develop
...
Recurring docs should not consider Stopped documents and should be scheduled for hourly
2015-07-02 14:42:57 +05:30
Nabin Hait
7580723ab3
Recurring docs should not consider Stopped documents and should be scheduled for hourly
2015-07-02 14:41:27 +05:30
Nabin Hait
52fef71c14
Merge pull request #3543 from rmehta/against-account-fix
...
Fix against account to show party instead of account
2015-07-02 14:28:11 +05:30
Rushabh Mehta
2cd02af80a
[fix] patch date
2015-07-02 14:25:51 +05:30
Rushabh Mehta
0b0ec3536c
[change-log] added
2015-07-02 14:25:51 +05:30
Rushabh Mehta
6b35ea873b
[fix] against account in general ledger will show party
2015-07-02 14:25:51 +05:30
Nabin Hait
ecf220a721
Merge pull request #3549 from neilLasrado/item-varients
...
Validation changed for Item Template cannot have Stock
2015-07-02 14:18:31 +05:30
Nabin Hait
04fb1c7fe4
Merge pull request #3550 from neilLasrado/item-desc
...
Image feild added to Sales Invoice & Purchase Invoice
2015-07-02 14:17:52 +05:30
Neil Trini Lasrado
53bd62eafc
Validation changed for Item Template cannot have Stock
2015-07-02 14:15:23 +05:30
Nabin Hait
ff68bf2609
Merge pull request #3551 from nabinhait/develop
...
Fixes
2015-07-02 14:10:58 +05:30
Nabin Hait
fdd0db3459
Update project completion percentage and costing after syncing task
2015-07-02 14:09:49 +05:30
Nabin Hait
f92465981c
datetime issue fixed in maintenance schedule
2015-07-02 14:09:49 +05:30
Nabin Hait
885c70984d
[fix] Always show Sales invoice in Gross profit report
2015-07-02 14:09:49 +05:30
Neil Trini Lasrado
9c15ef903d
Image feild added to Sales Invoice & Purchase Invoice
2015-07-02 13:09:57 +05:30
Rushabh Mehta
bc799885d0
[fix] bom client script
2015-07-02 12:44:16 +05:30
Nabin Hait
cb129264cb
Merge pull request #3386 from neilLasrado/item-varients
...
[redesign] Manage Item varients
2015-07-01 18:29:04 +05:30
Neil Trini Lasrado
fe9cd1d875
More Fixes in Manage Varients
2015-07-01 14:41:30 +05:30
Neil Trini Lasrado
64fbe955c7
Modified Date changed for Item Doctype
2015-07-01 14:04:00 +05:30
Neil Trini Lasrado
0988440fd9
Fixes for Manage Variants
2015-07-01 13:17:15 +05:30
Neil Trini Lasrado
274dd4ada0
Fixed Manage Variants Attribute autocomplete appearance.
2015-07-01 12:51:40 +05:30
Neil Trini Lasrado
724fd82419
Fixes in Manage Variants
2015-07-01 12:51:40 +05:30
Neil Trini Lasrado
3f2604eff6
Patch for Item Variants
2015-07-01 12:51:40 +05:30
Neil Trini Lasrado
c761fefb78
more fixes in test records
2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
203cb10ef7
fixes in test cases
2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
90c66b1998
test cases added
2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
fed431f908
Code Fixes in Manage Variants
2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
bd9745ba72
Rename Item Variant from Manage Variants feature Added.
2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
8fb123b20e
item variants, creation, deleation and update logic added.
...
logic added to copy changes in template to variants
2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
333ccd212b
variants combination generation logic added
2015-07-01 12:51:10 +05:30
Neil Trini Lasrado
c8cc8b7115
manage variants new doctype created
2015-07-01 12:51:10 +05:30
Nabin Hait
ec44fa95ce
Merge pull request #3537 from neilLasrado/project
...
Fixed Issues in Project Task
2015-06-30 17:29:19 +05:30
Neil Trini Lasrado
a25e8ea0bc
Fixed Issues in Project Task
2015-06-30 17:15:13 +05:30
Rushabh Mehta
ea02b9a5c3
Merge pull request #3530 from anandpdoshi/anand-june-29
...
[fix] Item Variant Attribute autocomplete appearance. Fixes #3488 , #3515 , #3525
2015-06-30 13:05:19 +05:30
Rushabh Mehta
74a63bf003
Merge pull request #3531 from pdvyas/exchange-rate-api
...
Change currency exchange rate api to fixer.io
2015-06-30 12:46:52 +05:30
Pratik Vyas
a0f2510b01
Change currency exchange rate api to fixer.io
2015-06-30 12:36:17 +05:30
Anand Doshi
0820161157
[fix] Item Variant Attribute autocomplete appearance. Fixes #3488 , #3515 , #3525
2015-06-29 20:57:06 -07:00
Nabin Hait
56bc215855
Merge pull request #3505 from neilLasrado/print-format
...
Recurring Invoice Print Format
2015-06-29 18:54:24 +05:30
Nabin Hait
8687d25f7e
Merge pull request #3526 from neilLasrado/minor-fixes
...
Minor fixes
2015-06-29 18:53:10 +05:30
Nabin Hait
9cea01fa8b
Merge pull request #3527 from nabinhait/develop
...
Journal Entry list view and delete events via query
2015-06-29 18:39:43 +05:30
Nabin Hait
e06d01e3ed
Delete events via query instead of delete_doc function, to save time
2015-06-29 18:38:38 +05:30
Nabin Hait
11243a4fb4
Show amount in Journal Entry list view
2015-06-29 18:38:38 +05:30
Neil Trini Lasrado
b9e5cd0df4
Fixed lead status not updating on Creation of oppurtunity issue
2015-06-29 17:01:32 +05:30
Neil Trini Lasrado
a1f1edc786
Typo fixes in Sales Person
2015-06-29 16:04:12 +05:30
Neil Trini Lasrado
e2d8dd0663
added recurring print format to sales/purchase invoice and order
2015-06-29 12:50:41 +05:30
Nabin Hait
d1605c5cb2
Merge branch 'develop'
2015-06-27 13:09:05 +05:30
Nabin Hait
64ca52fb77
bumped to version 5.0.29
2015-06-27 13:39:05 +06:00
Nabin Hait
2f11a3bdaf
Merge pull request #3523 from nabinhait/develop
...
Multiple fixes
2015-06-27 13:07:44 +05:30
Nabin Hait
943dc1f59c
Merge branch 'develop'
2015-06-27 13:07:01 +05:30
Nabin Hait
6d1c994bc9
bumped to version 5.0.28
2015-06-27 13:37:01 +06:00
Nabin Hait
93cdee4503
[fix] Escape values in queries
2015-06-27 12:51:00 +05:30
Nabin Hait
dfac6848cc
In list view property added in BOM
2015-06-26 14:42:51 +05:30
Nabin Hait
8ad0b4e0b9
Show Issue id in list view from customer login
2015-06-26 14:42:51 +05:30
Nabin Hait
b8cd92f1aa
Merge pull request #3517 from neilLasrado/batch
...
Added validation to prevent transfer of raw material from an expired …
2015-06-25 18:20:46 +05:30
Nabin Hait
1fe48cb820
Merge pull request #3514 from anandpdoshi/anand-june-24
...
[fix] Use per_billed instead of per_delivered and per_received for open notification
2015-06-25 18:04:26 +05:30
Anand Doshi
723b046c5b
[fix] Use per_billed instead of per_delivered and per_received for open notification
2015-06-24 19:21:52 -04:00
Neil Trini Lasrado
035160c9a6
Added validation to prevent transfer of raw material from an expired batch for manufacturing
2015-06-24 15:25:57 +05:30
Nabin Hait
01c7ce1da3
Merge pull request #3508 from nabinhait/develop
...
[fix] validate items in stock entry for subcontracting against PO
2015-06-23 11:12:23 +05:30
Nabin Hait
9cf2910ba1
[fix] validate items in stock entry for subcontracting against purchase order
2015-06-23 11:07:34 +05:30
Nabin Hait
c8da7b7d32
Merge branch 'develop'
2015-06-23 10:27:59 +05:30
Nabin Hait
9679d31397
bumped to version 5.0.27
2015-06-23 10:57:59 +06:00
Nabin Hait
38bebe1b83
Merge pull request #3503 from neilLasrado/leave-application
...
Fixed bugs in Calender View for Leave Application
2015-06-22 19:32:16 +05:30
Nabin Hait
ffbc11e8de
Merge pull request #3504 from nabinhait/develop
...
Multiple fixes
2015-06-22 19:29:32 +05:30
Nabin Hait
818d9674d9
[fix] Update outstanding amount function fixed if party not mentioned
2015-06-22 18:21:38 +05:30
Neil Trini Lasrado
086f8942eb
Fixed bugs in Calender View for Leave Application
2015-06-22 13:51:56 +05:30
Nabin Hait
c3b492b237
[fix] Auto remarks in Journal Entry based on company currency
2015-06-22 07:52:38 +05:30
Nabin Hait
9d0dd5066a
Removed 'Root Type' validation for receivable/payable account in sales/purchase invoice
2015-06-22 07:32:46 +05:30
Nabin Hait
e7f479b26a
Validate accounting entry agaist Stock account if perpetual inventory enabled
2015-06-22 07:31:49 +05:30
Nabin Hait
7ee45b4af2
[fix] Batch-wise balance history: show records only with batch-id
2015-06-18 15:29:14 +05:30
Nabin Hait
5cce1e0929
Merge pull request #3489 from nabinhait/develop
...
Opening balance
2015-06-18 10:34:31 +05:30
Nabin Hait
be496bc91c
[fix] Trial Balance opening
2015-06-18 10:33:20 +05:30
Nabin Hait
59f063e5c3
[fix] opening balance in general ledger report
2015-06-18 10:33:20 +05:30
Nabin Hait
af5820874c
Merge branch 'develop'
2015-06-17 15:51:00 +05:30
Nabin Hait
495db99719
bumped to version 5.0.26
2015-06-17 16:21:00 +06:00
Nabin Hait
123beb5a07
Merge pull request #3484 from rmehta/bom-search-report
...
[report] BOM Search
2015-06-17 15:38:39 +05:30
Nabin Hait
7ed4e080a2
Merge pull request #3486 from nabinhait/develop
...
Opening balance
2015-06-17 15:36:06 +05:30
Nabin Hait
e91025c0aa
[fix] Opening balance in trial balance and general ledger based on is_opening
2015-06-17 15:35:06 +05:30
Nabin Hait
1ac9f2f50d
[fix] Opening balance in trial balance and general ledger based on is_opening
2015-06-17 15:09:40 +05:30
Nabin Hait
bd9aa13db3
Minor issue in naming series
2015-06-17 15:09:40 +05:30
Rushabh Mehta
ed9d5cfdaf
[minor] cleanup
2015-06-17 02:13:03 +05:30
Rushabh Mehta
bf4547ca5f
[fix] dynamic link in BOM Search report
2015-06-17 02:12:06 +05:30
Rushabh Mehta
b45a6bcb88
[report] BOM Search
2015-06-17 01:54:56 +05:30
Anand Doshi
ac59c2b300
[minor] clear Item's introduction section on refresh
2015-06-16 13:06:48 -04:00
Nabin Hait
6a8d7a1b91
Merge branch 'develop'
2015-06-16 16:50:49 +05:30
Nabin Hait
5d71a28e97
bumped to version 5.0.25
2015-06-16 17:20:49 +06:00
Nabin Hait
7d100a1ee7
Merge pull request #3480 from nabinhait/develop
...
Indexes
2015-06-16 16:49:26 +05:30
Nabin Hait
81dca110eb
Change log added
2015-06-16 16:48:47 +05:30
Nabin Hait
9c852108d0
Added index in sales/purchase invoice and fix in index patch
2015-06-16 16:48:47 +05:30
Nabin Hait
e3ac032696
Merge pull request #3472 from neilLasrado/po
...
Multiple Fixes
2015-06-16 15:52:48 +05:30
Neil Trini Lasrado
64cacfb077
Fixes in Activity Cost
2015-06-16 15:42:40 +05:30
Neil Trini Lasrado
ae4cc078ea
Activity Cost - Mandatory removed for Employee.
2015-06-16 15:30:08 +05:30
Nabin Hait
0ee543e932
Merge pull request #3479 from nabinhait/develop
...
[fix][report] Payment period based on invoice date
2015-06-16 15:29:14 +05:30
Nabin Hait
a123638d37
[fix][report] Payment period based on invoice date
2015-06-16 15:21:00 +05:30
Nabin Hait
58996985ed
Merge pull request #3476 from nabinhait/develop
...
Expense Approver Query and discount label
2015-06-16 15:01:08 +05:30
Nabin Hait
5d0ce7939f
Show only users with Expense Approver role in Expense Claim Approver field
2015-06-15 17:59:37 +05:30
Neil Trini Lasrado
4abf552d7b
Over Production Allowance Percentage Setting added to Manufacturing Settings
2015-06-15 15:58:45 +05:30
Nabin Hait
7c5ba957ac
Label changed for discount amount in base currency
2015-06-15 15:47:07 +05:30
Nabin Hait
77f04e293a
Merge branch 'develop'
2015-06-15 10:35:39 +05:30
Nabin Hait
d1d3237784
bumped to version 5.0.24
2015-06-15 11:05:39 +06:00
Nabin Hait
76f0d26f1e
Merge pull request #3471 from nabinhait/develop
...
Hotfix
2015-06-15 10:32:23 +05:30
Nabin Hait
65922d3079
[fix] supplier invoice date can not be after posting date
2015-06-15 10:23:53 +05:30
Nabin Hait
810041cbe3
[fix] Fixed error due to performance upgrade cleanup
2015-06-15 10:20:11 +05:30
Nabin Hait
b9626659ea
Merge pull request #3465 from neilLasrado/po
...
Po
2015-06-15 10:04:36 +05:30
Nabin Hait
e3d13bee36
Merge pull request #3467 from anandpdoshi/anand-june-12
...
Fixes
2015-06-15 10:03:20 +05:30
Nabin Hait
13bd538aca
Merge branch 'develop'
2015-06-14 22:04:51 +05:30
Nabin Hait
d72a24965b
bumped to version 5.0.23
2015-06-14 22:34:51 +06:00
Nabin Hait
dc633fe360
Merge pull request #3470 from nabinhait/develop
...
Performance upgrade in reports and indexing
2015-06-14 22:01:30 +05:30
Nabin Hait
39046d663d
[patch] Add index on Account and GL Entry table
2015-06-14 20:59:28 +05:30
Nabin Hait
6b01abe9ad
[report][performance] Speed increased by approx 10 times in Trial Balance, General Ledger, AR/AP, Balance Sheet and P&L Statement
2015-06-14 20:59:28 +05:30
Anand Doshi
63e4d31aa6
[fix] Task should be mandatory in Time Log only when Project is mentioned but Production Order is not
2015-06-12 18:59:18 -04:00
Anand Doshi
f2a0161709
[fix] Don't create Time Logs against Production Order if Workstation is not specified in Operations
2015-06-12 18:58:36 -04:00
Neil Trini Lasrado
3c1a4a0b9b
percent_complete made no-copy in Project
2015-06-12 18:34:08 +05:30
Neil Trini Lasrado
82cc2921d1
Validation added to prevent user from creating salary structure with 'From Date' before employee 'Date of joining'
2015-06-12 18:34:08 +05:30
Nabin Hait
87edd86854
Merge branch 'develop'
2015-06-12 18:06:21 +05:30
Nabin Hait
e37dd77923
bumped to version 5.0.22
2015-06-12 18:36:21 +06:00
Nabin Hait
e4f689184f
Merge pull request #3459 from neilLasrado/po
...
Multiple Fixes.
2015-06-12 17:55:23 +05:30
Nabin Hait
85f825e98c
Merge pull request #3463 from nabinhait/develop
...
multiple issues
2015-06-12 17:48:54 +05:30
Nabin Hait
89592c5180
Load tasks in project for printing purpose
2015-06-12 17:37:28 +05:30
Neil Trini Lasrado
587bd144d5
Added Customers Not Buying Since Long Time against Sales Invoice
2015-06-11 18:36:52 +05:30
Neil Trini Lasrado
1f048b2426
Fixes in Activity Cost
2015-06-11 18:36:52 +05:30
Neil Trini Lasrado
1792ff3be7
Validation added in Purchase Invoice to check if Supplier Invoice Date is greater than Posting Date
...
Check Supplier Invoice Number Uniqueness setting added to Accounts Settings
Validation added in Purchase Invoice to check Supplier Invoice Number Uniqueness if Check Supplier Invoice Number Uniqueness is enabled in Accounts Settings
2015-06-11 18:36:52 +05:30
Neil Trini Lasrado
fc595064e0
validation added to prevent Delivery Date in Porduction Order to be lesser than Planned Start Date
2015-06-11 18:36:52 +05:30
Nabin Hait
804b4acb9b
[fix] Issue fixed in C-Form related to field renaming
2015-06-11 16:56:36 +05:30
Nabin Hait
5c7557914b
Removed BOM No from mandatory from Stock Entry against Production Order
2015-06-11 16:50:35 +05:30
Nabin Hait
381a9377d9
Merge branch 'develop'
2015-06-11 16:14:48 +05:30
Nabin Hait
9bdd1aa1ed
bumped to version 5.0.21
2015-06-11 16:44:48 +06:00
Nabin Hait
d0df28bfa0
Merge pull request #3458 from nabinhait/develop
...
[fix] load tasks in project via __setup__ instead of onload function, to return tasks via get_doc
2015-06-11 16:12:05 +05:30
Nabin Hait
1966225450
[fix] load tasks in project via __setup__ instead of onload function, to return tasks via get_doc
2015-06-11 15:31:47 +05:30
Nabin Hait
4cee27eec0
Merge pull request #3446 from anandpdoshi/anand-june-9
...
POS - search by Item Group
2015-06-10 18:42:14 +05:30
Nabin Hait
c7d4eaee79
Merge pull request #3442 from nabinhait/develop
...
fixes in stock entry and report
2015-06-10 18:40:42 +05:30
Nabin Hait
43c1a9b502
[fix] Quote url for item image in product listing page
2015-06-10 18:23:17 +05:30
Nabin Hait
b937fac3ce
[report] Warehouse column added in 'Ordered Items to be Delivered' report
2015-06-10 18:21:57 +05:30
Nabin Hait
53d94996ad
[fix] Query for Against Journal Entry
2015-06-10 18:20:18 +05:30
Anand Doshi
26f6752c1e
POS - search by Item Group
2015-06-09 16:33:46 -04:00
Nabin Hait
bb429745c0
[fix] Blank option in naming series
2015-06-09 18:59:51 +05:30
Nabin Hait
909f0c38f1
[report][enhancement] Payment period based on invoice date: show party columns and filter based on party
2015-06-09 18:42:52 +05:30
Nabin Hait
a790ba05f4
[fix] Item name, description should not be overwritten on saving of stock entry
2015-06-09 18:42:52 +05:30
Nabin Hait
11fc4f85d0
Merge branch 'develop'
2015-06-09 15:56:20 +05:30
Nabin Hait
17452a1695
bumped to version 5.0.20
2015-06-09 16:26:20 +06:00
Nabin Hait
7c3d48e353
Merge pull request #3434 from neilLasrado/material-request
...
Status Indicators fixed in Material Request List
2015-06-09 15:47:46 +05:30
Neil Trini Lasrado
5d288e407c
item variants patch removed
2015-06-09 15:46:57 +05:30
Neil Trini Lasrado
f64fae752f
fixes
2015-06-09 15:46:57 +05:30
Neil Trini Lasrado
82763f052f
Status Indicators fixed in Material Request List
2015-06-09 15:46:57 +05:30
Nabin Hait
bafc73568a
Merge pull request #3435 from neilLasrado/barcode
...
Barcode added to Purchase Receipt
2015-06-09 15:44:09 +05:30
Neil Trini Lasrado
d015195617
fixes in barcode
2015-06-09 15:21:50 +05:30
Neil Trini Lasrado
b2f550ccb3
Barcode added to Purchase Receipt
2015-06-09 15:18:58 +05:30
Nabin Hait
41413af42d
Merge pull request #3437 from anandpdoshi/task-close-assignment
...
[fix] Close assignment (ToDo) when Task status is changed to Closed
2015-06-09 15:00:06 +05:30
Anand Doshi
ec60ebde6f
[fix] Close assignment (ToDo) when Task status is changed to Closed
2015-06-08 12:48:11 -04:00
Nabin Hait
ce81a61fe7
Merge branch 'develop'
2015-06-08 14:45:13 +05:30
Nabin Hait
dc76b3fa20
bumped to version 5.0.19
2015-06-08 15:15:13 +06:00
Nabin Hait
828cbee12a
Merge pull request #3429 from neilLasrado/quality-inspection
...
Get Item Details in Quality Inspection.
2015-06-08 14:24:11 +05:30
Nabin Hait
5f5ef16b91
Merge pull request #3430 from nabinhait/develop
...
Multiple fixes
2015-06-08 14:23:52 +05:30
Nabin Hait
686ef8308a
Show item name in item grid view based 'In List View' property
2015-06-08 14:22:56 +05:30
Nabin Hait
b63ad44b10
Book in round-off account upto max 0.05
2015-06-08 14:15:12 +05:30
Nabin Hait
5ef121bc10
get party details only if party exists
2015-06-08 14:15:11 +05:30
Neil Trini Lasrado
42c1836db5
function changed to add fetch
2015-06-08 13:09:11 +05:30
Neil Trini Lasrado
9dbdef3bd5
added code to fetch item name and desc on change of item code
2015-06-08 12:29:12 +05:30
Nabin Hait
9fd42ed2f7
Merge pull request #3428 from nabinhait/develop
...
[fix] Fiscal year issue due to missing field in Material Request
2015-06-08 12:27:27 +05:30
Nabin Hait
000835c454
[fix] Fiscal year issue due to missing field in Material Request
2015-06-08 12:10:43 +05:30
Nabin Hait
de1f934e22
Merge pull request #3422 from nabinhait/develop
...
Manufactured qty in Stock Entry
2015-06-08 12:07:47 +05:30
Nabin Hait
7cbd916b00
[fix] Fiscal year issue due to missing field in Material Request
2015-06-08 12:06:33 +05:30
Nabin Hait
56fcf30cb9
[Patch] Update material transferred for manufacturing for existing entries
2015-06-05 18:21:35 +05:30
Nabin Hait
ebbdd772a9
[fix] Validate and update manufactured qty in Stock Entry
2015-06-05 18:21:35 +05:30
Pratik Vyas
6268d83173
Merge branch 'develop'
2015-06-05 15:56:49 +05:30
Pratik Vyas
4599467939
bumped to version 5.0.18
2015-06-05 16:26:49 +06:00
Nabin Hait
d3613479c6
Merge pull request #3421 from nabinhait/develop
...
pos link and item description
2015-06-05 15:51:03 +05:30
Nabin Hait
6bf301f53c
Show item description in grid view based on 'In List View' property
2015-06-05 15:49:25 +05:30
Nabin Hait
27d7f21553
[fix] pos profile link in Start POS page
2015-06-05 15:09:44 +05:30
Nabin Hait
8f87cff4bd
Merge pull request #3411 from nabinhait/develop
...
journal entry against expense claim and bank reco
2015-06-05 14:31:23 +05:30
Nabin Hait
8f39766924
Merge pull request #3419 from neilLasrado/time-log
...
operation made non mandatory in time log
2015-06-05 14:30:22 +05:30
Neil Trini Lasrado
39669f2717
operation made non mandatory in time log
2015-06-05 12:17:46 +05:30
Nabin Hait
3c1017c43b
Removed deprecated page users
2015-06-05 12:15:01 +05:30
Nabin Hait
0b18a2d347
Reset values in tools like Payment Tool
2015-06-05 12:01:29 +05:30
Nabin Hait
6262496e70
[fix] item test case
2015-06-03 18:33:47 +05:30
Nabin Hait
c9963f1805
[fix] journal entry against expense claim: pending amount validation
2015-06-03 18:01:09 +05:30
Nabin Hait
8a2b1bcb97
[fix] bank reconciliation: fetch journal entry order by posting date asc
2015-06-03 18:01:09 +05:30
Pratik Vyas
b8ecf7c757
Merge branch 'develop'
2015-06-03 17:43:38 +05:30
Pratik Vyas
cf89fa2253
bumped to version 5.0.17
2015-06-03 18:13:38 +06:00
Nabin Hait
419c1eb90d
Merge pull request #3410 from nabinhait/develop
...
[fix][patch] force reload web-form-field in portal fixes patch
2015-06-03 17:43:01 +05:30
Nabin Hait
2c214e0362
[fix][patch] force reload web-form-field in portal fixes patch
2015-06-03 17:42:12 +05:30
Nabin Hait
7d04dd0bfd
Merge pull request #3408 from williamjmorenor/patch-1
...
Update Chart of Account for Nicaragua
2015-06-03 17:17:09 +05:30
Nabin Hait
f1371a7ee7
Merge pull request #3409 from nabinhait/develop
...
Multiple fixes
2015-06-03 17:15:42 +05:30
Nabin Hait
995a78421a
[fix] Stock analytics report fixed for fifo stack related to stock reco
2015-06-03 16:44:26 +05:30
Nabin Hait
352187bee6
purchase register fix
2015-06-03 12:06:19 +05:30
Nabin Hait
c6d8121f4a
delete fields inline description
2015-06-03 11:24:37 +05:30
Nabin Hait
030ade428b
dont reset company on deleting company transactions
2015-06-03 11:24:37 +05:30
Nabin Hait
c87595b2da
show item description in item grid view if marked for 'In List View'
2015-06-03 11:24:37 +05:30
Nabin Hait
42f2674cba
dynamic link in quotation item
2015-06-03 11:24:37 +05:30
Nabin Hait
5359f2651a
[fix] sales register report
2015-06-03 11:24:37 +05:30
William Moreno
42dcffdad4
Update Chart of Account for Nicaragua
...
Hi
The Law 891 reform some taxes rates, please update the Chart of Account for Nicaragua so it can reflect the new tax rates.
2015-06-02 16:48:47 -06:00
Anand Doshi
f7c1743b28
[hotfix] cart - get_address_docs
2015-06-02 15:20:25 -04:00
Anand Doshi
64aa6620be
[hotfix] portal fixes patch
2015-06-02 11:53:17 -04:00
Rushabh Mehta
ed43f8015c
[lang] let locale be en in setup wizard (?)
2015-06-02 12:31:03 +05:30
Rushabh Mehta
d3fe7ec858
[cleanup] customer not buying since long time report
2015-06-02 12:21:17 +05:30
Rushabh Mehta
c8b406d050
[fix] duplicate status for Submitted, Cancelled
2015-06-02 12:17:14 +05:30
Rushabh Mehta
2aa577f110
[hot] patch-fix
2015-06-02 11:12:25 +05:30
Pratik Vyas
f06d175061
Merge branch 'develop'
2015-06-02 10:45:28 +05:30
Pratik Vyas
74b2116adb
bumped to version 5.0.16
2015-06-02 11:15:28 +06:00
Rushabh Mehta
2204d0af94
Merge pull request #3397 from rmehta/portal-fixes
...
Portal fixes
2015-06-02 10:42:59 +05:30
Pratik Vyas
b8a568765d
Update translations
2015-06-01 23:49:15 +05:30
Rushabh Mehta
cf29f6468d
[minor] add attachment to issue via portal:
2015-06-01 17:47:03 +05:30
Rushabh Mehta
aded46d33e
[fix] product search in new block header_actions
2015-06-01 17:23:42 +05:30
Pratik Vyas
b8dd046c84
Merge branch 'develop'
2015-06-01 17:17:46 +05:30
Pratik Vyas
e5fa5e6111
bumped to version 5.0.15
2015-06-01 17:47:46 +06:00
Nabin Hait
b89cf1b3ec
Merge pull request #3396 from nabinhait/develop
...
item table print template
2015-06-01 17:16:00 +05:30
Rushabh Mehta
a33d468d30
[fixes] portal, issues, addresses etc
2015-06-01 17:15:42 +05:30
Nabin Hait
e481a211b1
item table print template
2015-06-01 17:12:55 +05:30
Rushabh Mehta
ca23b5ecfd
Merge pull request #3395 from nabinhait/develop
...
GL Entries for Journal Entries with multiple Party
2015-06-01 16:35:36 +05:30
Nabin Hait
11190268ab
[fix][patch] GL Entries for Journal Entries with multiple Party, merge entries considering party
2015-06-01 16:21:25 +05:30
Nabin Hait
a19150ddaf
default account's custom query in company
2015-06-01 15:32:57 +05:30
Nabin Hait
c17dff4b01
default account's custom query in company
2015-06-01 15:32:57 +05:30
Pratik Vyas
47fe136d15
Merge branch 'develop'
2015-06-01 14:51:17 +05:30
Pratik Vyas
8f25402dce
bumped to version 5.0.14
2015-06-01 15:21:17 +06:00
Nabin Hait
a9165744e2
Merge pull request #3385 from nabinhait/develop
...
In standard print format, item name will now honour 'Print Hide' property
2015-06-01 14:03:11 +05:30
Nabin Hait
3ebfad7115
minor fixes
2015-06-01 14:01:56 +05:30
Nabin Hait
c7ef8dda79
[fix] Pricing Rule based on qty
2015-06-01 14:01:56 +05:30
Nabin Hait
4a6c178795
On selection of item, set default qty as 1
2015-06-01 14:01:56 +05:30
Nabin Hait
8908543a9c
In standard print format, item name will now honour 'Print Hide' property
2015-06-01 14:01:56 +05:30
Rushabh Mehta
065badc54b
[minor] move buttons from sales invoice to toolbar
2015-05-31 10:36:47 +05:30
Nabin Hait
cd2798368b
Merge pull request #3384 from rmehta/journal-entry-ux
...
[minor] journal entry, copy over party details to new row and automatically set difference
2015-05-29 17:09:53 +05:30
Rushabh Mehta
2c30acdcb2
[minor] journal entry, copy over party details to new row and automatically set difference
2015-05-29 16:33:36 +05:30
Rushabh Mehta
4a4a6594d1
[minor] [refactor]
2015-05-29 15:56:40 +05:30
Pratik Vyas
e3035a593c
Merge branch 'develop'
2015-05-29 14:25:23 +05:30
Pratik Vyas
587dde0044
bumped to version 5.0.13
2015-05-29 14:55:23 +06:00
Pratik Vyas
b6d13ef5b7
Add changelog
2015-05-29 14:24:39 +05:30
Rushabh Mehta
a3e9dbbcc3
Merge pull request #3374 from nabinhait/develop
...
Make gl entry for rounded-off amount
2015-05-29 14:20:20 +05:30
Pratik Vyas
97d2a00d91
Merge branch 'develop'
2015-05-29 14:17:15 +05:30
Pratik Vyas
1749406514
bumped to version 5.0.12
2015-05-29 14:47:15 +06:00
Rushabh Mehta
99b18224f5
[minor] remove order_by in listview, let user customize
2015-05-29 12:48:24 +05:30
Rushabh Mehta
b0b446e899
[fix] cleanup tables from description and re-sync print format
2015-05-29 12:44:33 +05:30
Nabin Hait
80069a6379
Book gl entry automatically due to rounding loss with test cases
2015-05-29 10:39:09 +05:30
Nabin Hait
98c515fe7d
replace 'entries' by 'items' in custom print formats and scripts
2015-05-29 10:39:09 +05:30
Nabin Hait
6ee8c545e3
[fix] gross profit report
2015-05-29 10:39:09 +05:30
Nabin Hait
3c67146e4b
Make gl entry for rounded-off amount
2015-05-29 10:39:09 +05:30
Nabin Hait
e2c200a91e
Make gl entry for rounded-off amount
2015-05-29 10:39:09 +05:30
Nabin Hait
d9d5925f14
[fix] BOM item validation in lower case
2015-05-29 10:39:09 +05:30
Rushabh Mehta
148386f73e
Merge pull request #3380 from anandpdoshi/anand-may-28
...
[fix] selenium test and changed Creation Document No to a Dynamic Link
2015-05-29 10:37:07 +05:30
Anand Doshi
1b6c3f1a39
[fix] selenium test and changed Creation Document No to a Dynamic Link
2015-05-28 23:06:38 -04:00
Pratik Vyas
618fefea73
Merge branch 'develop'
2015-05-28 14:14:58 +05:30
Pratik Vyas
31d9d9f561
bumped to version 5.0.11
2015-05-28 14:44:58 +06:00
Rushabh Mehta
e715572e7c
Merge pull request #3373 from pdvyas/issue-perms
...
[fix] Remove guest perms from Issue
2015-05-28 14:04:21 +05:30
Pratik Vyas
d138b06c8e
Add changelog for v5.0.11 release
2015-05-28 14:00:24 +05:30
Pratik Vyas
37ee57c211
[fix] Remove guest perms from Issue
2015-05-28 13:04:43 +05:30
Rushabh Mehta
95b995be6d
[minor] set timezone in posting time and added help
2015-05-28 12:10:55 +05:30
Nabin Hait
86e479f908
Merge pull request #3355 from rmehta/purchase-invoice-fixes
...
[minor] remove letter head / terms from purchase invoice, fixes #3328 , #3345
2015-05-28 11:19:22 +05:30
Nabin Hait
2a52f59b32
Merge pull request #3370 from rmehta/pos-fix
...
POS fixes
2015-05-28 11:18:29 +05:30
Rushabh Mehta
c185734bf3
[minor] remove letter head / terms from purchase invoice, fixes #3328 , #3345
2015-05-28 11:17:22 +05:30
Rushabh Mehta
beb7c346ea
[fix] [cleanup]
2015-05-28 11:12:29 +05:30
Rushabh Mehta
88655890be
[fix] [refactor] pos hangs in multi-company, if company is not set
2015-05-28 11:11:25 +05:30
Nabin Hait
e7b37af525
Merge pull request #3353 from rmehta/barcode-fix
...
[fix] clear barcode from table, fixes #3320
2015-05-28 11:07:16 +05:30
Nabin Hait
10026ea85c
Merge pull request #3354 from rmehta/discount-field-relabel
...
[cleanup] rename discount and reserver warehouse #3325
2015-05-28 11:02:51 +05:30
Rushabh Mehta
960118a954
Merge pull request #3369 from anandpdoshi/anand-may-27
...
Check if company exists in re-order item
2015-05-28 10:45:27 +05:30
Anand Doshi
8860b9d94d
[fix] Check if company exists in re-order item. Fixes #3365 .
2015-05-28 01:09:21 -04:00
Rushabh Mehta
f4f9be9233
Merge pull request #3364 from anandpdoshi/anand-may-27
...
[fix] Product Search
2015-05-28 10:19:58 +05:30
Anand Doshi
81bded1afe
[fix] Product Search
2015-05-27 16:48:06 -04:00
Nabin Hait
7f1d5efd5b
Merge pull request #3360 from nabinhait/develop
...
patch fix
2015-05-27 16:50:16 +05:30
Nabin Hait
54a10cd2af
patch fix
2015-05-27 16:14:10 +05:30
Pratik Vyas
f52b5ac8af
Merge pull request #3339 from rmehta/help
...
[help] added links in modules, added learn desktop module
2015-05-27 15:21:00 +05:30
Rushabh Mehta
2fd33a2f03
Merge pull request #3358 from nabinhait/develop
...
General ledger, _idx and FY in Material request
2015-05-27 15:10:51 +05:30
Rushabh Mehta
78f137890c
Merge pull request #3351 from anandpdoshi/anand-may-26-production-fixes
...
[fix] workstation fixes related to Production Order
2015-05-27 15:09:47 +05:30
Rushabh Mehta
0d79be5628
Merge pull request #3350 from anandpdoshi/anand-may-26
...
Fixes in shopping cart and website route rules
2015-05-27 15:09:09 +05:30
Pratik Vyas
fa555abbd2
Merge pull request #3344 from rmehta/download-backups
...
Download backups
2015-05-27 15:03:45 +05:30
Nabin Hait
eb00cae86c
Fiscal Year removed from Material Request
2015-05-27 13:18:09 +05:30
Nabin Hait
5b731ff73a
Fix _idx property as per renamed fields
2015-05-27 13:02:59 +05:30
Nabin Hait
5b8db3729c
[fix] General ledger print format
2015-05-27 13:02:59 +05:30
Rushabh Mehta
69fb13f229
[cleanup] rename discount and reserver warehouse #3325
2015-05-27 12:20:07 +05:30
Rushabh Mehta
c2acfc9828
[fix] clear barcode from table, fixes #3320
2015-05-27 12:01:03 +05:30
Anand Doshi
409843d768
[fix] workstation fixes related to Production Order
2015-05-26 19:13:45 -04:00
Anand Doshi
fb4e496b54
[fix] target variance sql
2015-05-26 18:15:55 -04:00
Anand Doshi
ff8a854b82
Fixes #3349 . Thanks @abelbm for reporting.
2015-05-26 18:13:28 -04:00
Anand Doshi
438b67e8b0
[fix] shopping cart - get price list for default territory if no price list is selected
2015-05-26 17:37:39 -04:00
Anand Doshi
e440914327
[fix] allow slashes in variables of website route rules
2015-05-26 17:37:09 -04:00
Pratik Vyas
dcbc4d1a46
Merge branch 'develop'
2015-05-26 17:06:39 +05:30
Pratik Vyas
e1637c4cae
bumped to version 5.0.10
2015-05-26 17:36:39 +06:00
Nabin Hait
b3fb6e1e04
Merge pull request #3342 from rmehta/item-price-import-link
...
[minor] add import link in item price
2015-05-26 16:51:51 +05:30
Nabin Hait
354443b073
Merge pull request #3346 from nabinhait/develop
...
multiple minor fixes
2015-05-26 16:50:10 +05:30
Nabin Hait
d4c8dc2915
multiple minor fixes
2015-05-26 16:32:30 +05:30
Rushabh Mehta
d51cf79fe2
[enhancement] list backups for download
2015-05-26 15:19:27 +05:30
Rushabh Mehta
306c49f8a0
[enhancement] list backups for download
2015-05-26 15:14:58 +05:30
Rushabh Mehta
c7cfa270cd
[minor] add import link in item price
2015-05-26 14:07:05 +05:30
Nabin Hait
1568dc32a2
Merge pull request #3338 from rmehta/bom-multiple-add
...
BOM updates
2015-05-26 12:44:03 +05:30
Nabin Hait
878a18528c
Added BOM Browser link in Manufacturing home page
2015-05-26 12:41:25 +05:30
Rushabh Mehta
5fa6c4ce21
[enhancement] add bom tree view
2015-05-26 12:41:25 +05:30
Nabin Hait
b8ad56f819
Merge pull request #3336 from rmehta/ask-password-before-delete
...
[minor] re-verify password before deleting company transactions
2015-05-26 12:20:55 +05:30
Nabin Hait
b3a142f5ab
[fix] email footer and signature
2015-05-26 12:15:39 +05:30
Nabin Hait
1f5b21673c
minor fix in report
2015-05-26 12:15:39 +05:30
Nabin Hait
093beecd0a
minor fix
2015-05-26 12:15:39 +05:30
Rushabh Mehta
822fd7747a
[email] [website] footer cleanup
2015-05-26 12:15:39 +05:30
Rushabh Mehta
f29a618b69
[email] [website] footer cleanup
2015-05-26 12:15:39 +05:30
Rushabh Mehta
314af94737
[minor] added multiple commit in bom
2015-05-26 12:15:39 +05:30
Rushabh Mehta
6771240471
[help] added links in modules, added learn desktop module
2015-05-25 18:31:08 +05:30
Pratik Vyas
1a804e2217
Merge branch 'develop'
2015-05-25 16:32:12 +05:30
Pratik Vyas
ac9c2de8b9
bumped to version 5.0.9
2015-05-25 17:02:12 +06:00
Nabin Hait
2c6705ef83
Merge pull request #3322 from nabinhait/test_case
...
Test case
2015-05-25 16:19:03 +05:30
Nabin Hait
5536923101
Merge pull request #3337 from nabinhait/fix1
...
Multiple fixes
2015-05-25 16:16:20 +05:30
Nabin Hait
63e431a219
minor fixes
2015-05-25 16:15:39 +05:30
Nabin Hait
e2787cf2ec
[fix] unique employee id validation for sales person
2015-05-25 15:27:40 +05:30
Nabin Hait
c4fa74f51d
sales partner field added in sms center
2015-05-25 15:17:29 +05:30
Nabin Hait
b62068f784
removed debug
2015-05-25 14:46:12 +05:30
Rushabh Mehta
f8594feb55
[enhancement] add bom tree view
2015-05-25 14:26:21 +05:30
Rushabh Mehta
6a0563f4b2
[minor] added multiple commit in bom
2015-05-25 14:26:21 +05:30
Nabin Hait
43539673cc
[fix] sales person wise transaction summary
2015-05-25 14:13:03 +05:30
Nabin Hait
4809d36fbe
validate fields value with reference docs
2015-05-25 14:13:03 +05:30
Nabin Hait
f61f76ba45
[fix] gross profit report
2015-05-25 14:13:03 +05:30
Nabin Hait
8d76d14614
reset item's default accounts, warehouses on deletion of company
2015-05-25 14:13:03 +05:30
Nabin Hait
adc830b712
[fix] rename company abbr
2015-05-25 14:13:03 +05:30
Rushabh Mehta
ed618f284b
[minor] re-verify password before deleting company transactions
2015-05-25 12:20:44 +05:30
Rushabh Mehta
c4d38e2183
[minor] setup wizard language fix and no submit messages for gl/sl entry
2015-05-25 11:29:37 +05:30
Nabin Hait
a5c9cff38a
Merge pull request #3323 from nabinhait/develop
...
stock entry: get item details
2015-05-22 18:05:40 +05:30
Nabin Hait
fe8d107731
stock entry: get item details
2015-05-22 18:04:44 +05:30
Nabin Hait
e2968e9893
minor fixes in test cases
2015-05-22 17:25:55 +05:30
Nabin Hait
fd4bcd855b
test case fixes
2015-05-22 16:55:55 +05:30
Nabin Hait
2eba53f763
test case fixes
2015-05-22 16:55:55 +05:30
Pratik Vyas
866e9047b0
Merge branch 'develop'
2015-05-22 16:52:25 +05:30
Pratik Vyas
08e04ef01a
bumped to version 5.0.8
2015-05-22 17:22:25 +06:00
Nabin Hait
bf3f944bdb
Merge pull request #3318 from nabinhait/report
...
added total row in stock balance report
2015-05-22 16:24:00 +05:30
Nabin Hait
1d08304ba5
added total row in stock balance report
2015-05-22 11:56:13 +05:30
Nabin Hait
fc79e205f0
Merge pull request #3316 from nabinhait/develop
...
share permission and patch fix
2015-05-22 11:51:49 +05:30
Nabin Hait
3b0adc5246
[fix] ignore share permission while creating events on the background
2015-05-21 16:51:37 +05:30
Nabin Hait
4888a5dc0d
[patch][fix] party model - create debtors and creditors only if parent account exists
2015-05-21 16:51:37 +05:30
Pratik Vyas
1686876b23
Merge branch 'develop'
2015-05-21 15:34:34 +05:30
Pratik Vyas
8c6ff9ddad
bumped to version 5.0.7
2015-05-21 16:04:34 +06:00
Rushabh Mehta
3bc3384bc4
[minor] remove section headings
2015-05-21 15:06:51 +05:30
Pratik Vyas
37307215d0
Merge pull request #3315 from nabinhait/develop
...
update operation description patch
2015-05-21 14:58:24 +05:30
Nabin Hait
61704504e6
Merge pull request #3314 from neilLasrado/item-var-validation
...
validation added to item varients
2015-05-21 14:56:51 +05:30
Nabin Hait
9895aba42e
update operation description patch
2015-05-21 14:43:24 +05:30
Neil Trini Lasrado
753e40b4d5
fixes in validation for item varients
2015-05-21 14:38:58 +05:30
Rushabh Mehta
71b7a52990
Merge pull request #3312 from nabinhait/develop
...
[fix] operations and bom
2015-05-21 14:29:14 +05:30
Nabin Hait
e372fb11ea
naming series fix
2015-05-21 14:27:20 +05:30
Nabin Hait
4c924bb76c
totals etc should not be clickable
2015-05-21 13:38:03 +05:30
Nabin Hait
de7b87ee3a
[fix] operations and bom
2015-05-21 13:24:49 +05:30
Nabin Hait
f3ae85cc9a
Merge pull request #3313 from rmehta/material-request-fix
...
[fix] load taxes_and_charges only if field present
2015-05-21 13:22:21 +05:30
Nabin Hait
4a929d53bc
Merge pull request #3310 from neilLasrado/item-var-validation
...
validation added to item varients
2015-05-21 13:21:21 +05:30
Nabin Hait
7f8d6b6252
Merge pull request #3303 from rmehta/letter-head-in-stock-entry
...
[enhancement] letter head in stock entry #3291
2015-05-21 13:20:26 +05:30
Nabin Hait
6789680fa3
Merge pull request #3302 from rmehta/fix-report-strings
...
[fix] totals etc should not be clickable
2015-05-21 13:18:22 +05:30
Nabin Hait
4f3f5308e3
Merge pull request #3301 from rmehta/issue-form-layout
...
[usability] re-layout Issue Form #3218
2015-05-21 13:15:38 +05:30
Nabin Hait
9e38d29df7
Merge pull request #3300 from rmehta/pos-setting-rename
...
[rename] POS Setting > POS Profile #3271
2015-05-21 13:14:59 +05:30
Nabin Hait
15e13c0ed4
Merge pull request #3245 from neilLasrado/opportunity
...
fixes in quotation - from opportunity button didn't work
2015-05-21 13:03:00 +05:30
Rushabh Mehta
4984bccbc6
[fix] load taxes_and_charges only if field present
2015-05-21 12:51:07 +05:30
Neil Trini Lasrado
4258753ae8
validation added to item varients
2015-05-21 12:22:33 +05:30
Neil Trini Lasrado
68a6d61589
filter added for closed oppurtunity
2015-05-20 19:01:37 +05:30
Neil Trini Lasrado
c55edf18ad
fixes in quotation - from opportunity
2015-05-20 18:51:38 +05:30
Rushabh Mehta
a60984866c
[enhancement] letter head in stock entry #3291
2015-05-20 17:45:18 +05:30
Rushabh Mehta
555fa4fbc2
[fix] totals etc should not be clickable
2015-05-20 17:21:53 +05:30
Rushabh Mehta
43c885868f
[usability] re-layout Issue Form
2015-05-20 16:47:45 +05:30
Pratik Vyas
815cb8959a
Merge branch 'develop'
2015-05-20 16:35:40 +05:30
Pratik Vyas
38937ecd3c
bumped to version 5.0.6
2015-05-20 17:05:40 +06:00
Rushabh Mehta
9624bac3cf
[fix] create SMS Log
2015-05-20 15:48:58 +05:30
Rushabh Mehta
a27cca97b5
[rename] POS Setting > POS Profile #3271
2015-05-20 15:43:17 +05:30
Nabin Hait
521aa2e94a
Update party_model.py
2015-05-20 14:39:39 +05:30
Nabin Hait
390df6626b
Merge pull request #3298 from nabinhait/develop
...
party model patch fix
2015-05-20 14:34:42 +05:30
Nabin Hait
a2d8585b07
party model patch fix
2015-05-20 14:32:54 +05:30
Pratik Vyas
84e658058b
Merge branch 'develop'
2015-05-20 12:54:52 +05:30
Pratik Vyas
10e813b010
bumped to version 5.0.5
2015-05-20 13:24:52 +06:00
Nabin Hait
a7bd8ee34b
Update utils.py
2015-05-20 12:53:04 +05:30
Pratik Vyas
90a51225a4
Merge branch 'develop'
2015-05-20 12:27:47 +05:30
Pratik Vyas
8980ce6052
bumped to version 5.0.4
2015-05-20 12:57:47 +06:00
Nabin Hait
c0f56de971
Merge pull request #3297 from nabinhait/develop
...
validate diabled fiscal year
2015-05-20 12:26:44 +05:30
Nabin Hait
8d50eb32c1
validate diabled fiscal year
2015-05-20 12:26:21 +05:30
Nabin Hait
50bbc99889
Merge pull request #3296 from nabinhait/develop
...
validate disabled fiscal year
2015-05-20 12:21:51 +05:30
Nabin Hait
0cf9469f86
validate disabled fiscal year
2015-05-19 18:44:02 +05:30
Pratik Vyas
d13db9cd84
Merge branch 'develop'
2015-05-19 17:33:00 +05:30
Pratik Vyas
07b3bf6417
bumped to version 5.0.3
2015-05-19 18:03:00 +06:00
Nabin Hait
25ea307b9f
Merge pull request #3289 from nabinhait/develop
...
Multiple fixes
2015-05-19 17:10:54 +05:30
Nabin Hait
8252117fe5
set tax amount also in base currency after manipulation
2015-05-19 16:30:17 +05:30
Nabin Hait
c602396366
validation message improved
2015-05-19 16:30:16 +05:30
Nabin Hait
f59d3a4e07
conversion rate fixes
2015-05-19 16:30:16 +05:30
Pratik Vyas
1a1ba38e95
Merge branch 'develop'
2015-05-19 15:45:57 +05:30
Pratik Vyas
80a116ab19
bumped to version 5.0.2
2015-05-19 16:15:57 +06:00
Nabin Hait
6684c470c5
Merge pull request #3287 from rmehta/customer-fix
...
Customer fix
2015-05-19 15:33:06 +05:30
Pratik Vyas
b8252bca00
bumped to version 5.0.1
2015-05-19 13:47:43 +06:00
Pratik Vyas
129a0a4cae
Fix merge mistakes
2015-05-19 13:12:00 +05:30
Pratik Vyas
803e998e9d
Fix merge mistakes
2015-05-19 13:08:54 +05:30
Rushabh Mehta
476019a930
[fix] throw name error for duplicate group
2015-05-19 13:03:01 +05:30
Rushabh Mehta
5495bc54a5
[enhancement] default terms in company, fixes #3231
2015-05-19 13:03:01 +05:30
Pratik Vyas
1a84d8ecd2
Merge branch 'develop'
2015-05-19 12:23:52 +05:30
Pratik Vyas
cc8f204b50
bumped to version v5.0.0
2015-05-19 12:33:57 +06:00
Nabin Hait
fcda5b636c
patch fix
2015-05-19 11:12:06 +05:30
Nabin Hait
fb7140df2f
Don't repost future sle while cancelling PR via landed cost voucher
2015-05-19 11:12:06 +05:30
Nabin Hait
0a705fe582
gross profit report fix
2015-05-19 11:12:06 +05:30
Rushabh Mehta
4a3c805049
[fix] sms settings, fixes #3276
2015-05-19 11:10:12 +05:30
Rushabh Mehta
632fb3879e
[fix] sms center, fixes #3274
2015-05-19 11:00:10 +05:30
Rushabh Mehta
df2491f6cf
[fix] default website fixes #3273
2015-05-19 10:47:10 +05:30
Rushabh Mehta
7231bd76a2
[minor] [fix] default status in Purchase Receipt
2015-05-18 14:36:57 +05:30
Rushabh Mehta
770c258406
[test-fix] case
2015-05-18 12:43:46 +05:30
Rushabh Mehta
ba57d7c59b
[test-fix] case
2015-05-18 12:37:11 +05:30
Rushabh Mehta
5b69a93871
[test-fix] circular reference
2015-05-18 12:15:35 +05:30
Rushabh Mehta
49765b3009
[minor] catch naming series while setting type
2015-05-18 11:35:52 +05:30
Rushabh Mehta
9dd8aab211
[fix] status updater
2015-05-18 11:19:10 +05:30
Rushabh Mehta
0718292bfa
[minor] naming series not set message
2015-05-18 11:19:10 +05:30
Nabin Hait
26c8a96b0a
set contact and customer in issue
2015-05-17 10:39:06 +05:30
Nabin Hait
1fe50120a3
minor fix
2015-05-16 12:14:54 +05:30
Rushabh Mehta
3d7793dae3
[hot] fix in issue
2015-05-15 20:59:19 +05:30
Nabin Hait
f78283fbff
customer and supplier dashboard info
2015-05-15 16:58:51 +05:30
Nabin Hait
b893972486
update tax amount after discount amount in purchase cycle
2015-05-15 15:16:30 +05:30
Nabin Hait
53ba64b653
fix update_projects patch
2015-05-15 15:16:30 +05:30
Pratik Vyas
85557816b1
Merge branch 'v4.x.x'
2015-05-15 14:16:26 +05:30
Pratik Vyas
4cf549d223
bumped to version 4.25.7
2015-05-15 14:46:26 +06:00
Rushabh Mehta
8360e2df71
[fix] [minor] update customer in issue fixes #3241
2015-05-15 14:09:23 +05:30
Rushabh Mehta
e2e1471f4d
[fix] fix breadcrumbs for sales browser fixes #3240
2015-05-15 14:05:10 +05:30
Rushabh Mehta
0eb2dae5d1
[fix] opportuniy fixes #3262
2015-05-15 13:51:35 +05:30
Nabin Hait
a6ee8290ce
Inclusive tax for deduction and manipulation of tax amount to fix rounding issue
2015-05-15 12:02:27 +05:30
Nabin Hait
6f9d3972f2
Merge pull request #3264 from nabinhait/v4.x.x
...
minor fix in reports
2015-05-15 10:47:27 +05:30
Nabin Hait
9f926080b6
minor fix in reports
2015-05-15 10:44:19 +05:30
Pratik Vyas
9726447169
Update translations
2015-05-14 15:14:06 +05:30
Nabin Hait
60ca1c2e87
Customer Addresses And Contacts report
2015-05-14 12:32:26 +05:30
Nabin Hait
90fc19ed9a
Item image in print view
2015-05-14 12:32:26 +05:30
Nabin Hait
2f243f4d08
Merge pull request #3242 from neilLasrado/crm
...
view leads button added to campaign
2015-05-13 19:34:36 +05:30
Nabin Hait
fb6f79d345
Merge pull request #3228 from neilLasrado/hr
...
Minor Fixes for HR
2015-05-13 19:33:46 +05:30
Nabin Hait
13fce8fc3a
Merge pull request #3152 from neilLasrado/project
...
Relative Dates for Tasks - WIP
2015-05-13 19:33:20 +05:30
Neil Trini Lasrado
58bf6c5950
Update task.py
2015-05-13 19:29:47 +05:30
Nabin Hait
e6e456b373
message fixed
2015-05-13 17:21:44 +05:30
Nabin Hait
96c4252762
reload account in patch
2015-05-13 14:55:12 +05:30
Nabin Hait
f6e4723101
minor fix in landed cost voucher
2015-05-13 12:53:11 +05:30
Nabin Hait
7a9646959a
Allowed purchase order in different uom than in Material request
2015-05-13 12:42:29 +05:30
Pratik Vyas
fa67d4e0e9
Merge branch 'v4.x.x'
2015-05-13 11:54:39 +05:30
Pratik Vyas
119c4cf176
bumped to version 4.25.6
2015-05-13 12:24:39 +06:00
Pratik Vyas
b19040c103
Update CONTRIBUTING.md
2015-05-13 00:47:21 +05:30
Nabin Hait
b45d4e0e16
In general ledger report opening amount is purely based on posting date
2015-05-12 17:40:14 +05:30
Nabin Hait
6c0c5702c5
patch fix : replace fields in print formats and custom scripts
2015-05-12 16:49:40 +05:30
Nabin Hait
4f0ebb91a6
Merge pull request #3247 from nabinhait/v4.x.x
...
remove toggling SO and DN field in SI based on pos
2015-05-12 15:27:38 +05:30
Nabin Hait
4ed40be3c2
remove toggling SO and DN field in SI based on pos
2015-05-12 15:26:45 +05:30
Nabin Hait
2d76825936
remove toggling SO and DN field in SI based on pos
2015-05-12 15:24:55 +05:30
Nabin Hait
4b9b92ba2f
minor fix in report
2015-05-12 15:12:30 +05:30
Nabin Hait
ffc7f3fef6
Apply default taxes on loading of document
2015-05-12 15:07:02 +05:30
Nabin Hait
23d6eb7e5c
patch fixed for making email acocounts
2015-05-12 15:02:33 +05:30
Nabin Hait
8ba849184f
Fix taxes and totals in party currency
2015-05-12 12:50:43 +05:30
Nabin Hait
8719c1a6b8
Fix taxes and totals in party currency
2015-05-12 12:28:26 +05:30
Rushabh Mehta
73249551e8
[fix] [hot] website product list make full urls
2015-05-12 11:37:47 +05:30
Rushabh Mehta
9cf1edc2c0
[fix] [hot] website product list make full urls
2015-05-12 11:32:25 +05:30
Rushabh Mehta
8f96c39be6
[minor] setup wizard via error report
2015-05-12 11:32:25 +05:30
Rushabh Mehta
92015a1268
[fix] [minor] escape in report
2015-05-12 11:32:25 +05:30
Rushabh Mehta
4f1a7e5aa8
[fix] newsletter list duplicate
2015-05-12 11:32:25 +05:30
Nabin Hait
ec361ea648
exchange rate fix
2015-05-11 18:14:45 +05:30
Neil Trini Lasrado
6c85479e4f
view leads button added to campaign
2015-05-11 17:56:36 +05:30
Nabin Hait
dd82bf2ad9
Exchange rate issue fixed
2015-05-11 16:49:31 +05:30
Pratik Vyas
3d77de9cf9
[fix] rename table fieldnamess patch
2015-05-11 16:08:14 +05:30
Nabin Hait
fedcb242ef
Rename table fieldnames only if doctype exists
2015-05-11 15:11:17 +05:30
Nabin Hait
affb3ec220
Item variants: validation added
2015-05-11 15:11:17 +05:30
Neil Trini Lasrado
2edc91bc52
Leave Type - LWP changed to Leave Without Pay
2015-05-11 14:38:21 +05:30
Neil Trini Lasrado
ec2f3d6e63
leave_allocation layout changed
2015-05-11 14:38:20 +05:30
Pratik Vyas
2fb0654f97
Show bulk limit error before sending
2015-05-11 14:29:52 +05:30
Rushabh Mehta
4439493232
[welcome-mails] add video links
2015-05-11 12:52:36 +05:30
Nabin Hait
93e0ec6663
Show only sub-contracted purchase order in stock entry for subcontracting
2015-05-11 11:32:38 +05:30
Nabin Hait
d1a64d89be
date issue fixed serial no
2015-05-11 11:32:38 +05:30
Nabin Hait
8f5b8c658a
fixes for renaming taxes and charges master
2015-05-11 11:32:38 +05:30
Rushabh Mehta
20a41b52cd
[temp-fix] missing product image
2015-05-09 12:18:17 +05:30
Nabin Hait
948286ed19
Merge pull request #3227 from nabinhait/v4.x.x
...
requested qty fix
2015-05-08 15:03:32 +05:30
Nabin Hait
6752b31091
Fixed issue while updating Requested Qty on stoping material request and patch to recalculate
2015-05-08 12:49:50 +05:30
Nabin Hait
e27690ceda
Fixed issue while updating Requested Qty on stoping material request and patch to recalculate
2015-05-08 12:43:10 +05:30
Rushabh Mehta
ab1ed013b3
[hot] taxes
2015-05-08 11:09:25 +05:30
Nabin Hait
15c284497b
fixed patch
2015-05-08 01:28:01 +05:30
Nabin Hait
fbdc0dc7d1
fixed patch
2015-05-08 01:24:28 +05:30
Nabin Hait
752479d08d
patch order changed
2015-05-08 01:15:39 +05:30
Nabin Hait
53f17009bc
Merge pull request #3215 from neilLasrado/prod-order
...
Production Order - Fixed cost not considering qty issue
2015-05-07 18:55:02 +05:30
Neil Trini Lasrado
3c3cdc7029
fixes
2015-05-07 18:52:12 +05:30
Pratik Vyas
6eca3693b1
Merge branch 'v4.x.x'
2015-05-07 18:30:37 +05:30
Pratik Vyas
7e143a5fdd
bumped to version 4.25.5
2015-05-07 19:00:37 +06:00
Rushabh Mehta
55dc66ffcc
[fix] index for sales order item
2015-05-07 18:16:49 +05:30
Neil Trini Lasrado
20e1c781b6
js call changed to trigger
2015-05-07 17:31:59 +05:30
Neil Trini Lasrado
a10bdd4980
fixes
2015-05-07 17:31:59 +05:30
Neil Trini Lasrado
e64d453d09
patch added
2015-05-07 17:31:59 +05:30
Neil Trini Lasrado
4f5cc9d672
Test case added to Production Order to check planned-operating-cost against qty
2015-05-07 17:31:24 +05:30
Neil Trini Lasrado
e63146408d
production order - fixes cost not considering qty issue
2015-05-07 17:31:24 +05:30
Nabin Hait
08c0c04ef2
Removed old page style Stock ledger end stock level report
2015-05-07 16:59:51 +05:30
Nabin Hait
c62c64c38b
patch fixed for taxes and charges template
2015-05-07 16:58:28 +05:30
Nabin Hait
28b18222c0
capacity planning patch fixed
2015-05-07 16:29:51 +05:30
Nabin Hait
574d5ff535
fetch only stock items as raw materials supplied for subcontracting
2015-05-07 16:29:29 +05:30
Nabin Hait
4bfbd29411
Permission for Stock ledger and balance report
2015-05-07 15:41:09 +05:30
Nabin Hait
d1cdde1c77
Merge pull request #3222 from nabinhait/v4.x.x
...
V4 fix
2015-05-07 15:39:02 +05:30
Nabin Hait
d5e2788cb4
Permission for Stock ledger and balance report
2015-05-07 15:28:21 +05:30
Rushabh Mehta
3545575c8b
[jsonrates api] add from global defaults
2015-05-07 15:16:37 +05:30
Rushabh Mehta
2682278ad9
Merge pull request #3221 from neilLasrado/hr
...
employee removed from HR setup
2015-05-07 14:59:45 +05:30
Neil Trini Lasrado
d1c413a668
employee removed from HR setup
2015-05-07 12:40:18 +05:30
Rushabh Mehta
66fa1ff878
[enhancement] automatic exchange rates via jsonrates
2015-05-07 12:26:09 +05:30
Rushabh Mehta
43a7b36fcf
Merge pull request #3217 from rmehta/taxes-and-charges-rename
...
[rename] Sales/Purchase Taxes and Charges Master > Sales/Purchase Taxes ...
2015-05-07 11:23:59 +05:30
Rushabh Mehta
009378e187
[rename]
2015-05-06 22:59:00 +05:30
Rushabh Mehta
bcdea3ea51
[rename] Sales/Purchase Taxes and Charges Master > Sales/Purchase Taxes and Charges Template
2015-05-06 18:45:47 +05:30
Neil Trini Lasrado
b4a298ddd4
multiple dependant tasks added
2015-05-06 14:47:34 +05:30
Neil Trini Lasrado
b3b373d0ac
fixes in Test Cases
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
350943128a
fixes in Pull request
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
c8f0c25088
referenceError name changed to circularReferenceError
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
1fa8ed8a1f
Test Cases Added, fixes in task
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
3da42fcdf9
fixed import errors
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
fa381c7a6c
task-rescheduling - handled exception if date is None
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
46d859e694
re-schedule dependaable task logic added
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
93583faaf0
depends-on added to task, circular reference validation added
2015-05-06 14:47:33 +05:30
Nabin Hait
a0b1124d6f
minor fix in report
2015-05-06 11:59:43 +05:30
Nabin Hait
0e1540b3b7
material request saving issue fixed
2015-05-05 17:26:35 +05:30
Nabin Hait
2b3e065efc
[fix] taxes and charges input value
2015-05-05 16:33:58 +05:30
Nabin Hait
40557750d5
party model patch fix
2015-05-05 16:00:21 +05:30
Nabin Hait
cf22fdbc85
party model patch fix
2015-05-05 14:22:10 +05:30
Nabin Hait
61092c0a88
Pos item view: show item name and item code
2015-05-05 12:27:11 +05:30
Rushabh Mehta
ea2b9039e9
Merge pull request #3143 from frappe/fix-travis
...
Update .travis.yml
2015-05-05 10:59:35 +05:30
Rushabh Mehta
4f41bb35b9
Merge pull request #3192 from neilLasrado/purchase-costing
...
Purchase costing in Projects
2015-05-05 10:59:11 +05:30
Rushabh Mehta
deed16066e
Merge pull request #3209 from rmehta/email-threading
...
[email] changes in email_account api
2015-05-05 10:55:50 +05:30
Nabin Hait
7104cf613f
party model patch fix
2015-05-04 19:21:36 +05:30
Rushabh Mehta
82ee5fdba6
[email] changes in email_account api
2015-05-04 18:17:22 +05:30
Nabin Hait
64568fb296
Default expense account and cost center are always visible in item
2015-05-04 16:16:12 +05:30
Nabin Hait
f73aa079a0
item list view indicator fix
2015-05-04 16:06:59 +05:30
Nabin Hait
72f71836d7
Party model patch fix
2015-05-04 13:01:44 +05:30
Nabin Hait
c91a9e5231
Delete company and company transactions are separate functions
2015-05-04 11:51:21 +05:30
Rushabh Mehta
e991c9e075
[fix] [typo] fixes #3193
2015-05-04 11:04:54 +05:30
Nabin Hait
874ead2ed9
Update warehouse as per master_name if master_name exists
2015-05-04 08:53:57 +05:30
Rushabh Mehta
c712cdb580
[fix] tax with both actual and rate type
2015-05-03 22:20:56 +05:30
Nabin Hait
bac82c273d
Merge pull request #3204 from nabinhait/v4.x.x
...
Maintain same currency exchnage rate while mapping
2015-05-02 18:49:56 +05:30
Nabin Hait
f550ecf93e
Maintain same currency exchnage rate while mapping
2015-05-02 18:46:42 +05:30
Nabin Hait
69cdf59d63
Maintain same currency exchnage rate while mapping
2015-05-02 18:46:29 +05:30
Nabin Hait
fb1f4a5c58
User permissions for Expense Claim
2015-05-02 18:46:29 +05:30
Nabin Hait
b0e9c06f93
Stock Entry agianst Manufaturing: fetch only stock items from bom
2015-05-02 18:46:29 +05:30
Rushabh Mehta
ba4aec3366
Merge pull request #3202 from kressi/develop
...
removed attributes from frappe.user.is_website_user()
2015-05-02 17:52:54 +05:30
kressi
d853353c28
Merge remote-tracking branch 'upstream/develop' into develop
2015-05-02 10:24:56 +02:00
kressi
d1aa37f521
removed attributes from frappe is_website_user
2015-05-02 10:24:17 +02:00
Nabin Hait
d51b09282a
link warehouse with account
2015-05-01 20:31:11 +05:30
Pratik Vyas
05f8b6d870
Merge branch 'v4.x.x'
2015-05-01 16:42:37 +05:30
Pratik Vyas
ef7d6ae1f5
bumped to version 4.25.4
2015-05-01 17:12:36 +06:00
Nabin Hait
2a27e604af
Merge pull request #3195 from nabinhait/v4.x.x
...
fixes
2015-05-01 16:42:17 +05:30
Nabin Hait
ba43afc461
fix in chart of cost centers
2015-05-01 16:41:15 +05:30
Nabin Hait
9dd9150d2c
fix for duplicate item
2015-05-01 16:41:15 +05:30
Nabin Hait
f25822cd8d
fix in patches
2015-05-01 15:50:52 +05:30
Nabin Hait
2ca18ff913
Stock Entry validation in Journal Entry
2015-05-01 12:46:59 +05:30
Rushabh Mehta
5dbf8a7418
[cleanup] frappe.get_user
2015-05-01 11:51:26 +05:30
Nabin Hait
7981ea0e6c
duplicate item message
2015-05-01 11:10:37 +05:30
Nabin Hait
816cb8c141
Migrate customized precision for newly created total fields
2015-05-01 11:10:37 +05:30
Anand Doshi
e6ac87e86f
Gross Profit Report: Company filter should be reqd
2015-04-30 15:33:31 -07:00
Rushabh Mehta
ec3ad7d865
[enhancement] close opportunities from list view
2015-04-30 17:17:50 +05:30
Pratik Vyas
397a2bf1d0
Merge branch 'v4.x.x'
2015-04-30 16:31:02 +05:30
Pratik Vyas
7358e6a100
bumped to version 4.25.3
2015-04-30 17:01:02 +06:00
Nabin Hait
aa03a8e3a2
Migrate customized precision for newly created total fields
2015-04-30 16:13:47 +05:30
Nabin Hait
1bf03289a6
Service items should not be considered as raw material in production planning tool
2015-04-30 16:13:47 +05:30
Nabin Hait
c5b8f7eb46
fix in trends report
2015-04-30 16:13:46 +05:30
Nabin Hait
4ffee99ba3
Removed duplicate item validation
2015-04-30 16:13:46 +05:30
Neil Trini Lasrado
42a554e5cb
fixes in Purchase Invoice
2015-04-30 13:06:02 +05:30
Neil Trini Lasrado
01720404db
fixes in Test Cases
2015-04-30 13:06:02 +05:30
Neil Trini Lasrado
349461e9e6
Test Cases Added
2015-04-30 13:06:02 +05:30
Neil Trini Lasrado
9a56764bf2
Total Purchase Cost added to Projects
2015-04-30 13:06:02 +05:30
Rushabh Mehta
5e13799704
[fixes] leave approver selection and cleaned up layout
2015-04-30 12:55:10 +05:30
Nabin Hait
693d1b2b2c
Merge pull request #3190 from nabinhait/v4.x.x
...
Fixes
2015-04-30 12:23:14 +05:30
Nabin Hait
6e659a4f27
Service items should not be considered as raw material in production planning tool
2015-04-30 11:51:24 +05:30
Nabin Hait
acfdce6ade
Removed duplicate item validation
2015-04-30 11:51:24 +05:30
Nabin Hait
4716278f69
minor fix in chart of cost centers
2015-04-29 19:12:46 +05:30
Nabin Hait
2db8dc922a
fixed trial balance related to showing zero balance
2015-04-29 18:39:33 +05:30
Nabin Hait
5207d1205e
minor issue fixed for precision
2015-04-29 15:38:14 +05:30
Nabin Hait
b6a1bcc730
Merge pull request #3186 from nabinhait/v4.x.x
...
V4.x.x
2015-04-29 14:26:19 +05:30
Nabin Hait
6e59aca394
[enhancement] sort root accounts as assets, liability, equity, income, expense
2015-04-29 13:08:00 +05:30
Nabin Hait
59ab65ded6
fixed trial balance related to showing zero balance
2015-04-29 13:08:00 +05:30
Rushabh Mehta
0590cdceab
[enhancement] sort root accounts as assets, liability, equty, income, expense
2015-04-29 12:26:15 +05:30
Nabin Hait
081935eff7
[fix] fetch bank/cash account
2015-04-28 19:08:42 +05:30
Nabin Hait
2ff177a4fb
fix for opening purchase invoice
2015-04-28 17:17:37 +05:30
Nabin Hait
47e5c764c3
[fix] accounts payable report
2015-04-28 16:45:32 +05:30
Rushabh Mehta
45ca8a4d31
[minor] save last company in multi-company scenario
2015-04-28 16:04:56 +05:30
Nabin Hait
b1b95526c6
Update sales_invoice.js
2015-04-28 13:56:48 +05:30
Nabin Hait
872eaf1541
Update purchase_invoice.js
2015-04-28 13:56:17 +05:30
Nabin Hait
aef76bfa1d
Update journal_entry.js
2015-04-28 13:55:04 +05:30
Nabin Hait
042f86e555
advance paid should not be copied and patch to fix affected records
2015-04-28 13:00:23 +05:30
Nabin Hait
67fdbcf242
precision fixed in batch-wise balance report
2015-04-28 12:53:26 +05:30
Nabin Hait
b142a5eda0
Merge pull request #3174 from nabinhait/v4.x.x
...
precision fixed in batch-wise balance report
2015-04-28 12:37:38 +05:30
Nabin Hait
5ce31174be
precision fixed in batch-wise balance report
2015-04-28 12:36:53 +05:30
Nabin Hait
3be69d4d81
patch for updating temporary account type
2015-04-27 18:33:05 +05:30
Nabin Hait
5616ff417c
Account type Temporary and removed Aging Date field from all documents
2015-04-27 18:08:51 +05:30
Pratik Vyas
8f7621c40d
Merge branch 'v4.x.x'
2015-04-27 17:29:53 +05:30
Pratik Vyas
b17f056f8d
bumped to version 4.25.2
2015-04-27 17:59:52 +06:00
Nabin Hait
31f6c984f0
Update .travis.yml
2015-04-27 16:48:33 +05:30
Nabin Hait
3ee5db123f
Merge pull request #3164 from nabinhait/v4.x.x
...
advance paid should not be copied and patch to fix affected records
2015-04-27 16:45:26 +05:30
Rushabh Mehta
50ce9753e0
[minor] added cache in get_value
2015-04-27 13:13:50 +05:30
Nabin Hait
3c3855ac8c
advance paid should not be copied and patch to fix affected records
2015-04-27 11:25:56 +05:30
Anand Doshi
8be3ba36d9
fixed relative urls in some web pages
2015-04-24 13:22:08 -04:00
Nabin Hait
9c8b6eb815
minor fix in completed production orders report
2015-04-24 18:36:02 +05:30
Nabin Hait
52cf6e947c
patch fix
2015-04-24 16:07:32 +05:30
Rushabh Mehta
6894b9e457
[minor] only one Temporary Opening account
2015-04-24 14:22:54 +05:30
Nabin Hait
01e4c8f0f8
fix in chart of accounts
2015-04-23 16:29:15 +05:30
Rushabh Mehta
a30c76f430
[ux] [layouts] project page
2015-04-23 15:23:47 +05:30
Nabin Hait
218a1267c9
Merge pull request #3146 from neilLasrado/project
...
FIxes - Time Log Hours calculation
2015-04-23 14:37:23 +05:30
Nabin Hait
ffa6d94f7a
Merge pull request #3150 from rmehta/is_group
...
[rename] group_or_ledger to is_group
2015-04-23 14:37:00 +05:30
Rushabh Mehta
38c6b52770
[rename] group_or_ledger to is_group
2015-04-23 13:14:17 +05:30
Neil Trini Lasrado
8e4cf13d01
fixes time log hours calculation
2015-04-22 16:23:36 +05:30
Neil Trini Lasrado
d3179a733b
datatype of hour_rate in Production order operations and bom operation changed to float
2015-04-22 16:11:48 +05:30
Neil Trini Lasrado
6a066e07e5
Time Log - to_time trigger called on_load to calculate hours if Tl is created via Calender
2015-04-22 16:11:48 +05:30
Nabin Hait
4669fe3e85
minor fix
2015-04-22 15:34:44 +05:30
Nabin Hait
1e3fb54b82
Merge pull request #3006 from neilLasrado/project
...
Project Costing
2015-04-22 12:36:15 +05:30
Neil Trini Lasrado
ecb5d11e2d
Today added as default date for posting date in expense claim
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
051d0ab79a
function name validate cost changed to update cost in Time Log
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
5e317d2b72
fixes in Expense Claim and get_avtivity_cost function
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
832dfe7980
fixes in Time Log Batch
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
086c0463be
Fixes in Patch
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
e1951306eb
fix in time log batch list
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
da8c6f6ae2
test case fix for Time Log
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
50a0fd6204
feild rename fixes in Project
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
e7ddb72e7f
patch for renaming project feilds
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
4cffbe26dc
rate removed from time log batch
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
d4b33d3c14
Costing added in Time log Batch, Sales Order added to Project + more fixes
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
4e6e4726a4
filters added, ui change, update project moved to project.py
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
ec5c66f8f0
Title Feild added to Expense Claim
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
05f15bbb88
fixes in Test Cases
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
9789d06b3e
task and project- billing amount and actual amount added
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
650e679a5e
Fixes in Project
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
78b96ca769
Fixes in time_log
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
c33ad6b36a
fixes in Activity Cost
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
2679b247b3
fixes in Expense Claim
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
7f9ea3bf6a
expense claim test records
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
33d58ac431
Test Cases
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
709c43674b
feild rename - internal rate/cost into costing rate/amount
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
aabf150423
task made mandatory in project
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
a11770f06f
in Time Log - Server side validations added to recalculate cost on save
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
50234cb0fe
Task added to expense claim
...
all cost (expense claim and time log) against Task; task updates project cost.
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
8026137998
employee name added to activity cost
...
title changed for activity type
time log -fetch logic added for billing and internal rate
validations and calculation logic added
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
458b8885f0
New Document Activity Cost created.
...
In TL - billing rate and internal rate added
In Project - total expense claim and total activity cost. Buttons addded - show time logs and show expense claims.
In Expense Claim - Employee and project link added. update cost in project on submit and on trash. Validation added to check sanctioned amount is not greater than claim amount.
2015-04-22 11:25:57 +05:30
Rushabh Mehta
0f2b7bd2bf
Update setup.py
2015-04-22 10:50:02 +05:30
Pratik Vyas
6814a39186
Update .travis.yml
2015-04-21 19:19:34 +05:30
Rushabh Mehta
3c77b332ae
Merge pull request #3142 from neilLasrado/production-planning
...
Manufacturing Settings
2015-04-21 19:13:13 +05:30
Neil Trini Lasrado
d93750a868
Manufacturing Settings - Datatype of capacity_planning_for_days and mins_between_operations changed to Int
2015-04-21 17:40:37 +05:30
Nabin Hait
b650d691a0
fixed conflict
2015-04-21 17:16:28 +05:30
Rushabh Mehta
7337c80f09
Merge pull request #3141 from neilLasrado/production-planning
...
Fix - #3123
2015-04-21 16:47:01 +05:30
Neil Trini Lasrado
261e27b9ec
type of Hour rate in Production order operations and bom operations changed to currency (previouslly float). Desc to Actual Operation Cost changed
2015-04-21 16:43:43 +05:30
Nabin Hait
e68e86f109
execute on_doctype_update
2015-04-21 15:26:42 +05:30
Rushabh Mehta
50918a8fcf
[pos] fixes #3138 , #3140
2015-04-21 14:38:48 +05:30
Rushabh Mehta
4665f7eb70
[enhancement] added description, batch_no in packing slip
2015-04-21 11:20:24 +05:30
Rushabh Mehta
80381475c4
[ux] re-arranged columns in bank reconciliation, fixes #3114
2015-04-21 11:08:53 +05:30
Rushabh Mehta
dfa93305ab
[minor] fixes #3127
2015-04-21 10:36:39 +05:30
Rushabh Mehta
7f9c4d8677
[fix] item grid fix, via #3136
2015-04-21 10:19:53 +05:30
Nabin Hait
5c7f0bcb32
Party filter and columns in general ledger report
2015-04-20 17:13:53 +05:30
Rushabh Mehta
e9bd77d674
[minor] fixes in welcome mails
2015-04-20 13:00:56 +05:30
Nabin Hait
44aaa56000
get standard chart of account if country code not found
2015-04-20 11:51:54 +05:30
Pratik Vyas
3b8682f534
Merge branch 'v4.x.x'
2015-04-20 10:44:21 +05:30
Pratik Vyas
dbb3b49625
bumped to version 4.25.1
2015-04-20 11:14:21 +06:00
Pratik Vyas
b78ab03b2b
Merge 'upstream/master' into v4.x.x (account receivable hotfix)
2015-04-20 10:41:31 +05:30
Rushabh Mehta
80f8b7be2f
[minor] [perms] Expense Claim Type
2015-04-19 16:18:15 +05:30
Rushabh Mehta
d7330ec709
[minor] add disabled property in fiscal year:
2015-04-18 17:04:04 +05:30
Rushabh Mehta
92b253dceb
Update accounts_receivable.py
2015-04-18 12:13:57 +05:30
Nabin Hait
1b26c6f02a
Merge pull request #3125 from nabinhait/v4.x.x
...
hotfix in patch
2015-04-17 16:16:35 +05:30
Nabin Hait
0287b1f75c
hotfix in patch
2015-04-17 16:15:25 +05:30
Pratik Vyas
e19578bac1
Merge branch 'v4.x.x'
2015-04-17 16:02:11 +05:30
Pratik Vyas
e7eb92ce70
bumped to version 4.25.0
2015-04-17 16:32:11 +06:00
Nabin Hait
6ae352bf12
Merge pull request #3124 from nabinhait/v4.x.x
...
issue fixed in accounts receivable report
2015-04-17 15:58:27 +05:30
Nabin Hait
4743cbe002
issue fixed in accounts receivable report
2015-04-17 15:55:19 +05:30
Nabin Hait
ddaedefb32
minor fix for fieldname
2015-04-17 15:01:41 +05:30
Rushabh Mehta
f6215c7740
Merge pull request #3122 from nabinhait/v4.x.x
...
delete gle for cancelled invoices
2015-04-17 14:20:50 +05:30
Rushabh Mehta
9e6812cfab
Merge pull request #3108 from BhupeshGupta/fix_bank_reports
...
Add/Fix Bank Reports Filters
2015-04-17 14:17:22 +05:30
Nabin Hait
2ba88c4a5f
patch: delete gle for cancelled invoices
2015-04-17 12:05:00 +05:30
Rushabh Mehta
b092339c3a
[minor] ignore list for dropbox
2015-04-17 12:01:40 +05:30
Rushabh Mehta
0939a5ac4c
feature to delete company
2015-04-17 11:52:45 +05:30
Anand Doshi
63ea99e929
[hotfix] item group set_parent_website_route
2015-04-16 20:45:54 -04:00
Nabin Hait
1a6299176a
delete gl entries on cancellation of sales invoice, if grand total is zero
2015-04-16 19:22:42 +05:30
Nabin Hait
2029ea9abf
toggle editable price list rate
2015-04-16 17:55:35 +05:30
Nabin Hait
2182cd5487
Update journal_entry.js
2015-04-16 16:00:37 +05:30
Rushabh Mehta
acf489c5ef
[hot] [fix] journal entry
2015-04-16 15:35:49 +05:30
Rushabh Mehta
d839a730cf
[hot] [fix] journal entry
2015-04-16 15:27:46 +05:30
Rushabh Mehta
5674c4f28c
[splash] new image
2015-04-16 15:09:42 +05:30
Rushabh Mehta
d64e928b50
[favicon] darker
2015-04-16 14:04:51 +05:30
Rushabh Mehta
5ecceb55fe
Merge pull request #3119 from nabinhait/v4.x.x
...
Reset no-copy fields for recurring docs and patch to fix
2015-04-16 14:02:35 +05:30
Nabin Hait
c3daa91c8a
Reset no-copy fields for recurring docs and patch to fix
2015-04-16 13:13:18 +05:30
Rushabh Mehta
2e7c36ec99
[favicon] light grey for erpnext
2015-04-16 12:41:42 +05:30
Rushabh Mehta
600aa622b1
[fix] [minor] journal entry, via error report
2015-04-16 11:43:26 +05:30
Rushabh Mehta
12ade3573b
[minor] fix default permissions for purchase taxes and charges master
2015-04-16 11:43:25 +05:30
Pratik Vyas
a7b7e62e26
[travis] Add gitter webhook
2015-04-16 10:45:03 +05:30
bhupeshg2
3f59615555
switch to tabs
2015-04-15 22:29:45 +05:30
Rushabh Mehta
2887913797
[fix] opportunity -> quotation
2015-04-15 15:40:05 +05:30
Rushabh Mehta
2dea40f7be
[leave-allocation] can cancel and re-submit or make a new one, fixes frappe/erpnext#3042
2015-04-15 15:08:48 +05:30
Pratik Vyas
850ee3c53d
Fix make_email_account patch
2015-04-15 14:36:32 +05:30
Rushabh Mehta
749e20f66d
Merge pull request #3076 from kidakaka/patch-1
...
Minor Update README.md
2015-04-15 12:29:52 +05:30
Rushabh Mehta
53bc304be2
Merge pull request #3037 from neilLasrado/production-planning
...
Production planning
2015-04-15 12:06:44 +05:30
Rushabh Mehta
e027d3f34f
[fix] a better solution for #2776
2015-04-15 12:03:21 +05:30
bhupeshg2
e2e973f7be
Add reqd to bank clearance aummary report
...
Add filters if filters are in list form to get_account_list [erpnext.controllers.queries.get_account_list] query
2015-04-14 23:09:32 +05:30
Anand Doshi
68dfc934bf
[hotfix] [report] Received Items to be Billed
2015-04-14 11:56:42 -04:00
Rushabh Mehta
3ee1f11771
[cleanup] quality inspection fixes #3061
2015-04-14 17:53:36 +05:30
Rushabh Mehta
5e7f8fd156
[ux] bom fixes #3072
2015-04-14 14:24:21 +05:30
Rushabh Mehta
de9bd108d0
[usability] journal entry type fixes #3085
2015-04-14 14:10:19 +05:30
Rushabh Mehta
39539f14ce
[patch-fix] make_email_accounts
2015-04-14 13:07:28 +05:30
Neil Trini Lasrado
18dc151fc7
Fixes in make_time_log function in Production Order
2015-04-14 13:06:07 +05:30
Neil Trini Lasrado
cf96cc26a0
Fixes for test cases
2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
1371afce2e
added default date to planned start date in Prod Order & made planned end date read-only
2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
c43ac20115
Fixes in logic for production order scheduling
2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
d3d94d1efe
fix- Material Transferred for Manufacturing not Updating in Production Order Error
2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
cd1816cc5a
removed unnecesssary functions. Production related feilds made mandatory in TIme Log
2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
5ab7d930b6
make time log button in Production order operations fixed
...
show time logs button made available for compleated operations
2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
8d5d5cc0a7
Planned Start Date made mandatory in production order
...
server side check added to not plan operations if planned_start_date is None
Production Order on submit - unwanted error messsages problem fixed.
2015-04-14 13:00:54 +05:30
Rushabh Mehta
2c78796716
[fix] opportunity / make quotation
2015-04-14 11:24:42 +05:30
Rushabh Mehta
adfc34ba00
[opportunity] status open
2015-04-13 22:23:50 +05:30
Rushabh Mehta
f579cf9871
[opportunity] status open
2015-04-13 16:58:47 +05:30
Rushabh Mehta
4ac3094049
[opportunity] status open
2015-04-13 16:56:03 +05:30
Rushabh Mehta
c712dc6729
[opportunity] status open
2015-04-13 16:51:27 +05:30
Rushabh Mehta
99a4d63d97
[opportunity] status open
2015-04-13 16:24:35 +05:30
Rushabh Mehta
fd0f1cb8b7
[opportunity] not submittable
2015-04-13 16:21:58 +05:30
Rushabh Mehta
20bcf6aeff
[fixes] print_hide on stock uom and gross profit
2015-04-13 15:31:24 +05:30
Rushabh Mehta
39c84fe31c
[hot] coa
2015-04-13 12:16:25 +05:30
Rushabh Mehta
b4c4351513
[report] fix via error report
2015-04-13 11:30:10 +05:30
Pratik Vyas
2437d4cce2
Fix #3046 Customer Acquisition and Loyalty repor
2015-04-10 12:35:43 +05:30
Pratik Vyas
950bf72471
Merge pull request #3087 from pdvyas/lang
...
update translations
2015-04-10 10:29:54 +05:30
Pratik Vyas
7f8cc32d38
update translations
2015-04-10 10:26:08 +05:30
Anand Doshi
a0630671da
[hotfix] batch query
2015-04-09 13:34:57 +05:30
Pratik Vyas
9490d9dee3
Merge branch 'v4.x.x'
2015-04-09 13:16:47 +05:30
Pratik Vyas
c95e4e89d5
bumped to version 4.24.4
2015-04-09 12:56:05 +06:00
Nabin Hait
b362bb076d
Merge pull request #3083 from nabinhait/v4.x.x
...
company in reports
2015-04-09 11:50:19 +05:30
Nabin Hait
031b1251cf
Merge branch 'anandpdoshi-anand-mar-30' into v4.x.x
2015-04-09 11:42:47 +05:30
Nabin Hait
4642d0697e
fixed conflict
2015-04-09 11:42:24 +05:30
Nabin Hait
4f0231e34b
Merge pull request #3075 from nabinhait/v4.x.x
...
V4.x.x
2015-04-09 11:22:20 +05:30
Anand Doshi
00a07de426
fixed test earning type
2015-04-08 21:49:11 +05:30
Anand Doshi
c994647704
fixed test cases
2015-04-08 21:22:36 +05:30
Anand Doshi
2f87fb41fa
Merge pull request #3069 from neilLasrado/dob
...
validation added - dob cannot accept a future date
2015-04-08 13:25:01 +05:30
Prasad Ajinkya
2a29e53cb2
Update README.md
...
WordPress is always with a capital "P". If you want people to respect your brand, you need to start respecting other brands' guidelines as well :)
2015-04-08 13:24:25 +05:30
Anand Doshi
a1a3468704
Merge pull request #3068 from neilLasrado/leaves
...
Bug Fixes
2015-04-08 13:20:18 +05:30
Anand Doshi
519f0f8b0c
Merge pull request #2966 from neilLasrado/HR
...
Offer Letter
2015-04-08 13:06:36 +05:30
Neil Trini Lasrado
4b29ccc2b0
Salary Structure - Earnings made mandatory
2015-04-08 12:29:40 +05:30
Neil Trini Lasrado
4ba4d9dbef
fix - update button didnt work in leave allocation after submit
2015-04-08 12:29:40 +05:30
Neil Trini Lasrado
20f0ef2515
validation added - dob cannot accept a future date
2015-04-08 12:29:01 +05:30
Neil Trini Lasrado
28b0cc4d0b
fixes in offer letter
2015-04-08 12:28:21 +05:30
Neil Trini Lasrado
496e277d8a
print format added
2015-04-08 12:28:21 +05:30
Rushabh Mehta
aca5cb6513
[fixes] offer letter
2015-04-08 12:28:21 +05:30
Neil Trini Lasrado
8ca547b7f2
terms view added
2015-04-08 12:28:21 +05:30
Neil Trini Lasrado
e1d620b168
Offer Letter - New Doctype added and job_applicant naming changed
2015-04-08 12:28:20 +05:30
Nabin Hait
0277ae298a
pending amount to be delivered in report
2015-04-07 17:49:53 +05:30
Pratik Vyas
d102cba71c
[patch] [fix] Fix missing image column error
2015-04-07 15:32:15 +05:30
Anand Doshi
e4e112a6bc
setup wizard - don't send welcome mail
2015-04-07 11:03:58 +05:30
Nabin Hait
6eb55d4d3d
allowed import for delivery note
2015-04-07 09:42:44 +05:30
Anand Doshi
03cf407574
[fix] removed print
2015-04-06 19:38:13 +05:30
Anand Doshi
c399709789
fixes to test cases
2015-04-06 19:29:16 +05:30
Anand Doshi
0dc79f4de0
Merge remote-tracking branch 'frappe/v4.x.x' into develop
...
Conflicts:
.travis.yml
erpnext/__version__.py
erpnext/controllers/queries.py
erpnext/hooks.py
erpnext/selling/sales_common.js
erpnext/stock/doctype/bin/bin.py
erpnext/stock/doctype/stock_entry/stock_entry.js
erpnext/stock/doctype/stock_entry/stock_entry.py
erpnext/stock/stock_ledger.py
setup.py
2015-04-06 13:21:07 +05:30
Anand Doshi
731b15edf4
[hotfix] taxes and totals
2015-04-05 20:09:09 +05:30
Anand Doshi
22af7deadd
minor fixes
2015-04-05 17:18:07 +05:30
Anand Doshi
7854779c22
[hotfix] strip email when importing newsletter list
2015-04-05 13:44:52 +05:30
Anand Doshi
e4580447d0
[fix] on setup wizard language selection and load, set it as system default language
2015-04-04 16:15:04 +05:30
Anand Doshi
85e5d46370
[fix] opportunity email pulling
2015-04-03 15:03:01 +05:30
Anand Doshi
c13c4f014e
[fix] editable amount in Purchase Taxes and Charges
2015-04-03 14:55:51 +05:30
Anand Doshi
432c12ad93
[fix] email account patch fix and minor setup wizard fix
2015-04-03 14:30:15 +05:30
Rushabh Mehta
8bd54f27c5
Merge pull request #3051 from rmehta/opportunity
...
Opportunity
2015-04-03 11:01:59 +05:30
Rushabh Mehta
f63a3d4a80
[fiscal year] automatically set year end date if more than one year
2015-04-03 10:59:48 +05:30
Anand Doshi
9d3adc3abf
Merge pull request #3048 from anandpdoshi/anand-april-2-v5
...
Party Model Patch
2015-04-03 08:22:59 +05:30
Rushabh Mehta
bb2041d22c
[patch] fix
2015-04-02 22:11:16 +05:30
Rushabh Mehta
7c32770a69
move opportunity item to CRM
2015-04-02 22:06:36 +05:30
Rushabh Mehta
3c626faf8f
[incoming sales email] to opportunity
2015-04-02 22:02:33 +05:30
Rushabh Mehta
4c46687fb1
[incoming sales email] to opportunity
2015-04-02 22:00:34 +05:30
Rushabh Mehta
05e39992d0
[setup-wizard] don't catch duplicate
2015-04-02 18:55:36 +05:30
Anand Doshi
5445c460b7
[fix] [patch] party model patch
2015-04-02 17:42:27 +05:30
Rushabh Mehta
750ceedbc1
[production order] explict idx + test fix
2015-04-02 16:03:11 +05:30
Rushabh Mehta
99a41952a4
[lead] [email] fixes
2015-04-02 15:53:11 +05:30
Anand Doshi
54448aabd6
Setup wizard fixes
2015-04-02 15:39:44 +05:30
Rushabh Mehta
ffc190d34d
Merge pull request #3013 from neilLasrado/expense
...
Expense Claim - 'Total Amount Reimbursed' feild added
2015-04-02 14:29:29 +05:30
Rushabh Mehta
0f7e79a421
Merge pull request #3040 from anandpdoshi/anand-april-2-v5
...
Show Write-Off for all Sales Invoices if there is a Grand Total
2015-04-02 14:05:24 +05:30
Anand Doshi
83f87da3d1
Show Write-Off for all Sales Invoices if there is a Grand Total
2015-04-02 13:43:51 +05:30
Rushabh Mehta
d7a5b7309b
[minor] fix
2015-04-01 23:38:37 +05:30
Anand Doshi
bfa3a08576
fixed welcome emails
2015-04-01 23:34:16 +05:30
Anand Doshi
3aaab1a39e
setup wizard fixes
2015-04-01 22:01:54 +05:30
Rushabh Mehta
99d90e1f34
[setup] send welcome emails after setup
2015-04-01 20:32:57 +05:30
Anand Doshi
7b6daafbb9
[minor] left aligned email footer, raise duplicate entry error for common email id in Employee and Sales Person
2015-04-01 16:26:59 +05:30
Anand Doshi
8ea1ed143b
Show write-off section if pos or advance payment
2015-04-01 16:25:55 +05:30
Rushabh Mehta
4c8d01ba9e
[issue] close, reopen buttons
2015-04-01 15:43:14 +05:30
Rushabh Mehta
918ddf2537
[task] open, close from list:
2015-04-01 15:43:14 +05:30
Anand Doshi
ee57a8d2a4
[hotfix] unique job applicant
2015-04-01 12:29:30 +05:30
Anand Doshi
dd77287cb9
[fix] fiscal year auto-create
2015-04-01 08:26:32 +05:30
Anand Doshi
5745cf7600
fixed rename field patches
2015-03-31 17:31:53 +05:30
Anand Doshi
92af795f12
Fixed note permission query
2015-03-31 14:42:22 +05:30
Rushabh Mehta
aefc01372f
[listview] issue: open, close | so, po: stop, unstop
2015-03-31 13:39:42 +05:30
Pratik Vyas
4ce7977dec
Update .travis.yml
2015-03-31 13:16:29 +05:30
Pratik Vyas
1b41b50a95
Update .travis.yml
2015-03-31 13:13:52 +05:30
Pratik Vyas
52d3697d98
Update .travis.yml
2015-03-31 13:11:32 +05:30
Anand Doshi
fc79492bac
Lead Status in List, minor fix in Make Email Accounts patch
2015-03-30 22:35:51 +05:30
Anand Doshi
d6a360b51b
[fix] check job application unique email id
2015-03-30 21:11:34 +05:30
Pratik Vyas
4ec1a9e8f6
Move frappe field renames to frappe
2015-03-30 19:37:02 +05:30
Anand Doshi
31dce7fa49
Merge pull request #3025 from sbktechnology/v4.x.x
...
some fix in batch related cleanup
2015-03-30 16:13:29 +05:30
Sambhaji Kolate
a4fa96cc79
some fix in batch related cleanup
2015-03-30 16:04:55 +05:30
Anand Doshi
6208c49859
Added Company field in various Query Reports
2015-03-30 15:21:20 +05:30
Pratik Vyas
52e8c3d42b
Merge branch 'v4.x.x'
2015-03-30 12:41:48 +05:30
Pratik Vyas
10224c9d86
bumped to version 4.24.3
2015-03-30 13:11:48 +06:00
Anand Doshi
adcf857c37
fixed newsletter unsubscribe and default footer
2015-03-27 17:42:18 +05:30
Nabin Hait
abfe09b8ee
Merge pull request #3017 from nabinhait/v4.x.x
...
Landed cost voucher: fixes for serialized item
2015-03-27 17:05:20 +05:30
Nabin Hait
54c865e77c
Landed cost voucher: fixes for serialized item
2015-03-27 15:39:06 +05:30
Nabin Hait
f977ad036e
reload block module
2015-03-27 10:49:41 +05:30
Nabin Hait
e5604dc944
production order operation order by idx
2015-03-26 17:40:57 +05:30
Nabin Hait
789ef7e346
stock balance report fixed
2015-03-26 17:40:57 +05:30
Neil Trini Lasrado
a6b3415cdd
Expense Claim - 'Total Amount Reimbursed' feild added
2015-03-26 14:13:44 +05:30
Nabin Hait
712440c045
Merge pull request #3012 from nabinhait/v4.x.x
...
purchase order items to be billed report
2015-03-26 12:50:40 +05:30
Nabin Hait
7057970c0c
purchase order items to be billed report
2015-03-26 11:05:13 +05:30
Rushabh Mehta
eb928b950f
[fix] journal entry 3 cols, default weekly digest
2015-03-25 17:34:20 +05:30
Nabin Hait
d25fda7537
patch fixes
2015-03-25 15:55:09 +05:30
Nabin Hait
06b0b36ae6
Patch fixes
2015-03-25 14:51:35 +05:30
Anand Doshi
d3a32bc9e5
[minor] fixed newsletter patch
2015-03-25 14:51:11 +05:30
Nabin Hait
37eaa0cca3
Merge pull request #3003 from neilLasrado/activity-type
...
time_log_for select field in TL changed to against_manufacturing (check)
2015-03-24 18:03:25 +05:30
Neil Trini Lasrado
3fcd89f63e
against_manufacturing renamed to for_manufacturing
2015-03-24 17:51:31 +05:30
Rushabh Mehta
308e6ea21e
[fixes] default_website and stock reco
2015-03-24 17:35:16 +05:30
Nabin Hait
b6061e5d3f
deleted chart of accounts and style settings doctype
2015-03-24 17:11:58 +05:30
Neil Trini Lasrado
bccec29415
In Time Log
...
- time_log_for removed.
- against manufacturing check box introduced
- all logic depending time_log_for shifted to against_manufacturing
- activity type made non-mandatory
- fixes in operations select feild data population in Time log
In Activity Type
- Validations for activity type manufacturing removed.
- Patch for creating activity type manufacturing removed
- activity type manufacturing removed from install fixtures
2015-03-24 16:53:54 +05:30
Nabin Hait
a3eec1603a
fixed against jv query
2015-03-24 14:49:09 +05:30
Nabin Hait
53450b08b0
Fixes in general ledger report
2015-03-24 13:13:25 +05:30
Nabin Hait
03f7a8e44a
minor fix in newsletter patch
2015-03-24 11:58:21 +05:30
Nabin Hait
e9d83303d3
create manufacturing activity type via patch only if setup completed
2015-03-23 17:05:32 +05:30
Pratik Vyas
f2eed445e5
Update .travis.yml
2015-03-23 16:23:28 +05:30
Nabin Hait
d2af60c825
Root Equity added in standard chart of accounts and finalized chart of India And UAE
2015-03-23 16:08:32 +05:30
Rushabh Mehta
04f907efcf
[fix] job applicant (test via import)
2015-03-23 15:44:54 +05:30
Rushabh Mehta
fea22de3e8
[minor] material request and newsletter list
2015-03-23 15:44:54 +05:30
Nabin Hait
da5cfb1630
Exchange rate upto 9 decimals
2015-03-23 14:51:45 +05:30
Nabin Hait
3c89605e57
minor fix in taxes and totals
2015-03-23 14:33:22 +05:30
Nabin Hait
ca7e778f82
modified date updated
2015-03-23 14:17:59 +05:30
Rushabh Mehta
c2eae25d0e
[cleanup] validate_email_add
2015-03-23 14:10:51 +05:30
Nabin Hait
97cc4dd582
precision issue fixed in report
2015-03-23 13:10:50 +05:30
Nabin Hait
395724dcdb
Merge pull request #2988 from neilLasrado/make-quote
...
make quotation button added to lead
2015-03-23 12:52:09 +05:30
Nabin Hait
544af6d4cf
fix
2015-03-23 12:35:39 +05:30
Neil Trini Lasrado
bef6fa152e
make quotation button added to lead
2015-03-23 11:01:22 +05:30
Pratik Vyas
c7402e2989
Merge branch 'v4.x.x'
2015-03-20 17:32:07 +05:30
Pratik Vyas
e07e5bbe00
bumped to version 4.24.2
2015-03-20 18:02:07 +06:00
Nabin Hait
04069bbc00
Merge pull request #2985 from nabinhait/v4.x.x
...
V4.x.x
2015-03-20 16:28:57 +05:30
Nabin Hait
63e00dcfd2
Set qty as per stock_uom while mapping Material request to Purchase order
2015-03-20 16:25:53 +05:30
Rushabh Mehta
aca5c7b580
[test] newsletter list
2015-03-20 16:06:34 +05:30
Rushabh Mehta
208a06f5f5
[test] newsletter list
2015-03-20 15:57:25 +05:30
Rushabh Mehta
acdd5189d1
[test-fix]
2015-03-20 15:52:11 +05:30
Rushabh Mehta
288a833422
[test-fix]
2015-03-20 15:37:31 +05:30
Rushabh Mehta
a7c377887b
[test-fix]
2015-03-20 15:15:38 +05:30
Nabin Hait
2ed71bac20
Batch related cleanup
2015-03-20 15:06:30 +05:30
Rushabh Mehta
8f343165ad
[patch-fix] convert_stock_reco
2015-03-20 15:04:13 +05:30
Nabin Hait
5601d9fbda
match condition in get_query
2015-03-20 14:40:36 +05:30
Rushabh Mehta
a7e21eb484
[newsletter-list] fixes, patch fix
2015-03-20 14:38:12 +05:30
Anand Doshi
2b2b639492
fixes
2015-03-20 14:29:23 +05:30
Nabin Hait
c1199c0d27
minor fix in patch
2015-03-20 10:29:30 +05:30
Rushabh Mehta
611b513a2d
[newsletter] fixed tests
2015-03-19 17:16:03 +05:30
Rushabh Mehta
14ae4c3603
[email] many fixes, newsletter, unsubscribe
2015-03-19 17:16:03 +05:30
Nabin Hait
fd2bf93b50
test case fix
2015-03-18 17:56:09 +05:30
Anand Doshi
9d8154dd40
fixed test cases
2015-03-18 16:22:13 +05:30
Nabin Hait
60aee54c6c
currency in test records
2015-03-18 16:06:13 +05:30
Nabin Hait
2df422de25
Test case fixes
2015-03-18 14:57:09 +05:30
Nabin Hait
87ee502dfd
Merge pull request #2949 from sbktechnology/develop
...
update get_batch_no query to sort batch with expiry date
2015-03-18 14:29:13 +05:30
Nabin Hait
b48fd9dfa9
Merge pull request #2965 from neilLasrado/serial-no
...
fixes in get_serial_number function
2015-03-18 14:26:14 +05:30
Nabin Hait
5a2be606ef
Merge pull request #2967 from neilLasrado/price-list
...
fix - price list none is disabled error
2015-03-18 14:25:53 +05:30
Neil Trini Lasrado
adb1b2ccef
fix - price list none is disabled error if price list is made blank in purchase order
2015-03-18 11:41:58 +05:30
Neil Trini Lasrado
3d61bbb36a
fixes in get_serial_number function
2015-03-18 11:04:32 +05:30
Anand Doshi
3353ad42bc
setup wizard bounce animation when working
2015-03-17 12:45:44 +05:30
Pratik Vyas
52c5121ecd
change version to v5.0.0-beta
2015-03-17 11:22:16 +05:30
Pratik Vyas
768b018561
Merge remote-tracking branch 'upstream/v5.0' into develop
2015-03-17 11:21:20 +05:30
Nabin Hait
a1bf43b1a6
Merged develop into v5
2015-03-17 10:50:47 +05:30
Nabin Hait
d3fd8965de
test case fixed
2015-03-17 10:15:19 +05:30
Pratik Vyas
7b4b31fdf7
Merge branch 'develop'
2015-03-16 21:38:30 +05:30
Pratik Vyas
ec25117ab0
bumped to version 4.24.1
2015-03-16 22:08:30 +06:00
Nabin Hait
dfa013e73f
Merge pull request #2962 from nabinhait/develop
...
manipulate_grand_total_for_inclusive_tax
2015-03-16 17:54:54 +05:30
Anand Doshi
5b73da99d6
[minor] fixed patch
2015-03-16 17:10:28 +05:30
Nabin Hait
f2791f8898
manipulate_grand_total_for_inclusive_tax
2015-03-16 17:01:09 +05:30
Nabin Hait
66773229a4
Merge pull request #2958 from anandpdoshi/anand-mar-13
...
manipulate grand total for inclusive tax
2015-03-16 15:58:23 +05:30
Anand Doshi
ead48094b6
manipulate diff only if diff <= 0.02
2015-03-13 18:59:01 +05:30
Anand Doshi
d6822ddd7c
manipulate grand total for inclusive tax
2015-03-13 18:23:10 +05:30
Anand Doshi
9d9e31f4e8
moved get_list_context to module
2015-03-13 12:48:05 +05:30
Pratik Vyas
2e5be6f994
Merge pull request #2955 from neilLasrado/v5.0
...
patch rename
2015-03-13 11:46:14 +05:30
Neil Trini Lasrado
14543169b4
patch rename
2015-03-13 11:43:52 +05:30
Nabin Hait
7c9d003917
Test case cleanup and fixes
2015-03-13 08:14:46 +05:30
Nabin Hait
c8c1d1c693
Test case fixes
2015-03-13 08:14:45 +05:30
Nabin Hait
15e4833785
Merge pull request #2943 from neilLasrado/time-log
...
bug fix - show time log in production order operations
2015-03-12 17:53:16 +05:30
Nabin Hait
53ea6fa686
Merge pull request #2944 from neilLasrado/po
...
fixes in Production Order
2015-03-12 17:52:59 +05:30
Nabin Hait
382d21fa3c
Merge pull request #2952 from neilLasrado/sales-person
...
validation added to check if multiple sales person have been given the s...
2015-03-12 17:52:40 +05:30
Neil Trini Lasrado
76d3a6c2ba
bug fix - show time log in production order operations
2015-03-12 17:51:50 +05:30
Neil Trini Lasrado
6f272f2f53
fixes in Production Order
2015-03-12 17:51:06 +05:30
Neil Trini Lasrado
c6dfb02e4a
mend
2015-03-12 16:15:36 +05:30
Neil Trini Lasrado
e7044fa0f6
validation added to check if multiple sales person have been given the same employee id
2015-03-12 16:15:03 +05:30
Nabin Hait
1ca0b74e03
Merge pull request #2945 from neilLasrado/workstation
...
warehouse removed from workstation master
2015-03-12 16:13:47 +05:30
Nabin Hait
9ac71c0b17
Merge pull request #2935 from neilLasrado/po-fix
...
Bug fixes in Production Order
2015-03-12 16:07:21 +05:30
Sambhaji Kolate
feff40a930
update get_batch_no query to sort batch with expiry date
...
small fix to avoid error msg if item_code not selected and batch_no is entered
2015-03-11 11:50:28 +05:30
Nabin Hait
4944fb33ce
Merge pull request #2942 from sbktechnology/develop
...
Added Actual Batch Qty for item in DN & SI
2015-03-11 10:22:47 +05:30
Anand Doshi
838ba02d34
setup wizard image fix
2015-03-10 19:15:49 +05:30
Sambhaji Kolate
845f1c636e
code cleanup
2015-03-10 15:19:29 +05:30
Neil Trini Lasrado
2c25a4396f
warehouse removed from workstation master
2015-03-10 15:15:54 +05:30
Sambhaji Kolate
98dbccd1d6
added actual_batch_qty at warehouse in DN & SI #1873
2015-03-10 15:04:28 +05:30
Pratik Vyas
7346ff3d08
Merge branch 'develop'
2015-03-10 10:41:35 +05:30
Pratik Vyas
21761c204c
bumped to version 4.24.0
2015-03-10 11:11:35 +06:00
Nabin Hait
87f3ba139e
Merge pull request #2936 from nabinhait/develop
...
Repost reserved qty and sle for sales invoice without warehouse
2015-03-09 18:50:46 +05:30
Nabin Hait
11498cac94
Repost sle for si without warehouse
2015-03-09 18:28:35 +05:30
Nabin Hait
7a31f6aaca
repost reserved qty if negative
2015-03-09 16:31:11 +05:30
Rushabh Mehta
f5f0d5a83a
[breadcrumbs] refactor
2015-03-09 15:48:16 +05:30
Anand Doshi
ecd2e0f386
Setup Wizard: catch duplicate entry error
2015-03-09 15:42:52 +05:30
Neil Trini Lasrado
42556dfab9
fixes-in-production-order
2015-03-09 15:35:24 +05:30
Nabin Hait
7d5a2390dd
Merge pull request #2934 from nabinhait/develop
...
Pricing Rule Issue
2015-03-09 15:31:37 +05:30
Nabin Hait
081c3ec476
c-form message issue
2015-03-09 15:11:34 +05:30
Nabin Hait
e2f054cc27
transaction date issue in pricing rule fixed
2015-03-09 14:54:37 +05:30
Pratik Vyas
6fbb25bf9d
update translations
2015-03-08 21:29:59 +05:30
Anand Doshi
c0eb8c0de3
Fixed some Stock Entry test cases
2015-03-08 12:42:18 +05:30
Anand Doshi
1119fb4c00
Fixed Sales Invoice test cases
2015-03-06 20:50:51 +05:30
Anand Doshi
e514323be4
load all js and css like before in desk.html
2015-03-06 13:17:26 +05:30
Anand Doshi
ec5ec60764
Fixed Test Cases
2015-03-05 19:31:40 +05:30
Rushabh Mehta
06a6bcce17
[fixes] pos, chart of accounts
2015-03-05 16:38:43 +05:30
Rushabh Mehta
c4dce99f4b
[fixes] pos #2830 , #2795
2015-03-05 15:09:04 +05:30
Rushabh Mehta
b888359b45
Merge pull request #2886 from neilLasrado/bom_test_records
...
text records fixed in bom
2015-03-05 10:57:33 +05:30
Nabin Hait
b50833a1e8
Fields alignment
2015-03-04 16:14:02 +05:30
Nabin Hait
95ff2d4fed
discount loss adjustment in base currency
2015-03-04 16:02:21 +05:30
Rushabh Mehta
31724da2d6
[print] item qty & uom on same line
2015-03-04 15:51:08 +05:30
Nabin Hait
25bd84dfcc
Discount amount loss adjustment if no taxes or discount applied on net total
2015-03-04 15:07:17 +05:30
Rushabh Mehta
0c677aa151
fix #2847
2015-03-04 12:32:59 +05:30
Nabin Hait
652c7db6e8
Stock entry fixes: incoming rate, toggle display of bom related fields
2015-03-03 18:33:34 +05:30
Nabin Hait
57a5c71663
Update rate in exploded_items on click of update cost btton
2015-03-03 18:27:21 +05:30
Rushabh Mehta
2cc585f180
[git fixes] salary manager, time log title, notificaitons
2015-03-03 16:06:54 +05:30
Rushabh Mehta
e693f794f5
[subcontract] refactor, make stock entry from PO
2015-03-03 15:50:24 +05:30
Nabin Hait
49ecbd7353
Sales invoice query in journal entry
2015-03-03 15:48:33 +05:30
Nabin Hait
56c6a65a22
argument name fix in sendmail
2015-03-03 15:48:33 +05:30
Nabin Hait
fcda00f317
Activity spelling correction
2015-03-03 15:48:33 +05:30
Nabin Hait
81b8d7597d
bom with operations activity
2015-03-03 15:48:33 +05:30
Anand Doshi
885e074697
Changed company name from Web Notes to Frappe Technologies
2015-03-03 14:56:43 +05:30
Nabin Hait
43ba7e1a30
allow negative stock issie fixed
2015-03-03 14:07:21 +05:30
Nabin Hait
786472279a
salary slip calculation: trigger on
2015-03-03 14:07:21 +05:30
Nabin Hait
c7aba3331b
verified chart of accounts
2015-03-03 14:07:21 +05:30
Rushabh Mehta
1758357a0a
[item] toggle reqd, fixes #2832
2015-03-03 11:08:22 +05:30
Pratik Vyas
593d56265f
update translations
2015-03-02 19:11:14 +05:30
Rushabh Mehta
c37281e59c
Merge pull request #2897 from neilLasrado/job-application
...
job application fixed
2015-03-02 19:01:16 +05:30
Neil Trini Lasrado
96bc31db27
job application fixed
2015-03-02 18:54:45 +05:30
Rushabh Mehta
910ba02f49
Merge pull request #2896 from neilLasrado/employee-report
...
employee information report fix
2015-03-02 18:31:47 +05:30
Rushabh Mehta
9bb42359d8
Merge pull request #2895 from neilLasrado/appraisal
...
Fixes in Appraisal doc
2015-03-02 18:30:52 +05:30
Rushabh Mehta
c33a81c536
[production order] from_bom issue fixes #2879
2015-03-02 18:27:03 +05:30
Rushabh Mehta
b83fa3bc2d
[pos] [barcode] fixes #2831
2015-03-02 18:25:14 +05:30
Neil Trini Lasrado
71a651ec21
employee information report fix
2015-03-02 18:13:25 +05:30
Neil Trini Lasrado
fd0920fe83
Fixes in Appraisal doc
2015-03-02 17:33:48 +05:30
Rushabh Mehta
8c84fca182
[fix] #2875
2015-03-02 16:29:56 +05:30
Rushabh Mehta
3384cb7e63
[fix] #2836
2015-03-02 16:20:23 +05:30
Rushabh Mehta
00e3b26597
[fix] rename tool #2861
2015-03-02 15:05:36 +05:30
Rushabh Mehta
905f8328ab
cleanup global defaults, fix #2838 :
2015-03-02 13:01:39 +05:30
Neil Trini Lasrado
5cbd12e4e5
text records fixed in bom
2015-03-02 10:53:12 +05:30
Anand Doshi
16018dd474
removed erpnext splash
2015-03-01 21:16:44 +05:30
Nabin Hait
86cd4cc739
discount related fix
2015-02-28 19:12:55 +05:30
Nabin Hait
bc6c360bf1
Update accounts_controller.py
2015-02-27 23:40:56 +05:30
Nabin Hait
ad7ece63fe
Update sales_invoice.py
2015-02-27 22:45:28 +05:30
Nabin Hait
b7ae9b4283
Merge pull request #2866 from neilLasrado/barcode
...
Barcode added to stock entry
2015-02-27 11:35:07 +05:30
Anand Doshi
8f9e631a44
minor fixes
2015-02-26 20:29:43 +05:30
Pratik Vyas
7e98eb3ab7
Merge branch 'develop'
2015-02-26 14:46:43 +05:30
Pratik Vyas
8462f4ad2c
bumped to version 4.23.0
2015-02-26 15:16:43 +06:00
Pratik Vyas
add4c96280
Merge pull request #2871 from anandpdoshi/anand-feb-26
...
Fixes in queries and translations
2015-02-26 14:43:27 +05:30
Anand Doshi
45b5da0826
[translations] removed translations that have missing placeholders like {0}
2015-02-26 13:34:24 +05:30
Pratik Vyas
dc24d0151c
Merge branch 'develop'
2015-02-26 13:27:41 +05:30
Pratik Vyas
c452b4b7cc
bumped to version 4.22.2
2015-02-26 13:57:41 +06:00
Anand Doshi
335763da49
updated translations
2015-02-26 13:20:15 +05:30
Anand Doshi
5bd8cfd9fe
[fix] queries
2015-02-26 12:40:58 +05:30
Nabin Hait
851c745fdf
Merge branch 'develop' of https://github.com/frappe/erpnext into v5.0
2015-02-26 12:32:04 +05:30
Nabin Hait
8be6939288
help description for party account
2015-02-26 12:31:07 +05:30
Nabin Hait
2ed025e62d
Merge pull request #2870 from nabinhait/fix1
...
Fixes
2015-02-26 11:41:10 +05:30
Nabin Hait
836f9f34e4
warehouse mandatory in sales invoice if update_stock
2015-02-26 11:40:20 +05:30
Nabin Hait
98a8fae7c2
hotfix for fetching default account and warehouse
2015-02-26 11:37:07 +05:30
Neil Trini Lasrado
4374692cf5
fixes
2015-02-25 19:01:17 +05:30
Neil Trini Lasrado
4abda67a98
Barcode added to stock entry
2015-02-25 19:01:17 +05:30
Anand Doshi
e474aa5d91
[minor] Product grid text-ellipsis
2015-02-25 18:52:22 +05:30
Nabin Hait
69d874e7d7
Merge pull request #2864 from neilLasrado/delivery-note
...
Delivery note - Batch Id made Link Feild
2015-02-25 18:37:17 +05:30
Nabin Hait
690f8b9323
Merge pull request #2868 from nabinhait/fix1
...
fix in financial statements
2015-02-25 18:35:09 +05:30
Nabin Hait
79ffc2b3a7
fix in financial statements
2015-02-25 18:32:25 +05:30
Rushabh Mehta
a8a2fb225d
[fixes] item, test site install
2015-02-25 17:32:22 +05:30
Rushabh Mehta
66a92792b4
[fix] default account for manufacturing stock entry should be cogs
2015-02-25 17:15:45 +05:30
Rushabh Mehta
8f62e2448c
[fix] patches
2015-02-25 16:28:33 +05:30
Rushabh Mehta
6cdfd1e976
[fix] patches
2015-02-25 15:55:57 +05:30
Rushabh Mehta
2a21bc9fc2
[taxes and charges] refactor
2015-02-25 15:08:57 +05:30
Rushabh Mehta
e91388381c
[minor] notifications and other fixes to stock
2015-02-25 15:08:57 +05:30
Anand Doshi
d75ef108fc
Allow user to change page_name in Item and Item Group #2397
2015-02-25 13:50:14 +05:30
Neil Trini Lasrado
b9ff7186ed
batch field changed to link feild in packed_item
2015-02-25 12:44:45 +05:30
Anand Doshi
28d21ba3c0
[minor] fix build.json
2015-02-24 22:28:26 +05:30
Anand Doshi
d35354cc06
Merge remote-tracking branch 'frappe/develop' into v5.0
...
Conflicts:
erpnext/__version__.py
erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py
erpnext/hooks.py
erpnext/patches.txt
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
erpnext/stock/get_item_details.py
erpnext/translations/ar.csv
erpnext/translations/bs.csv
erpnext/translations/ca.csv
erpnext/translations/el.csv
erpnext/translations/es.csv
erpnext/translations/fr.csv
erpnext/translations/hr.csv
erpnext/translations/id.csv
erpnext/translations/is.csv
erpnext/translations/ja.csv
erpnext/translations/nl.csv
erpnext/translations/pl.csv
erpnext/translations/pt-BR.csv
erpnext/translations/ru.csv
erpnext/translations/tr.csv
erpnext/translations/zh-cn.csv
erpnext/translations/zh-tw.csv
setup.py
2015-02-24 18:12:17 +05:30
Anand Doshi
da858cc587
Website Product Image
2015-02-24 17:52:09 +05:30
Nabin Hait
93b3a37a3b
rounding issue and rate trigger
2015-02-24 17:08:51 +05:30
Rushabh Mehta
b620fed762
[fixes] [minor]
2015-02-24 16:51:22 +05:30
Nabin Hait
7ce2f55ca9
print_hide for total_taxes_and_charges in buying
2015-02-24 16:06:14 +05:30
Nabin Hait
72c359afa2
valuation type charges can not be inclusive
2015-02-24 16:05:19 +05:30
Nabin Hait
903c42a130
multiplefixes
2015-02-24 15:24:49 +05:30
Rushabh Mehta
99d0941008
[time logs] fixes
2015-02-24 14:48:11 +05:30
Nabin Hait
9524ee7ec6
tax amount in print
2015-02-24 14:43:14 +05:30
Anand Doshi
13b3b070e3
Merge pull request #2843 from anandpdoshi/anand-feb-24
...
[fix] Added unicode_literals if missing in py files
2015-02-24 14:16:05 +05:30
Nabin Hait
d5616cd977
reload journal entry on patch
2015-02-24 13:12:13 +05:30
Nabin Hait
b923f8a78b
project milestone patch fix
2015-02-24 13:05:49 +05:30
Nabin Hait
20256fa716
Merge pull request #2842 from nabinhait/foreign_currency_calc
...
Foreign currency calc
2015-02-24 12:56:57 +05:30
Anand Doshi
2878cc7757
[fix] get bom items query
2015-02-24 12:39:42 +05:30
Anand Doshi
d57e793bf3
[fix] Added unicode_literals if missing in py files
2015-02-24 12:24:53 +05:30
Nabin Hait
7b19b9ed02
minor fixes
2015-02-24 10:04:00 +05:30
Nabin Hait
6dfbc2465b
Patch: taxes and totals in party currency
2015-02-24 10:04:00 +05:30
Nabin Hait
82e3e25cdb
fixes for base_rate, base_amount, tax_amount: mass search and replace
2015-02-24 10:02:28 +05:30
Nabin Hait
37b047d9a8
Fields added in all sales and purchase doctypes
2015-02-24 10:02:28 +05:30
Nabin Hait
613d081a60
Validate taxes and charges input, commonified
2015-02-24 10:02:28 +05:30
Nabin Hait
34afcfb4a1
Print without amount in delivery note
2015-02-24 10:02:27 +05:30
Nabin Hait
e9eec93be7
minor fix
2015-02-24 10:02:27 +05:30
Nabin Hait
f0bc9b6d3a
Renamed Net total to Total and dynamic label
2015-02-24 10:02:27 +05:30
Nabin Hait
755ff60313
tax amount conversion in client side printing
2015-02-24 10:02:27 +05:30
Nabin Hait
de9c8a9028
discount calculation and in print view
2015-02-24 10:02:27 +05:30
Nabin Hait
2b019ed430
Fixes for discount amount
2015-02-24 10:02:27 +05:30
Nabin Hait
ce24512ed7
Commonified sales/purchase taxes and charges master.js code
2015-02-24 10:02:27 +05:30
Nabin Hait
e7679703cf
Taxes and totals calculation in party currency
2015-02-24 10:02:27 +05:30
Pratik Vyas
81d96fdb60
Merge pull request #2839 from pdvyas/v5-lang
...
update translations and patch to new format
2015-02-23 23:51:29 +05:30
Anand Doshi
f9fc04ce8e
Website Listing
2015-02-23 22:34:27 +05:30
Rushabh Mehta
a1da88a3d3
[capacity planning] automatically plan Time Logs from Production Order
2015-02-23 20:18:38 +05:30
Rushabh Mehta
93b2f167f8
[fixes] opportunity, task minor
2015-02-23 14:43:16 +05:30
Rushabh Mehta
281dc5d639
[patch] added item patch
2015-02-23 14:43:15 +05:30
Rushabh Mehta
d06c1188a0
[item] patches
2015-02-23 14:43:15 +05:30
Rushabh Mehta
d54031f3b5
[tests] [projects] merged tasks and projects and added quick edit of tasks from projects
2015-02-22 22:32:39 +05:30
Rushabh Mehta
65a2759432
[minor] opportunity / item
2015-02-21 17:35:50 +05:30
Rushabh Mehta
7bbbda162c
[warranty claim] ux - serial no on top
2015-02-21 14:49:17 +05:30
Rushabh Mehta
364054a6fc
[fix] payment tool #2791
2015-02-21 14:39:35 +05:30
Rushabh Mehta
e8a37949cf
[issue fixes] + added fixtures for item attribute and operation
2015-02-20 20:10:11 +05:30
Rushabh Mehta
e9b3092167
Merge pull request #2805 from frappe/pdvyas-patch-1
...
Update transaction_base.py
2015-02-20 16:23:36 +05:30
Pratik Vyas
7f9489e814
Update transaction_base.py
2015-02-20 16:22:24 +05:30
Rushabh Mehta
813f0eda05
[form] section labels
2015-02-20 16:02:48 +05:30
Rushabh Mehta
bcccfa09f2
[patch] [fix]
2015-02-20 15:28:50 +05:30
Pratik Vyas
62ab126ca9
update translations and patch to new format
2015-02-20 15:20:37 +05:30
Rushabh Mehta
dc93e0adc6
[fixes] stock reco
2015-02-20 15:11:56 +05:30
Nabin Hait
4d32afde30
Merge pull request #2804 from nabinhait/fix1
...
update stock uom in sle for DN
2015-02-20 14:24:52 +05:30
Nabin Hait
ad3fd5166b
update stock uo in sle for DN
2015-02-20 14:23:58 +05:30
Nabin Hait
010657145d
Merge pull request #2803 from sbktechnology/develop
...
fixed stock_balance report for stock_uom #2802
2015-02-20 14:14:14 +05:30
Sambhaji Kolate
973f78e7d3
fixed stock_balance report for stock_uom and stock ledger entry for Delivery Note #2802
2015-02-20 13:09:39 +05:30
Rushabh Mehta
d51a47155b
[fixed] #2614
2015-02-20 10:39:39 +05:30
Rushabh Mehta
50dc4e90e3
[cleanup] item grid views, removed desc etc
2015-02-19 20:05:45 +05:30
Rushabh Mehta
c7a11cc451
[usability] [fixes] stock entry and production order
2015-02-19 16:28:35 +05:30
Rushabh Mehta
d60acb9f26
[fixes] production, added qty transferred, fix gantt, fiscal year (set fiscal year, instead of validation
2015-02-19 14:53:31 +05:30
Nabin Hait
3fa7cc524b
Update sales_order_item.json
2015-02-18 21:11:45 +05:30
Nabin Hait
743f9664fc
Merge pull request #2785 from neilLasrado/kill-html-desc
...
patch fixes
2015-02-18 20:51:48 +05:30
Neil Trini Lasrado
ae3f4f363f
patch renamed
2015-02-18 20:48:26 +05:30
Neil Trini Lasrado
e9d45bcb28
patch fixes
2015-02-18 20:25:44 +05:30
Rushabh Mehta
8bb6e530c7
[fixes] accounts, stock changes
2015-02-18 20:22:59 +05:30
Rushabh Mehta
614e7ab757
[cleanup] SMS, and added item filter in stock balance
2015-02-18 19:51:48 +05:30
Rushabh Mehta
4ea1ade7b9
[hub] start
2015-02-18 19:09:56 +05:30
Nabin Hait
9252002249
Update taxes_and_totals.py
2015-02-18 18:48:30 +05:30
Nabin Hait
89c050e67d
removed print
2015-02-18 16:19:07 +05:30
Nabin Hait
8626d3881d
fixed renaming patch
2015-02-18 15:10:29 +05:30
Nabin Hait
06fd10620e
Merge pull request #2734 from neilLasrado/kill-html-desc
...
Kill html desc -WIP
2015-02-18 13:13:52 +05:30
Nabin Hait
5fd1727acd
Merge pull request #2752 from neilLasrado/stock-amount
...
client side - recalculate amount and total amount on change of qty or va...
2015-02-18 13:11:41 +05:30
Nabin Hait
9f89df341d
Merge pull request #2770 from neilLasrado/time-log
...
Validate renaming of activity type - manufacturing
2015-02-18 13:11:19 +05:30
Neil Trini Lasrado
e20057894e
Activity Type - permissions changed for users with system manager role
2015-02-18 13:06:12 +05:30
Neil Trini Lasrado
b091707ae8
Validate renaming of activity type - manufacturing
2015-02-18 13:00:56 +05:30
Neil Trini Lasrado
42e42b7647
fixes in patch
2015-02-18 12:33:53 +05:30
Neil Trini Lasrado
d98c4e007b
patch
2015-02-18 12:33:53 +05:30
Neil Trini Lasrado
d8b35639d8
image feild made hidden
2015-02-18 12:33:53 +05:30
Neil Trini Lasrado
7f70367dde
image view fixed for stock entry and bom
2015-02-18 12:33:19 +05:30
Neil Trini Lasrado
3361df709c
Image field and view added to all stock doctypes
2015-02-18 12:33:19 +05:30
Neil Trini Lasrado
6f51c2e4cc
Image field and view added to all buying doctypes
2015-02-18 12:33:19 +05:30
Neil Trini Lasrado
c48f06c095
Image field and view added to all selling doctypes
2015-02-18 12:33:19 +05:30
Neil Trini Lasrado
66df3566a9
html item desc removed from item master, item image added in oppurtunity
2015-02-18 12:32:37 +05:30
Nabin Hait
9f138b21fa
Merge branch 'foreign_currency_calc' into v5.0
2015-02-18 12:25:06 +05:30
Nabin Hait
7c28fc4014
Merge branch 'v5.0' of https://github.com/frappe/erpnext into v5.0
2015-02-18 12:24:49 +05:30
Nabin Hait
fe81da2dd1
listview indicator fix
2015-02-18 12:23:18 +05:30
Neil Trini Lasrado
b2c521847e
fixes
2015-02-18 12:07:09 +05:30
Nabin Hait
da5f766dd5
fixed conflict
2015-02-18 11:55:13 +05:30
Nabin Hait
b120520aa8
fixed patches
2015-02-18 11:54:08 +05:30
Neil Trini Lasrado
3efc6ab94d
fixes
2015-02-18 11:51:09 +05:30
Neil Trini Lasrado
9aafe76f63
client side - recalculate amount and total amount on change of qty or valuation reate of the item
2015-02-18 11:51:09 +05:30
Rushabh Mehta
2e0e711eb2
[minor] stock_ledger_entry.py
2015-02-18 11:38:48 +05:30
Nabin Hait
e55def23af
Merge pull request #2745 from neilLasrado/time-log
...
activity type fixes
2015-02-18 11:21:25 +05:30
Nabin Hait
d81e73e067
Merge pull request #2747 from neilLasrado/warehouse-filter
...
filters added to warehouses in prod order
2015-02-18 11:19:42 +05:30
Nabin Hait
1af9ac826c
Merge pull request #2763 from neilLasrado/production-planning-tool
...
fixes for capacity planning using production planning tool
2015-02-18 11:15:58 +05:30
Rushabh Mehta
df9e80c87a
[refactor] stock entry, minor ux
2015-02-17 19:56:04 +05:30
Rushabh Mehta
0fb678e7cf
[stock reco] cleanups
2015-02-17 19:56:04 +05:30
Anand Doshi
8c0f05fbae
[minor] grid report loading
2015-02-17 19:53:23 +05:30
Neil Trini Lasrado
7182d349df
fixes for capacity planning using production planning tool
2015-02-17 16:19:41 +05:30
Neil Trini Lasrado
744aec8def
activity type fixs
2015-02-17 16:12:32 +05:30
Neil Trini Lasrado
b13c4e2516
filters added to warehouses in prod order
2015-02-17 16:07:37 +05:30
Pratik Vyas
5aa465ae44
Merge branch 'develop'
2015-02-17 16:02:58 +05:30
Pratik Vyas
28777bf693
bumped to version 4.22.1
2015-02-17 16:32:58 +06:00
Anand Doshi
a6c361c00e
Setup Wizard: Load number format based on currency #2627 , login as first user on setup complete
2015-02-17 15:56:31 +05:30
Anand Doshi
0fe854692d
[fix] add CRM module to user desktop items in patch
2015-02-17 14:45:36 +05:30
Nabin Hait
7945195478
Merge pull request #2761 from neilLasrado/update-finished-goods-fix
...
Update finished goods fix
2015-02-17 14:21:41 +05:30
Nabin Hait
8dd0e9db15
Merge pull request #2759 from neilLasrado/prod-workstation
...
workstation and operation time made editable in production order.
2015-02-17 14:21:24 +05:30
Nabin Hait
13e6ac737f
Merge pull request #2748 from neilLasrado/get-prod-order
...
fixes in stock entry
2015-02-17 14:12:00 +05:30
Nabin Hait
44454cb81b
Merge pull request #2744 from neilLasrado/operation-time
...
operation time made mandatory in bom operations
2015-02-17 14:08:55 +05:30
Nabin Hait
133b7ed218
Merge pull request #2743 from neilLasrado/price-list
...
Price list name made - 'no copy'
2015-02-17 14:08:18 +05:30
Nabin Hait
cdb8e374e3
Merge pull request #2727 from neilLasrado/voucher-type
...
journal entry - accounts table cannot be blank - validation added
2015-02-17 14:07:44 +05:30
Nabin Hait
2fbafab4b2
Merge pull request #2764 from nabinhait/fix1
...
Fetch default accounts, cost center only if company matches with the tra...
2015-02-17 14:07:14 +05:30
Nabin Hait
7d845502a0
Merge branch 'foreign_currency_calc' into v5.0
2015-02-17 12:51:54 +05:30
Nabin Hait
bd00e81ad5
Commonified taxes and totals calculation in server side
2015-02-17 12:50:51 +05:30
Rushabh Mehta
2712e36f08
[stock reco] added items table
2015-02-17 12:50:20 +05:30
Rushabh Mehta
06072c1e51
[refactor] Material Transfer for Manufacture
2015-02-17 11:50:45 +05:30
Nabin Hait
6f0a3ed8d4
fixed conflict
2015-02-17 11:12:04 +05:30
Nabin Hait
3237c75d98
Commonified taxes and totals calculation in server side
2015-02-17 11:11:11 +05:30
Rushabh Mehta
46e03eadca
[rename] Customer Issue -> Warranty Claim
2015-02-17 10:45:50 +05:30
Rushabh Mehta
60cfccbf77
[new-module] crm
2015-02-17 10:36:54 +05:30
Nabin Hait
b09ed41c52
Fetch default accounts, cost center only if company matches with the transactions
2015-02-17 10:34:17 +05:30
Rushabh Mehta
36b84408a8
[fixes] precision in purchase receipt and item group route
2015-02-16 18:26:38 +05:30
Neil Trini Lasrado
35898d7518
Update finished goods fix
2015-02-16 17:25:28 +05:30
Neil Trini Lasrado
f120aec9c2
workstation and operation time made editable in production order. Cost recalculation logic added
2015-02-16 15:10:29 +05:30
Rushabh Mehta
7a64cb2aa5
[bom] [fix] company link
2015-02-13 16:11:25 +05:30
Neil Trini Lasrado
4d4c643b7e
fixes in stock entry
2015-02-13 13:09:17 +05:30
Rushabh Mehta
6efbc9dacd
[event] share with user
2015-02-13 10:17:13 +05:30
Anand Doshi
c82331bc19
[design] Setup Wizard
2015-02-12 20:02:17 +05:30
Nabin Hait
188f69a713
commonified totals calculation in js
2015-02-12 17:55:50 +05:30
Neil Trini Lasrado
06f712dcd7
operation time made mandatory in bom operations
2015-02-12 17:52:46 +05:30
Neil Trini Lasrado
62885b3c56
Price list name made -no copy
2015-02-12 17:41:20 +05:30
Nabin Hait
5690be103c
Replaced renamed total fields in code files
2015-02-12 16:09:11 +05:30
Nabin Hait
dd1c2d3018
Merge branch 'v5.0' of https://github.com/frappe/erpnext into foreign_currency_calc
2015-02-12 13:31:48 +05:30
Nabin Hait
4a149c0791
Chart of accounts cleanup for Nicaragua
2015-02-12 12:39:32 +05:30
Nabin Hait
031303d719
Replace renamed fields in custom script and custom print formats
2015-02-12 11:48:50 +05:30
Nabin Hait
56e6ad2112
Patch for renamed total fields
2015-02-12 11:48:20 +05:30
Nabin Hait
461ee2ebae
Renamed total fields
2015-02-12 11:47:45 +05:30
Nabin Hait
0c0749a884
Merge pull request #2721 from williamjmorenor/v5.0
...
Add chart of accounts template for Nicaragua
2015-02-12 11:46:43 +05:30
William Moreno
5b72e21186
Final Fixing
...
I will no make other changes, please can chech the JSON
2015-02-11 16:57:43 -06:00
William Moreno
a05e6df3f5
Minor Fix
2015-02-11 15:48:41 -06:00
William Moreno
dab1db9874
Minor Fix
2015-02-11 15:43:40 -06:00
William Moreno
8e5e414276
Minor fix
2015-02-11 15:38:27 -06:00
William Moreno
92774e4743
Minor fix
2015-02-11 15:36:14 -06:00
William Moreno
c3d79305f6
Merge pull request #1 from williamjmorenor/ni_ni_chart_of_account
...
ni_ni_chart_template.json
* Fix missing Comma (,)
* Change Style => TITLE to Title
* Rearrange accounts to improve readability
* Best IFRS for SMES compatibility
* Best accounts tax details
* Validate JSON
* Add root_type and account_type
2015-02-11 15:11:37 -06:00
William Moreno
c2037c5444
Add root_type and account_type
2015-02-11 15:06:58 -06:00
William Moreno
0a582ec885
Validate JSON
2015-02-11 12:41:11 -06:00
William Moreno
df023bd8ad
Best accounts tax details
2015-02-11 12:38:51 -06:00
William Moreno
f2bf17f2e2
Best IFRS for SMES compatibility
2015-02-11 12:06:40 -06:00
William Moreno
43d39f8e4d
Best IFRS for SMES compatibility
2015-02-11 11:57:22 -06:00
William Moreno
6b34bca7d0
Best IFRS for SMES compatibility
2015-02-11 11:53:45 -06:00
William Moreno
6fd091d979
Rearrange accounts to improve readability
2015-02-11 09:36:03 -06:00
William Moreno
7d7113328d
Change Style => TITLE to Title
2015-02-11 09:22:55 -06:00
William Moreno
1caea2ebae
Fix missing Comma (,)
...
Yes, I did not validate the last edit to the JSON before commit, sorry
2015-02-11 07:39:23 -06:00
Neil Trini Lasrado
802d717a9e
fixes
2015-02-11 17:27:58 +05:30
Neil Trini Lasrado
934d63de16
journal entry - accounts table cannot be blank - validation added
2015-02-11 17:05:41 +05:30
Nabin Hait
ceb04726c8
Merge pull request #2725 from neilLasrado/workstation-operation-hours
...
Workstation Doc Fixed
2015-02-11 16:52:26 +05:30
Nabin Hait
27a1f20135
Merge pull request #2724 from neilLasrado/planned-start-date
...
validations added to production order
2015-02-11 16:51:39 +05:30
Nabin Hait
ff23936584
Merge pull request #2728 from neilLasrado/patch-fixed
...
landed cost voucher fix
2015-02-11 16:51:02 +05:30
Neil Trini Lasrado
daaf5814fa
landed cost voucher fix
2015-02-11 16:23:46 +05:30
Neil Trini Lasrado
8521558f40
Workstation Doc Fixed
2015-02-11 14:58:43 +05:30
Neil Trini Lasrado
87402df56a
validations added to production order
2015-02-11 14:35:52 +05:30
Nabin Hait
7945712171
Merge branch 'v5.0' of https://github.com/frappe/erpnext into foreign_currency_calc
2015-02-11 12:55:10 +05:30
William Moreno
ad45007362
Add chart of accounts template for Nicaragua
...
On branch v5.0
new file: erpnext/accounts/doctype/account/chart_of_accounts/ni_ni_chart_template.json
2015-02-10 23:57:24 -06:00
Nabin Hait
8fa503e177
Fixed conflict while merging v4 into v5
2015-02-10 16:44:00 +05:30
Nabin Hait
15cd12214e
Fixed conflict while merging v4 into v5
2015-02-10 16:37:18 +05:30
Anand Doshi
6dfd430a2f
Moved flags like ignore_mandatory, ignore_validate etc to doc.flags
2015-02-10 14:41:27 +05:30
Nabin Hait
2813f38c5a
Merge pull request #2695 from neilLasrado/bom-item-desc
...
Update BOM Item Description
2015-02-06 16:20:05 +05:30
Neil Trini Lasrado
845be908d6
function moved to validate
2015-02-06 16:15:45 +05:30
Neil Trini Lasrado
8fd3828ef5
Update Item Desc Button Removed from BOM, Item desc automatically updated in BOM on save of item master
2015-02-06 16:09:55 +05:30
Nabin Hait
4e95d67477
Merge pull request #2679 from neilLasrado/time-log-fix
...
Time log fix
2015-02-06 16:09:36 +05:30
Neil Trini Lasrado
11cd4f6c30
time log activity type made mandatory, new activity type manufacturing created
2015-02-06 16:06:45 +05:30
Neil Trini Lasrado
07a0d250ed
time log fixes
2015-02-06 16:06:14 +05:30
Neil Trini Lasrado
b744e16a83
Activity made compulsory for time_log_type Project
2015-02-06 16:05:34 +05:30
Neil Trini Lasrado
93638bd179
Time Log -
...
Project made compulsory for time logs with time_log_for selected as 'Project'
Activity Type Madetory criteria removed
Compleated Quantity hidden if time_log_for is not set as Manufacturing
2015-02-06 16:05:34 +05:30
Nabin Hait
e7cf961eaa
Merge pull request #2690 from neilLasrado/opportunity-status
...
fixes for #2655
2015-02-06 16:04:42 +05:30
Nabin Hait
4ed51416e5
Merge pull request #2656 from neilLasrado/po-capacity-planning
...
fixes for production order
2015-02-06 16:04:08 +05:30
Neil Trini Lasrado
47a62c623c
fixes for #2655
2015-02-06 15:51:20 +05:30
Anand Doshi
e241569303
Allow non-english characters in Naming Series
2015-02-06 12:56:26 +05:30
Anand Doshi
9b30a8626c
[minor] removed default filters for sales order and material request, fixed pos css
2015-02-06 12:30:08 +05:30
Rushabh Mehta
a232c80d77
[share] add share permission
2015-02-05 15:52:58 +05:30
Anand Doshi
dd942bb3d2
[minor] fixed update item name in bom patch, removed filter from sales invoice list, show tax calculation only if tax exists
2015-02-04 18:53:24 +05:30
Rushabh Mehta
0e13221338
[print] item tables - override description and uom
2015-02-04 17:02:24 +05:30
Neil Trini Lasrado
59a706585c
actual start and end date made blank if islocal
2015-02-04 11:44:24 +05:30
Neil Trini Lasrado
de164c91e0
actual start and end date calculation - call moved to submit and cancel of Time Log
2015-02-04 11:35:10 +05:30
Neil Trini Lasrado
2017796de7
fixes in auto create time logs
2015-02-04 11:16:49 +05:30
Neil Trini Lasrado
a9b3ec180e
fixes for productiojn order
2015-02-04 11:16:49 +05:30
Rushabh Mehta
b736443e3f
[patch] [fix]
2015-02-04 10:40:02 +05:30
Nabin Hait
279bb6f3ed
Merge pull request #2628 from neilLasrado/batch-validation
...
Batch Validation
2015-02-03 18:33:49 +05:30
Nabin Hait
1f9c6fdcf3
Merge pull request #2605 from neilLasrado/bom-costs
...
Bom operations and item link removed.
2015-02-03 18:31:56 +05:30
Neil Trini Lasrado
14e24a947b
fixes for batch validations
2015-02-03 18:23:46 +05:30
Neil Trini Lasrado
9448aaf2a6
validation added in stock entry
2015-02-03 18:09:56 +05:30
Neil Trini Lasrado
acbf185c1e
fixes
2015-02-03 18:07:34 +05:30
Neil Trini Lasrado
c8c67f7807
Bom operations and item link removed. Cost recalculated on removal of operation or rew material row.
2015-02-03 18:07:34 +05:30
Nabin Hait
44c0a741d1
Merge pull request #2672 from neilLasrado/batch-list-view
...
batch list view fix
2015-02-03 18:01:53 +05:30
Nabin Hait
c0c9023d27
Merge pull request #2653 from neilLasrado/bom-validations
...
Validations added to Bom Doctype.
2015-02-03 18:01:31 +05:30
Nabin Hait
bdc72e7e8b
Merge pull request #2613 from neilLasrado/bom-item-name
...
item name added to BOM
2015-02-03 18:01:10 +05:30
Rushabh Mehta
c567e8e960
[fix] analytics reports + remove print item tables #2667
2015-02-03 17:56:25 +05:30
Neil Trini Lasrado
75e0f0a153
batch list view fix:
2015-02-03 17:41:11 +05:30
Neil Trini Lasrado
9257baa747
fixes in bom validations
2015-02-03 12:29:36 +05:30
Neil Trini Lasrado
f5be350eb4
Validations added to Bom Doctype.
2015-02-03 12:21:46 +05:30
Neil Trini Lasrado
7dac750ffe
patch fix
2015-02-03 10:59:40 +05:30
Neil Trini Lasrado
41acbff959
item name added to BOM
2015-02-03 10:59:40 +05:30
Nabin Hait
d2b762d760
Merge pull request #2617 from neilLasrado/sales-order
...
sales order - allow same item to enter multiple times. Throws warning
2015-02-02 16:44:12 +05:30
Nabin Hait
7e333c6a31
Merge pull request #2596 from neilLasrado/item-in-bom
...
allow bom field removed from Item Master
2015-02-02 16:33:46 +05:30
Nabin Hait
4b4598e5cb
Merge pull request #2594 from neilLasrado/bom-item-update
...
bom - button added to update item desc.
2015-02-02 16:30:58 +05:30
Rushabh Mehta
052bd624c1
[minor] removed company description and don't call apply_price_list if no items
2015-01-30 16:57:24 +05:30
Anand Doshi
aff9a59f2d
[minor] removed pscript from Feature Setup, made Activity Type as mandator in Time Log
2015-01-29 19:49:34 +05:30
Rushabh Mehta
06fa46fafe
[fix] onshow > on_page_show
2015-01-29 18:09:11 +05:30
Nabin Hait
538253e503
removed test files for purchase taxes and charges master
2015-01-23 17:47:44 +05:30
Nabin Hait
ecce5141eb
replaced budget distribution
2015-01-23 16:32:35 +05:30
Nabin Hait
d41f3c1f5e
All the calculations in taxes_and_totals file
2015-01-23 16:24:49 +05:30
Rushabh Mehta
5bceebc6a1
[fix] fixes birthday reminders #2021
2015-01-23 15:22:30 +05:30
Nabin Hait
b4a3dfa893
All the calculations in taxes_and_totals file
2015-01-22 17:13:13 +05:30
Nabin Hait
0c8bde5805
Merge branch 'v5.0' into foreign_currency_calc
2015-01-22 12:15:06 +05:30
Anand Doshi
88a1515b46
[minor] ERPNext as navbar-home
2015-01-21 18:25:04 +05:30
Nabin Hait
963393409e
minor fix: child table length
2015-01-21 17:22:11 +05:30
Nabin Hait
0a3e5653ba
bank reconciliation fix
2015-01-21 16:40:47 +05:30
Neil Trini Lasrado
f108c2df72
sales order - allow same item to enter multiple times. Throws warning
2015-01-21 14:33:49 +05:30
Rushabh Mehta
71a6b93d89
[cleanups]
2015-01-19 17:35:05 +05:30
Rushabh Mehta
81e972eac4
[cleanups]
2015-01-19 17:34:54 +05:30
Neil Trini Lasrado
26b01f7852
fixes
2015-01-19 17:18:43 +05:30
Neil Trini Lasrado
f1f0a8ac19
bom - button added to update item desc.
2015-01-19 17:11:32 +05:30
Neil Trini Lasrado
c784fa219b
commit
2015-01-19 17:05:05 +05:30
Neil Trini Lasrado
f37a5ddff5
allow bom field removed from Item Master
2015-01-19 17:05:05 +05:30
Anand Doshi
938ed1a57d
[minor] fixed patch update_companywise_payment_account
2015-01-19 16:20:26 +05:30
Anand Doshi
f02e142d5d
[design] mobile
2015-01-19 15:59:45 +05:30
Anand Doshi
b942cb86ae
[minor] auto-create Fiscal Year, loading, general ledger
2015-01-19 15:59:45 +05:30
Nabin Hait
5031f90ac1
bank reconciliation fix
2015-01-19 14:51:21 +05:30
Pratik Vyas
4ab09fab11
Update .travis.yml
2015-01-19 14:36:32 +05:30
Nabin Hait
cff8993478
Merge pull request #2572 from neilLasrado/credit-note
...
journal entry linked with Stock Entry
2015-01-19 14:26:58 +05:30
Nabin Hait
9ef2e78905
Merge pull request #2553 from neilLasrado/mode-of-payment
...
mode of payment - company wise default account added
2015-01-19 14:26:00 +05:30
Nabin Hait
dd4617d30f
Opportunity From field is mandatory
2015-01-16 15:08:00 +05:30
Rushabh Mehta
0335005eea
[minor] added allow rename
2015-01-15 15:29:22 +05:30
Nabin Hait
239c2c327c
Hide currency and price list section after submission
2015-01-15 14:22:04 +05:30
Nabin Hait
45a5d52a2a
minor changes in packing slip
2015-01-15 14:22:04 +05:30
Rushabh Mehta
5293aa7ca0
[ui] setup wizard
2015-01-15 12:07:02 +05:30
Nabin Hait
fff3ab752c
Fixed conflict
2015-01-14 16:27:13 +05:30
Neil Trini Lasrado
f2b1f2658d
patch fix
2015-01-14 12:06:20 +05:30
Neil Trini Lasrado
bd2ac2f51f
mode of payment - company wise default account added
2015-01-14 12:00:17 +05:30
Neil Trini Lasrado
9235c6d65a
update stock_entry.py
2015-01-14 11:54:55 +05:30
Neil Trini Lasrado
50763d58ce
frappe.db.exist used
2015-01-14 11:54:55 +05:30
Neil Trini Lasrado
adfdd6f83c
journal entry linked and validation added
2015-01-14 11:54:55 +05:30
Nabin Hait
0bcf3e307c
Merge pull request #2579 from neilLasrado/jv-fix
...
Journal entries recalc totals on del of accounts table row
2015-01-14 11:27:25 +05:30
Nabin Hait
60700e30b4
Merge pull request #2580 from neilLasrado/dirty-code
...
dirty code cleanup
2015-01-14 11:27:06 +05:30
Neil Trini Lasrado
73cad76010
dirty code cleanup
2015-01-13 13:55:34 +05:30
Neil Trini Lasrado
e3e3a56b5c
Journal entries recalc totals on del of accounts table row
2015-01-13 12:33:15 +05:30
Nabin Hait
d68115645f
Merge pull request #2574 from neilLasrado/fiscal-year-fix
...
get fiscal year fix
2015-01-12 17:01:48 +05:30
Neil Trini Lasrado
0866272ba1
get fiscal year fix
2015-01-12 16:41:55 +05:30
Rushabh Mehta
135fe3405f
[ui] listviews
2015-01-12 16:11:02 +05:30
Nabin Hait
e8500ad4e6
Multiple fixes
2015-01-10 16:05:17 +05:30
Rushabh Mehta
d49a123fd0
[ui] listviews
2015-01-07 16:43:47 +05:30
Anand Doshi
7b34ebe89d
[minor] Translated status change comment
2015-01-07 15:41:47 +05:30
Rushabh Mehta
738d4ef5c8
[ui] [listviews] indicators
2015-01-06 18:09:02 +05:30
Anand Doshi
50d7e8cf8f
[design] Point of Sale
2015-01-06 17:14:26 +05:30
Rushabh Mehta
e1cb0ae738
[design] list views
2015-01-05 17:39:05 +05:30
Anand Doshi
9b955feff8
[design] POS - item grid and taxes
2015-01-05 16:19:12 +05:30
Rushabh Mehta
ff58261407
[icons] mfg and shopping cart
2015-01-02 14:40:48 +05:30
Nabin Hait
ebc4ae7892
patch fixes
2015-01-02 12:46:49 +05:30
Rushabh Mehta
b8b79173e5
Merge pull request #2541 from pdvyas/travis-bench
...
use bench to run tests on travis
2015-01-01 18:05:34 +05:30
Anand Doshi
3f5e95a99e
[design] Fixed Grid Reports
2015-01-01 16:26:18 +05:30
Pratik Vyas
ca012eb1f8
add auto email id to test site
2015-01-01 16:03:58 +05:30
Rushabh Mehta
90e270a8aa
[ux] fixed creation via tree views for Item Group etc
2015-01-01 15:59:40 +05:30
Rushabh Mehta
4c36d7388c
[ux] fixed creation via tree views for Item Group etc
2015-01-01 15:59:34 +05:30
Pratik Vyas
2a47eeb872
use bench to run tests on travis
2015-01-01 15:48:04 +05:30
Nabin Hait
56ac3fb29d
some fixes for renaming patch
2015-01-01 13:40:54 +05:30
Rushabh Mehta
bfaf0a8f43
[tree] [ui]
2015-01-01 12:49:18 +05:30
Rushabh Mehta
7a8f009116
[fixes]
2014-12-31 15:34:37 +05:30
Rushabh Mehta
419ae33c3e
[merge] v5-design
2014-12-31 15:03:14 +05:30
Rushabh Mehta
ee4b8bee33
Revert "[patches] removed 4.0 patches"
...
This reverts commit 6f7cba8d73 .
2014-12-31 15:01:48 +05:30
Rushabh Mehta
7b822abcd6
[desktop] new icons
2014-12-31 14:42:23 +05:30
Nabin Hait
cbdfb767a9
patch fix
2014-12-31 13:30:36 +05:30
Nabin Hait
54361e8651
fixed conflict while merging develop into v5
2014-12-31 13:24:36 +05:30
Nabin Hait
a4e547d71d
minor fix
2014-12-31 12:08:13 +05:30
Rushabh Mehta
afbfdcf552
[ui] minor fixes
2014-12-30 18:11:32 +05:30
Nabin Hait
dd38a266b8
Removed tname and fname from code
2014-12-26 13:15:21 +05:30
Rushabh Mehta
a5b149c061
[design] module pages, messages, timelines
2014-12-26 12:53:02 +05:30
Rushabh Mehta
4096a3ab2b
[design] form toolbar
2014-12-26 12:53:02 +05:30
Rushabh Mehta
6f7cba8d73
[patches] removed 4.0 patches
2014-12-26 12:53:01 +05:30
Rushabh Mehta
a9ba5eff99
[design] pos
2014-12-26 12:52:11 +05:30
Rushabh Mehta
f870527e7c
[design] wip
2014-12-26 12:52:11 +05:30
Nabin Hait
79f091e2fe
field renaming
2014-12-26 11:41:15 +05:30
Nabin Hait
4b8185db19
renaming: entries
2014-12-25 18:19:39 +05:30
Nabin Hait
23d2a53017
Code replacement for journal voucher renaming
2014-12-25 17:14:18 +05:30
Nabin Hait
e7d153624f
Table Field Renaming: code replace, JV and budget distribution renamed
2014-12-25 16:01:55 +05:30
Nabin Hait
d8f4984d71
Table fieldnames renaming: updated json and patch
2014-12-24 17:04:48 +05:30
Nabin Hait
2eed5a35e3
fixed capacilty planning patch
2014-12-24 10:41:55 +05:30
Nabin Hait
0741ed3a82
Merge pull request #2472 from neilLasrado/expense-claim
...
New feature for issue #2419
2014-12-23 18:07:38 +05:30
Nabin Hait
57595cf73b
fixed merge conflict
2014-12-23 18:05:13 +05:30
Neil Trini Lasrado
31a92bd9d9
company wise letter head feature added
2014-12-23 17:52:41 +05:30
Nabin Hait
b0b7e7fdf8
Merge pull request #2497 from neilLasrado/batch-redesign
...
batch redesigned
2014-12-23 17:44:41 +05:30
Nabin Hait
496dfc4bbf
Merge branch 'neil_capacity_planning' into v5.0
2014-12-23 17:40:46 +05:30
Nabin Hait
89c52eacc7
Actual operation cost in stock entry, fixed cost removed from bom and workstation
2014-12-23 17:39:00 +05:30
Nabin Hait
0de6256bcc
time log and workstations
2014-12-23 17:39:00 +05:30
Nabin Hait
0f4350dd61
capacity planning fixes and cleanup
2014-12-23 17:39:00 +05:30
Nabin Hait
1fa7171bfa
minor fixes
2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
41781ce686
test case fix - holiday list
2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
9712e7dad4
holiday logic removed
2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
e84fa67f30
Actual operating cost, Actal operating time added to 'production order operations' - auto fetched based on 'time log' creation 'make time log' button appears only if 'production order' document is submitted server side validation added to check if 'Production Order' mentioned on 'Time Log' is in submit state test cases added to check all of the above
...
Time Log Bug Fixed
Manufacturing seetings doctype added.
prod order holiday list time calculation added
2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
5ec7542519
Holiday List name changed and workstation filter added to time log
2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
812cd8a8ce
Prod Order Form Modified
2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
637d804abd
Operations added in Production Order DocType Auto-Fetch added to operations in Production Order DocType made operations in production order read-only capacity & duration of cycle added to workstation workstation operation timings added operation master added, Time log added Time Log Fixed Test Records added to Production Order Test Recorde for over Production Time Log added Validation added to check if time log timings are within working hours of the workstation. Validation added to check if workstation is closed on time log dates. Test Case added for Time Log
2014-12-23 17:38:59 +05:30
Pratik Vyas
0a726e2335
add reload doc to patch
2014-12-18 12:41:09 +05:30
Pratik Vyas
dc2630b7fa
Make Tax Assets a group in standard chart of accounts
2014-12-17 16:23:51 +05:30
Nabin Hait
f4ec673a06
Merge pull request #2488 from neilLasrado/bom-currency-fix
...
Bom Currency Fix
2014-12-17 15:42:13 +05:30
Nabin Hait
6ffa445dfd
minor fixes in coa templates
2014-12-16 12:49:35 +05:30
Nabin Hait
b072c74efc
render address and contacts for party
2014-12-16 12:49:13 +05:30
Neil Trini Lasrado
26320fc755
batch redesigned
2014-12-15 17:42:33 +05:30
Nabin Hait
b2a84c7cd9
modified date updated in supplier.json
2014-12-15 14:22:14 +05:30
Nabin Hait
606af96c9f
minor fix
2014-12-15 11:57:19 +05:30
Neil Trini Lasrado
1d66b71464
patch fix
2014-12-12 14:48:30 +05:30
Neil Trini Lasrado
e1f21682fb
changes made
2014-12-12 13:09:42 +05:30
Neil Trini Lasrado
cc73999497
validate fixed
2014-12-12 12:33:55 +05:30
Neil Trini Lasrado
f13c4f0145
New feature for issue #2419
2014-12-12 12:33:55 +05:30
Neil Trini Lasrado
8d34417c44
Bom currency feilds changed to type currency and company feild added to BOM
2014-12-12 11:33:50 +05:30
Nabin Hait
a94478a618
Merge pull request #2390 from ankitjavalkarwork/fix2314
...
Add selectable BOM field for Subcontracted Item
2014-12-11 17:41:45 +05:30
Nabin Hait
abfc72ded4
Merge pull request #2450 from ankitjavalkarwork/fix2363
...
Add print formats for Acc. Receivable/Payable and Summary reports
2014-12-11 17:40:54 +05:30
Nabin Hait
4f7c51d68e
Merge pull request #2442 from ankitjavalkarwork/gross-profit
...
Gross profit
2014-12-11 17:37:54 +05:30
Nabin Hait
a870d540b5
Merge pull request #2458 from neilLasrado/bom-redesign
...
BOM doctype design modified. Quality feild moved from 'More Section' to ...
2014-12-11 17:25:58 +05:30
Nabin Hait
1656839c1b
Merge pull request #2459 from neilLasrado/PO-status-indicator
...
Fix for "Stopped" status indicator in Purchase Order List View
2014-12-11 17:25:22 +05:30
Nabin Hait
df60e0282e
Merge pull request #2475 from neilLasrado/sales-invoice
...
sales Invoice- filter added for debit to
2014-12-11 17:16:08 +05:30
Neil Trini Lasrado
c0063a6e74
sales Invoice- filter added for debit to
2014-12-09 17:03:13 +05:30
ankitjavalkarwork
5edae0e47b
[ #2314 ] Add selectable BOM field for Subcontracted Item
2014-12-04 15:54:54 +05:30
Neil Trini Lasrado
355dfe52ab
Fix for "Stopped" status indicator in Purchase Order List View
...
Issue #2368
2014-12-04 13:34:27 +05:30
ankitjavalkarwork
35db282765
Fix gross_profit.py, commonify and add elementwise grouping to report
2014-12-04 13:08:42 +05:30
Neil Trini Lasrado
c73f4f70e4
BOM doctype design modified. Quality feild moved from 'More Section' to 'Materials Section'
...
[fix] Issue #2404
2014-12-04 12:42:23 +05:30
Rushabh Mehta
ec9db4b799
[report] gross profit WIP
2014-12-04 12:37:39 +05:30
Rushabh Mehta
969069fbf9
[report] gross profit WIP
2014-12-04 12:37:39 +05:30
Rushabh Mehta
9f32a50379
[merge] fix
2014-12-03 12:35:19 +05:30
ankitjavalkarwork
c41a0e2e38
Add print formats for Acc. Receivable/Payable and Summary reports
2014-12-02 15:13:36 +05:30
Nabin Hait
eca7e22cda
Shopping cart test fixed
2014-12-02 11:35:29 +05:30
Rushabh Mehta
1913d5b366
[series] for Issue
2014-11-28 14:27:46 +05:30
Rushabh Mehta
6d950d23a8
[merge]
2014-11-28 12:08:51 +05:30
Rushabh Mehta
bd9b62ff28
[rename] Support Ticket -> Issue
2014-11-28 11:46:10 +05:30
Nabin Hait
1caa1a3708
Fixed party model patch
2014-11-28 11:26:35 +05:30
Nabin Hait
789b74257e
test case fixes
2014-11-27 15:22:24 +05:30
Nabin Hait
40fffc0f4d
fixes during testing version 5
2014-11-26 15:43:27 +05:30
Nabin Hait
249bbbc56f
fixes during testing version 5
2014-11-26 15:35:39 +05:30
Nabin Hait
9ed41b3abb
Reordered Item fields
2014-11-26 10:54:11 +05:30
Nabin Hait
6141b80704
Merge pull request #2414 from ankitjavalkarwork/fix1738
...
[#1738 ] Required Date field in po_details auto-copied in all rows
2014-11-25 10:57:15 +05:30
Rushabh Mehta
909758d36e
Merge pull request #2418 from pdvyas/fix-patch
...
fix Mailbox migration patch
2014-11-20 11:42:50 +05:30
Pratik Vyas
85a354f2fb
fix Mailbox migration patch
2014-11-20 11:41:30 +05:30
ankitjavalkarwork
15ea5cc972
[ #1738 ] Required Date field in po_details auto-copied in all rows
2014-11-17 13:26:43 +05:30
Nabin Hait
707322adb9
Fixes for standard chart of accounts
2014-11-14 18:13:33 +05:30
Nabin Hait
601fcde31c
Merge pull request #2383 from neilLasrado/pos
...
POS feature #2305
2014-11-14 18:12:26 +05:30
Nabin Hait
40c47b2236
Merge pull request #2395 from ankitjavalkarwork/fix2230
...
[#2230 ] Add Totals row to Gross Profit report
2014-11-14 18:06:19 +05:30
Nabin Hait
f8b7633c63
Merge pull request #2398 from ankitjavalkarwork/fix2179
...
Delete events linked with employee on deletion of Employee
2014-11-14 18:05:11 +05:30
Nabin Hait
0bff25c7cb
Merge pull request #2401 from ankitjavalkarwork/fix2219
...
[#2219 ] Re-Order Level Validation: Warehouse cannot have two reorders for same item
2014-11-14 18:04:07 +05:30
Nabin Hait
69ab2ffb5c
Merge pull request #2409 from ankitjavalkarwork/fixbomerror
...
Fix Error message, add account_type to 'inventories' in Chart Of Acc.
2014-11-14 18:02:44 +05:30
ankitjavalkarwork
fff1b42f80
Fix Error message, add account_type to 'inventories' in Chart Of Acc.
2014-11-14 14:19:06 +05:30
Nabin Hait
a6a70a5f35
Make email account patch
2014-11-12 17:00:42 +05:30
Nabin Hait
4cd60d7d61
Included standard charts in json format
2014-11-12 14:29:44 +05:30
Nabin Hait
4963ac2af5
charts for brazil
2014-11-12 14:29:44 +05:30
Nabin Hait
f3d7ef3a1b
Chart of accounts name cleanup
2014-11-12 14:29:44 +05:30
Nabin Hait
ed9c26db4d
Show only active and enabled charts for any country
2014-11-12 14:29:44 +05:30
Neil Trini Lasrado
737cedaeef
Required modifications done
2014-11-11 16:52:34 +05:30
Neil Trini Lasrado
2c388f9d7e
POS feature #2305
2014-11-11 16:00:09 +05:30
ankitjavalkarwork
338eb36811
[ #2219 ] Re-Order Level Validation: Warehouse cannot have two reorders for same item
2014-11-11 13:59:46 +05:30
ankitjavalkarwork
16e2c18c64
Delete events linked with employee on deletion of Employee
2014-11-10 18:08:23 +05:30
ankitjavalkarwork
bd8a8b9bd7
[ #2230 ] Add Totals row to Gross Profit report
2014-11-10 12:36:43 +05:30
Nabin Hait
012cc2cfe1
Merge pull request #2329 from neilLasrado/material-issue
...
Material Issue added to Material Request #2320
2014-11-10 12:04:01 +05:30
Nabin Hait
c3e87b0c02
Merge pull request #2394 from nabinhait/5_develop
...
Credit days validation fixes
2014-11-10 11:44:24 +05:30
Nabin Hait
d795dfd8de
Credit days validation fixes
2014-11-10 11:39:55 +05:30
Neil Trini Lasrado
6bde5868a9
Test Cases Fixed
2014-11-05 16:34:02 +05:30
Neil Trini Lasrado
6d8f48ff8d
Test Cases Added - Work Pending
2014-11-05 15:57:06 +05:30
Neil Trini Lasrado
f9ced8f28f
test-cases added
2014-11-05 15:46:32 +05:30
Neil Trini Lasrado
67e9081bbf
required modifications done
2014-11-05 15:46:32 +05:30
Neil Trini Lasrado
ce020cfb27
mapper added, type 'Transfer' renamed to 'Material Transfer', patch added
2014-11-05 15:46:32 +05:30
Neil Trini Lasrado
f24407e119
Material Issue added to Material Request Type
2014-11-05 15:46:32 +05:30
Nabin Hait
ae1dcabcb5
Fixed merge conflict
2014-11-05 12:41:02 +05:30
Nabin Hait
4a4125b3f4
Merge pull request #2377 from ankitjavalkarwork/apsumm
...
[#2362 ] Commonify Acc. Receivable Summary Report and add Acc. Payable Summary
2014-11-05 11:47:03 +05:30
Nabin Hait
f73a7c1d17
Merge pull request #2376 from ankitjavalkarwork/fix2287
...
Delete Item Price on deletion of linked Item
2014-11-05 11:44:18 +05:30
ankitjavalkarwork
e6e65b0907
[ #2362 ] Commonify Acc. Receivable Summary Report and add Acc. Payable Summary Report
2014-11-04 14:40:33 +05:30
ankitjavalkarwork
a03eda54a2
Delete Item Price on deletion of linked Item
2014-11-03 16:00:28 +05:30
Nabin Hait
7b3543caaf
Check credit limit only if customer debited
2014-11-03 15:46:15 +05:30
Nabin Hait
98050e7646
default receivable / payable accounts in company
2014-11-03 15:46:15 +05:30
Nabin Hait
f09667884b
Root type indentified for multiple country's chart
2014-11-03 15:46:15 +05:30
Nabin Hait
aed3fc48ba
Add default party accounts in customer/supplier
2014-11-03 15:46:15 +05:30
Nabin Hait
0d421c1bf1
Minor fixes
2014-11-03 15:46:15 +05:30
Rushabh Mehta
98ae5bd9db
[form] show website link for website generator
2014-10-31 14:28:47 +05:30
Nabin Hait
e6370860a0
accounts receivable summary report cleanup
2014-10-30 15:54:40 +05:30
Nabin Hait
0822dcbde6
get query for bank/cash account
2014-10-30 15:54:40 +05:30
Nabin Hait
7dbcee87af
AR/AP report cleanup
2014-10-30 15:54:39 +05:30
Nabin Hait
99be941e7b
Party is only relevant to receivable/payable account
2014-10-30 15:54:39 +05:30
ankitjavalkarwork
574e55788f
[ #1379 ] Add Accounts Receivable Summary Report
2014-10-30 15:54:39 +05:30
ankitjavalkarwork
e63432db63
Commonify AR and AP reports
2014-10-30 15:54:39 +05:30
Nabin Hait
606b0427c5
Merge pull request #2349 from neilLasrado/validate-bom-fix
...
FIX validate-bom wrong condition
2014-10-28 17:08:15 +05:30
Neil Trini Lasrado
f92b026405
fixed
2014-10-28 14:50:47 +05:30
Neil Trini Lasrado
2c404cf34f
FIX validate-bom wrong condition
2014-10-28 14:50:47 +05:30
Nabin Hait
6c698e19ca
Merge pull request #2356 from neilLasrado/cost-center-undefined-error-fix
...
fix - validations added for auto fetch of cost center
2014-10-28 14:50:27 +05:30
Nabin Hait
a42e89d8a8
Merge pull request #2312 from neilLasrado/production-calender-sync
...
Production calender sync
2014-10-28 14:46:21 +05:30
Neil Trini Lasrado
6fc2821e5f
fix - validations added for auto fetch of cost center
2014-10-28 14:36:26 +05:30
Neil Trini Lasrado
df4b947e40
data type of start_date and end_date changed to datetime
2014-10-27 14:41:43 +05:30
Neil Trini Lasrado
4a75a42437
Filters added
2014-10-27 13:37:42 +05:30
Neil Trini Lasrado
712cd7a426
Calender and gantt chart view added for production order doctype
2014-10-27 13:37:42 +05:30
Neil Trini Lasrado
9d01133e49
start date and end date added to production order doctype
2014-10-27 13:37:41 +05:30
Nabin Hait
7cdb25b733
Merge pull request #2337 from neilLasrado/makepaymententryfix
...
Error fix, arguments in function call for Make Payment Entry from SI/PI
2014-10-27 11:42:50 +05:30
Nabin Hait
823774ee15
Merge pull request #2340 from neilLasrado/fixstockentryerror
...
Fix error in get_default_cost_center() function
2014-10-27 11:42:28 +05:30
Nabin Hait
60fbdecff4
Merge pull request #2341 from neilLasrado/shopping-cart-fix
...
shopping cart fix
2014-10-27 11:42:02 +05:30
Neil Trini Lasrado
d718c93726
shopping cart fix
2014-10-27 11:03:09 +05:30
Nabin Hait
f5b94143dc
Minor fixes
2014-10-22 16:14:41 +05:30
Neil Trini Lasrado
0683fc33ed
Fix error in get_default_cost_center() function
2014-10-22 14:51:37 +05:30
Rushabh Mehta
3daa49ac1f
[shopping-cart] i'm back
2014-10-21 16:16:30 +05:30
Rushabh Mehta
39dbf73de7
[merge] item-variants
2014-10-21 13:24:46 +05:30
Rushabh Mehta
be1a8d82c5
[merge] develop
2014-10-21 13:14:55 +05:30
Rushabh Mehta
ab43942b35
Merge pull request #2231 from rmehta/item-variants
...
Item variants
2014-10-21 12:38:16 +05:30
Neil Trini Lasrado
572ad4c8ef
Error fix, arguments in function call for Make Payment Entry from SI/PI
2014-10-21 12:34:07 +05:30
Pratik Vyas
8668081b37
add my_config patch to travis
2014-10-20 17:04:22 +05:30
Nabin Hait
90fb64f7e8
Merge pull request #2303 from neilLasrado/fiscal-year-auto-create
...
Fiscal year auto create
2014-10-20 11:58:21 +05:30
Neil Trini Lasrado
1cdfbdb899
fiscal year auto-create added
2014-10-17 15:44:22 +05:30
Nabin Hait
30a0e3e8b4
Merge pull request #2275 from ankitjavalkarwork/fix2164
...
Add Delivery Qty to Sales Invoice From Delivery Note, Misc fixes
2014-10-10 18:05:19 +05:30
ankitjavalkarwork
ad3d698fd8
[ #2164 ] Add test case for delivered qty in Sales Order
2014-10-10 16:59:47 +05:30
Nabin Hait
a5082d6233
Merge pull request #2283 from neilLasrado/employee-reports-to
...
employee cannot report to himself validation added to employee doctype
2014-10-10 15:20:13 +05:30
Nabin Hait
4972a3fb2e
Merge pull request #2252 from neilLasrado/fiscal-year-v5
...
Fiscal year autofetch added
2014-10-10 15:07:22 +05:30
ankitjavalkarwork
e69a611991
[ #2164 ] New field names in DN, fix field name refs, Patch added
2014-10-09 17:31:46 +05:30
ankitjavalkarwork
9aadb0d95d
[ #2164 ] Add Delivered Qty to Sales Inv from Delivery Note, fix issues
2014-10-09 17:31:46 +05:30
Neil Trini Lasrado
9b08062bed
employee cannot report to himself validation added to employee doctype
2014-10-09 17:26:17 +05:30
Neil Trini Lasrado
eaae58f507
Transaction.js fixed , code commonified
2014-10-09 15:01:13 +05:30
Neil Trini Lasrado
9614b552fd
fiscal year auto-fetch added to c-form, installation_note, stock_reconciliation, customer_issue, maintanence_visit & removed for Expense Claim
2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
565d986198
fiscal year auto fetch added to oppurtunity, quotation, material request, supplier quotation, expense claim doctypes + issues fixed
2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
e6b14a4bf6
Fixed issues
2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
78fa6954e5
Fiscal year autofetch added
2014-10-09 15:01:12 +05:30
Nabin Hait
ce89c2f192
Merge pull request #2281 from ankitjavalkarwork/fix1450
...
[fix][#1450 ] Add Shipping Addr field to Sales Invoice
2014-10-09 14:40:07 +05:30
ankitjavalkarwork
e93b1fc508
[fix][ #1450 ] Add Shipping Addr field to Sales Invoice
2014-10-09 12:11:49 +05:30
Nabin Hait
0ba32b05be
Merge pull request #2266 from ankitjavalkarwork/fix1387
...
Add Customer Credit Balance Report
2014-10-09 11:45:26 +05:30
Nabin Hait
12ade3c682
Merge pull request #2250 from ankitjavalkarwork/fix1808
...
[fix][#1808 ] Allow configurable AR/AP ageing dates
2014-10-09 11:24:01 +05:30
Rushabh Mehta
ebc6016ffb
[tests] fixes
2014-10-08 13:54:19 +05:30
Rushabh Mehta
7472a1147c
[tests] fixes
2014-10-08 12:41:06 +05:30
Rushabh Mehta
c2d2857540
[fixes] tests and moved reorder_item to separate module
2014-10-08 12:19:55 +05:30
Rushabh Mehta
58a5de5237
Merge pull request #2272 from ankitjavalkarwork/fix1769
...
[fix][#1769 ] Add disable option to Sales/Purchase Tax Master with validation
2014-10-08 12:14:16 +05:30
Rushabh Mehta
f850987db0
[fixes] tests and moved reorder_item to separate module
2014-10-08 12:03:19 +05:30
Rushabh Mehta
c62b6a815b
[tests] fixes to stock entry
2014-10-07 17:15:30 +05:30
Rushabh Mehta
b31e90c7a5
[tests] fixes to stock entry
2014-10-07 16:56:46 +05:30
Rushabh Mehta
db08041f05
[fix] remove test for item attribute value
2014-10-07 15:39:35 +05:30
Rushabh Mehta
724f9e57e3
[item-variants] get table values from template if not set in variant #2224
2014-10-07 15:29:58 +05:30
ankitjavalkarwork
6c29d8789a
[fix][ #1769 ] Add disable option to Sales/Purchase Tax Master with validation
2014-10-07 14:44:37 +05:30
Nabin Hait
803cd11f68
Update patches.txt
2014-10-07 13:05:29 +05:30
Rushabh Mehta
baef96b5a2
[item-variants] allow production order of variant #2224
2014-10-07 12:34:19 +05:30
ankitjavalkarwork
fe7a6b502a
Add Customer Credit Balance Report, minor changes
2014-10-07 11:41:31 +05:30
Rushabh Mehta
1a7637459c
[item-variants] added more validations, tests #2224
2014-10-07 11:40:47 +05:30
Rushabh Mehta
ef276045c4
[item variants] make variants, bom updates
2014-10-07 11:40:47 +05:30
Rushabh Mehta
70aa8933b1
[item variant] started
2014-10-07 11:39:54 +05:30
Nabin Hait
852e3600cd
Merge pull request #2271 from nabinhait/coa
...
party model patch included in patches.txt
2014-10-07 11:39:41 +05:30
Nabin Hait
0ef1e75c56
party model patch included in patches.txt
2014-10-07 11:37:58 +05:30
ankitjavalkarwork
437af5b031
[fix][ #1808 ] Allow configurable AR/AP ageing dates
2014-10-07 11:32:21 +05:30
Nabin Hait
f065b756e5
Update customer.json
2014-10-06 17:50:58 +05:30
Nabin Hait
dbe8dd843e
Merge pull request #2205 from nabinhait/coa
...
Country-wise chart of accounts and party model
2014-10-06 14:08:36 +05:30
Nabin Hait
2dcc576f0e
Chart finalizzed for Austria and UAE
2014-10-06 13:15:21 +05:30
Nabin Hait
6f17cf93c5
Party balance
2014-10-06 13:15:21 +05:30
Nabin Hait
997a7a1d3e
Test case fixes
2014-10-06 13:15:21 +05:30
Nabin Hait
678b441082
Payment tool as per party model
2014-10-06 13:15:02 +05:30
Nabin Hait
36cf4a4708
Test case fixes
2014-10-06 13:15:02 +05:30
Nabin Hait
034ac6b00b
Payment Reconciliation based on party
2014-10-06 13:14:22 +05:30
Nabin Hait
894a1b539a
Dynamic link in general ledger and stock ledger report
2014-10-06 13:14:22 +05:30
Nabin Hait
cb8e255f0f
Dynamic link for voucher no in AR/AP report
2014-10-06 13:14:22 +05:30
Nabin Hait
bd1c8aff8e
Deleted customer/supplier account head report
2014-10-06 13:14:02 +05:30
Nabin Hait
76030540cb
Accounts Receivable/Payable report based on party
2014-10-06 13:14:02 +05:30
Nabin Hait
965a5a34b5
Party is now dynamic link in JV and GL Entry
2014-10-06 13:13:28 +05:30
Nabin Hait
62c762aac5
Sales/purchase register and item-wise sales/purchase register fixes for party
...
Show Delivery Note and Purchase Receipt based on SO and PO if it not defined in SI/PI #2166
2014-10-06 13:13:27 +05:30
Nabin Hait
8f44f03cba
Party model patch
...
- Create receivable / payable account, set them in company
- Set party in JV and GL Entry
- Delete all exisintg individual party account
2014-10-06 13:13:27 +05:30
Nabin Hait
db030d1761
Set Receivable/Payable account based on party
2014-10-06 13:13:27 +05:30
Nabin Hait
e2095c0dd7
Created new doctype Party Account to maintain default party account, it is a child table for Customer, Supplier, Customer Group, Supplier type
...
Default Receivable / Payable Account in company
Filter results in all receivable/payable link fields
2014-10-06 13:12:05 +05:30
Nabin Hait
3225102eb9
Update outstanding amt based on party
...
Party mandatory if account is receivable/payable
Fetch advance based on party
Reconciliation splitting logic based on party
2014-10-06 13:09:18 +05:30
Nabin Hait
cc582bd774
posted party in gl entry and multiple other fixes
2014-10-06 13:06:11 +05:30
Nabin Hait
3a40435f8c
Credit days and credit limit option in customer group / supplier type #1354
2014-10-06 13:05:28 +05:30
Nabin Hait
e9daefe07f
Credit Limit and credit days fixes #2031
2014-10-06 13:05:28 +05:30
Nabin Hait
be8ec39678
Deleted master_type, master_name, credit_days, credit_limit fields from account
...
Warehouse account is linked via Warehouse field now, instead of master_name field
patch to copy warehouse value from master_name to warehouse
party_type and party field added in GL Entry and Journal Voucher Detail
2014-10-06 13:02:40 +05:30
Nabin Hait
fbc3d25d13
Root type defined for uae and austria
2014-10-06 13:01:58 +05:30
Nabin Hait
9ddc002d6a
country wise chart of accounts restructured
2014-10-06 13:01:58 +05:30
Nabin Hait
712aa5809d
Minor changes in import-from-odoo
2014-10-06 13:01:57 +05:30
Nabin Hait
c68646c694
[merge] 4.x to 5.0
2014-10-06 12:57:48 +05:30
Rushabh Mehta
214164cc38
Merge pull request #2251 from ssiegel/fix-opportunity
...
Fix opportunities not showing in "Linked With" dialog
2014-10-04 08:50:27 +05:30
Stefan Siegel
76a8c75592
Fix opportunities not showing in "Linked With" dialog
2014-10-03 13:25:42 +02:00
Nabin Hait
52527d2fe6
Merge pull request #2249 from ankitjavalkarwork/fix1840
...
[fix][minor] Set Project Gantt Chart dates same as Project dates
2014-10-03 12:53:58 +05:30
Nabin Hait
ce750870f8
Merge pull request #2245 from ankitjavalkarwork/fix2215
...
[fix][minor]Add Actual Qty, Projected Qty to Ordered Items to be Delivered Report
2014-10-03 12:52:12 +05:30
ankitjavalkarwork
6388c18b07
[fix][minor] Set Project Gantt Chart dates same as Project dates
2014-10-02 17:02:48 +05:30
ankitjavalkarwork
e9877a0c48
[fix][minor]Add Actual Qty, Projected Qty to Ordered Items to be Delivered Report
2014-10-01 18:07:25 +05:30
Nabin Hait
c1a1548130
Merge pull request #2233 from ankitjavalkarwork/fix1004
...
[fix] Merge permission roles to modify frozen entries/set frozen accounts
2014-09-30 14:52:29 +05:30
ankitjavalkarwork
44d42ddf63
[fix] Merge permission roles to modify frozen entries/set frozen accounts
2014-09-30 10:40:39 +05:30
Rushabh Mehta
86211cd219
Merge pull request #2203 from rmehta/mailbox
...
Mailbox
2014-09-29 14:18:10 +05:30
Rushabh Mehta
e1446eb516
[fix] quotation status
2014-09-29 14:09:50 +05:30
Rushabh Mehta
20fa996dfa
[fix] quotation status
2014-09-29 13:58:40 +05:30
Rushabh Mehta
39764685f0
[fix] material request feed
2014-09-29 13:00:36 +05:30
Rushabh Mehta
e1509162e1
[fix] material request feed
2014-09-29 12:53:53 +05:30
Rushabh Mehta
3ef0b7ce99
[fix] support ticket feed
2014-09-29 12:48:31 +05:30
Rushabh Mehta
66e08e39f7
[fix] currency moved to frappe
2014-09-29 12:17:03 +05:30
Rushabh Mehta
1c91868755
[version] 5.0.0-alpha
2014-09-29 12:09:55 +05:30
Rushabh Mehta
96c52c38e0
[travis] checkout v5.0 of frappe
2014-09-29 11:44:22 +05:30
Nabin Hait
5e080f9039
Update utils.py
2014-09-26 15:05:30 +05:30
Nabin Hait
81959cc8eb
Merge pull request #2213 from ankitjavalkarwork/grossprofitrep
...
Add ability to fetch Non stock items in Gross Profit report
2014-09-26 15:03:09 +05:30
ankitjavalkarwork
9aa11d2ad7
Add ability to fetch Non stock items in Gross Profit report
2014-09-18 19:08:04 +05:30
Rushabh Mehta
c786802124
[communication] covert-wip
2014-09-17 17:28:03 +05:30
Rushabh Mehta
bf8715dba4
[refactor] used frappe.sendmail
2014-09-16 15:12:18 +05:30
Rushabh Mehta
5cdc8e560c
[mailbox] removed separate email settings for jobs, sales, support
2014-09-16 15:12:18 +05:30
Rushabh Mehta
7fb79f6062
#2092
2014-09-16 15:12:18 +05:30
Rushabh Mehta
e10cf021d9
[email] remove communicationlist #561
2014-09-16 15:12:18 +05:30
Rushabh Mehta
ce00772ac0
[cleanup] removed communication js, fields
2014-09-16 15:11:42 +05:30
Rushabh Mehta
7b128dc15b
[refactor] remove Home module
2014-09-16 15:10:54 +05:30
Rushabh Mehta
9786faa862
[refactor] hooks.py fixes
2014-09-16 15:10:54 +05:30
Rushabh Mehta
c0bb453b88
[refactor] [frappe 5.0]
2014-09-16 15:10:54 +05:30
Rushabh Mehta
ed37cef32a
[refactor modules]
2014-09-16 15:08:02 +05:30