Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,559 Commits 3 Branches 0 Tags 1 GiB
39c952a3f2
Commit Graph

8418 Commits

Author SHA1 Message Date
Rushabh Mehta
a2c4dad90e [fix] product search 2016-06-27 14:55:01 +05:30
Saurabh
b6d6b8420d [fix] add filters and child doc name in previous link mapper 2016-06-27 14:48:26 +05:30
Saurabh
2a0b111726 [fix] mark completed docuemts on document flow 2016-06-27 12:28:55 +05:30
Saurabh
8f24ecb173 [fix] set previous doc links for document flow 2016-06-27 12:28:55 +05:30
Saurabh
d9131ec4ff [minor][fix] remove website generator call on after rename 2016-06-27 12:25:05 +05:30
Anand Doshi
771ab0c8c3 [fix] [patch] re-route 2016-06-27 12:04:48 +05:30
Rushabh Mehta
ee3204373c Merge branch 'develop' of github.com:frappe/erpnext into develop 2016-06-27 10:14:39 +05:30
Anand Doshi
d6b734e2e3 [fix] DuplicateEntryError for Warehouse Account Creation 2016-06-26 17:43:14 +05:30
Saurabh
78333c7e07 [fixes] check group condition 2016-06-26 14:27:46 +05:30
Saurabh
7fecb50360 [enhance] rename warehouse account type to stock 2016-06-26 14:27:46 +05:30
Nabin Hait
2ee4d79609 Merge pull request #5540 from KanchanChauhan/customize-retirement-age 
Retirement Age option in HR Settings
 2016-06-26 14:25:45 +05:30
Kanchan Chauhan
68f5ae5cbf Changes done 2016-06-26 14:10:24 +05:30
Nabin Hait
14f0a6fa89 Merge pull request #5534 from KanchanChauhan/itemprice-update-in-pricelist 
Item Price update in Price List
 2016-06-26 13:07:35 +05:30
Rushabh Mehta
dad5140eac [minor] add task status 2016-06-26 12:21:20 +05:30
Saurabh
520fb73676 [fix] authorization rule fix for sales order 2016-06-26 12:09:49 +05:30
Nabin Hait
c65f160776 [fix] Identify account group for warehouse based on account type 2016-06-26 08:25:51 +05:30
Anand Doshi
f576f3b17b implemented get_site_info for erpnext and patch to move setup complete to system settings 2016-06-25 19:52:26 +05:30
Rushabh Mehta
5cba40b74f [fix] [bug] task deletion from project fixes #5470 2016-06-25 18:44:59 +05:30
Rushabh Mehta
723cd64249 [fix] tree view hooks and patch fix 2016-06-25 18:30:03 +05:30
Kanchan Chauhan
2ff7d2aade Fixed 2016-06-25 17:54:25 +05:30
Kanchan Chauhan
4c0df04db0 Retirement Age option in HR Settings 2016-06-25 17:45:16 +05:30
Nabin Hait
8942d1782c Merge pull request #5481 from bcornwellmott/patch-2 
Create Manufacture MRs for BOM Items
 2016-06-25 14:01:32 +05:30
Nabin Hait
4cc7bcc412 Merge pull request #5495 from bcornwellmott/patch-3 
Add "Get items from Material Request"
 2016-06-25 13:58:50 +05:30
Nabin Hait
2efecac823 Merge pull request #5522 from cgpurbaugh/patch-2 
Some minor grammatical and spelling changes
 2016-06-25 13:54:19 +05:30
Nabin Hait
173b328380 Merge pull request #5527 from bcornwellmott/patch-4 
Fix Percent Billed to show Percentage
 2016-06-25 13:53:55 +05:30
Nabin Hait
7b6cdf4a63 Merge pull request #5518 from saurabh6790/warehouse_tree 
Warehouse tree
 2016-06-25 13:49:15 +05:30
Nabin Hait
0420833a59 Merge pull request #5531 from saurabh6790/cheque_print_fixes 
[fixes] set default values to cheque print and set background image o…
 2016-06-25 13:43:56 +05:30
Saurabh
dc2fa86222 [fixes] rename ctype to doctype 2016-06-25 11:16:55 +05:30
Saurabh
001d4d74fa [fix] in set_valuation_method check for is group condition 2016-06-25 11:06:15 +05:30
Saurabh
3a0f96bd00 [patch] patch to move all warehouses under all warehouse group 2016-06-25 11:06:14 +05:30
Saurabh
4d02949814 [fixes] validate trash condition for warehouse and related account, move existing warehouses under all warehouse group, set account parent and is group for warehouse account 2016-06-25 11:06:14 +05:30
Saurabh
ec8babe7ac [minor][fix] 2016-06-25 11:06:14 +05:30
Saurabh
1702273968 [fix] rename account browser and sales browser to tree/doctype for view 2016-06-25 11:06:14 +05:30
Saurabh
ac53357f53 [fixes] renamed _treeview to _tree 2016-06-25 11:06:14 +05:30
Saurabh
a9ba7343c4 [fix] deprecate browser pages for accounts, cost_center, sales , bom, item group 2016-06-25 11:06:14 +05:30
Saurabh
9c7b0079c5 [fixes] warehose group wise stock report and test cases for warehouse hierarchy and warehouse group wise reorder level 2016-06-25 11:06:13 +05:30
Saurabh
3d6aecd618 [fixes] set warehouse group wise reorder level, validate ledger (leaf warehouse) on sle and bin 2016-06-25 11:06:13 +05:30
Saurabh
554f6f70aa [fixes] nested set fix for warehouse, tree for accounts and cost center 2016-06-25 11:06:13 +05:30
Saurabh
0e47bfeb16 [enhance] treeview to BOM, sales person, Cost Center and Chart of acounts 2016-06-25 11:06:13 +05:30
Saurabh
5f48cb6128 [enhancement] BOM treeview 2016-06-25 11:06:13 +05:30
Saurabh
d647945102 [fixes] 2016-06-25 11:06:13 +05:30
Saurabh
eda1afb4eb [fixes] comnify tree view 2016-06-25 11:06:13 +05:30
Saurabh
091ca75fa3 [enhance] warehouse browser page for warehouse tree 2016-06-25 11:06:12 +05:30
Saurabh
dfbcdeb8a0 [enhancement] warehouse tree structure 2016-06-25 11:06:12 +05:30
Saurabh
a4a3b022ee [fix] return route from make_route of child class 2016-06-25 10:43:02 +05:30
Kanchan Chauhan
5ee8fccb1a Item Price update in Price List 2016-06-24 17:11:15 +05:30
Rushabh Mehta
994fa8dcef Merge pull request #5530 from rmehta/website-route-fixes 
[redesign] website routing system
 2016-06-24 16:37:43 +05:30
Rushabh Mehta
bd9680f82e [added] web-forms 2016-06-24 16:41:33 +05:30
Rushabh Mehta
a334062b03 [redesign] website routing system 2016-06-24 16:18:07 +05:30
Nabin Hait
438565f678 Merge branch 'master' into develop 2016-06-24 16:12:26 +05:30
Nabin Hait
23b190414c bumped to version 6.27.25 2016-06-24 16:41:59 +06:00
Nabin Hait
0bfd4849ca minot fix 2016-06-24 16:04:31 +05:30
Nabin Hait
2effad33d0 Merge branch 'master' into develop 2016-06-24 12:48:24 +05:30
Nabin Hait
0e19e72a5d bumped to version 6.27.24 2016-06-24 13:16:27 +06:00
Nabin Hait
6dfc78b12a Item Valuation Rate in case of negative inventory 2016-06-24 12:28:55 +05:30
Saurabh
777f556b14 [fixes] set default values to cheque print and set background image only if attachment exist 2016-06-23 20:25:37 +05:30
bcornwellmott
813dddeb10 Fix Percent Billed to show Percentage 
Previously was showing Currency
 2016-06-22 14:49:31 -07:00
Rushabh Mehta
8a065e0028 [rename] Bulk Email to Email Queue 2016-06-22 12:58:39 +05:30
Rushabh Mehta
4d54fb258c Merge pull request #5514 from cgpurbaugh/patch-1 
Update tasks.md
 2016-06-22 12:09:21 +05:30
Rushabh Mehta
6e7dc12fde Merge pull request #5476 from umairsy/14-jun 
In the Setup Wizard, changed field label from Bank Account to Bank Name
 2016-06-22 12:09:01 +05:30
Rushabh Mehta
560ee7bb12 Merge pull request #5480 from vjFaLk/restrict-newsletter-list 
Added code to Restrict Newsletter List Recipients
 2016-06-22 12:08:41 +05:30
Rushabh Mehta
4cf914d902 [minor] added mins to first response for opportunity 2016-06-22 11:22:12 +05:30
Christopher G. Purbaugh
01d4d30e8a Some minor grammatical and spelling changes 2016-06-21 15:42:20 -04:00
Nabin Hait
a531ebea8a Merge branch 'master' into develop 2016-06-21 16:44:05 +05:30
Nabin Hait
a5162b7529 Merge branch 'hotfix' 2016-06-21 16:42:40 +05:30
Nabin Hait
2eb9b34ff2 bumped to version 6.27.23 2016-06-21 17:11:34 +06:00
Nabin Hait
5db108116a Merge pull request #5446 from rohitwaghchaure/purchase_register_total_amount_issue 
[Fixes] Purchase register, showing wrong value for total amount if tax has deducted.
 2016-06-21 16:29:27 +05:30
Nabin Hait
bf3e26dd2d Merge pull request #5466 from rohitwaghchaure/shipping_address_autocomplete_issue 
[Fix] Shipping address's get_query not working on autocomplete.
 2016-06-21 16:28:12 +05:30
Christopher G. Purbaugh
55990efe29 Update index.md 
Removed some repetitive text, changed some of the wording.
 2016-06-20 15:08:08 -04:00
Christopher G. Purbaugh
22e0489ac7 Update tasks.md 2016-06-20 14:36:28 -04:00
Christopher G. Purbaugh
7f89c1aec0 Update tasks.md 
Just some small grammatical corrections
 2016-06-20 14:28:44 -04:00
Umair Sayyed
5918dc87f3 small fixes 2016-06-17 12:28:21 +05:30
bcornwellmott
9af68078f6 Add "Get items from Material Request" 
Allows users to pull items from multiple Material Requests into a Request for Quotation
 2016-06-16 14:10:57 -07:00
Rohit Waghchaure
c65c38d293 [POS] Minor fixes 2016-06-16 11:49:37 +05:30
bcornwellmott
c0a3311836 Create Manufacture MRs for BOM Items 
Corrects an issue where items with BOMs have Purchase material request submitted instead of Manufacture material requests.
 2016-06-15 11:16:12 -07:00
Rushabh Mehta
2cb7a9f235 [ux] taxes table editable 2016-06-15 16:45:03 +05:30
Valmik Jangla
2225decb2b Restrict Newsletter lists 2016-06-15 16:04:17 +05:30
Rushabh Mehta
b5f2c78f8f [list] reports for item list 2016-06-15 12:57:22 +05:30
Rushabh Mehta
dc1758b36e [report] minutes to first response for issues 2016-06-14 18:26:09 +05:30
Rushabh Mehta
f7e6ec0654 [report] minutes to first response for issues 2016-06-14 18:08:51 +05:30
Rushabh Mehta
57f35ddb4a [minor] fix update_mins_to_first_response patch 2016-06-14 16:29:33 +05:30
Rushabh Mehta
1d1bc27a57 [minor] fix update_mins_to_first_response patch 2016-06-14 16:27:50 +05:30
Rushabh Mehta
a55fb6426c [patch] mins_to_first_response in opporutnity and issue 2016-06-14 15:54:54 +05:30
Maxwell Morais
f8122646ba Set get_contact_details and get_address_display to the right standard! 2016-06-14 15:19:00 +05:30
Umair Sayyed
9a0ff298ce Changed field label from Bank Account to Bank Name 2016-06-14 12:25:34 +05:30
Nabin Hait
1df75c930f Merge pull request #5390 from MaxMorais/patch-5 
get_address_display cannot be called directly
 2016-06-14 11:32:06 +05:30
Rohit Waghchaure
9fe40d557f [POS] Enhancement to set default payment as cash, functionality to clear amount value, renamed doctype Payments and some fixes. 2016-06-14 01:11:09 +05:30
Rushabh Mehta
d1eba515e9 [cleanup] fixes to v7 2016-06-13 17:47:13 +05:30
Anand Doshi
7f8142d30d [fix] reuse user.reset_password in RFQ 2016-06-13 17:23:18 +05:30
Rushabh Mehta
dd7524f844 [minor] msgprint as alert 2016-06-12 11:16:23 +05:30
Rushabh Mehta
538607e6b6 [cleanup] a better message for insufficient stock 2016-06-12 11:03:00 +05:30
Rohit Waghchaure
2dd26055c9 [Fix] Shipping address's get_query not working on autocomplete. 2016-06-11 01:48:00 +05:30
Rushabh Mehta
e0686b32f3 [minor] cleanups 2016-06-10 12:38:52 +05:30
Rohit Waghchaure
28c02fe51d [Fix] POS page loading issue, if system has only one item 2016-06-10 00:48:03 +05:30
Anand Doshi
51ad436e16 [fix] sales and accounts browser name 2016-06-09 19:37:35 +05:30
Anand Doshi
34482788f4 [fix] removed bad import 2016-06-09 16:57:16 +05:30
Anand Doshi
8f6e6ff543 [fix] removed bad import 2016-06-09 16:57:08 +05:30
Anand Doshi
d492b675a7 [fix] removed bad import 2016-06-09 16:56:54 +05:30
Anand Doshi
754f8b42f5 [version] changed to 7.0.0-beta 2016-06-09 16:31:57 +05:30
Anand Doshi
227b238fb1 [fix] change in versioning: store __version__ in __init__.py 2016-06-09 16:31:01 +05:30
Anand Doshi
36a0c5c564 [fix] change in versioning: store __version__ in __init__.py 2016-06-09 16:29:46 +05:30
Anand Doshi
db6b832302 [fix] change in versioning: store __version__ in __init__.py 2016-06-09 16:29:12 +05:30
Rushabh Mehta
d56306add0 [minor] [fix] quotation cancelled status issue, fixes #5221 2016-06-09 15:56:48 +05:30
Rushabh Mehta
743de9b306 [minor] website field in customer and allow_import for purchase receipt, fixes #5227 2016-06-09 15:11:45 +05:30
Rushabh Mehta
cb29d9886c [minor] fixes #5252 2016-06-08 17:31:11 +05:30
Rushabh Mehta
e9d2c3d46e [fix] report requested items to be transferred, fixes #5295 2016-06-08 16:41:09 +05:30
Rushabh Mehta
6e837599b1 [minor] added cost center to item wise sales register, fixes #5301 2016-06-08 16:35:10 +05:30
Rushabh Mehta
e778e59e4c [minor] always show issues in sidebar 2016-06-08 15:34:54 +05:30
Rushabh Mehta
7ce345a827 [minor] re-organize issue 2016-06-08 11:10:34 +05:30
Rushabh Mehta
0b955e6c33 [minor] production planning, fix description 2016-06-08 11:10:34 +05:30
Anand Doshi
16e2442278 [cleanup] document flow 2016-06-07 18:55:23 +05:30
Saurabh
a8217dc7e9 [fixes] build json fixes 2016-06-07 17:19:36 +05:30
Saurabh
7d0e78d399 [fixes] this.frm instead of cur_frm 2016-06-07 17:19:36 +05:30
Saurabh
2966d89e2a [fixes] create module flow list 2016-06-07 17:19:36 +05:30
Saurabh
9df3d0fb8a [enhance] show module flow on top of document 2016-06-07 17:19:36 +05:30
RobertSchouten
f28a5da952 [fix] show company in list view 
allows address and contact to only contain company not customer or supplier or sales partner
 2016-06-07 17:03:41 +08:00
Maxwell Morais
1ea13f1f49 Set get_contact_details and get_address_display to the right standard! 2016-06-07 02:35:11 -03:00
Maxwell Morais
57b6b1dc85 Set get_contact_details to the right standard! 2016-06-07 02:32:47 -03:00
Rushabh Mehta
6125abc495 Merge pull request #5430 from shreyasp/issue/prod-order-qty 
[Fix] Allow user to quantity in fraction while transferring material using production order
 2016-06-07 10:58:20 +05:30
Rohit Waghchaure
690a0805f6 [Fixes] Purchase register, showing wrong value for total amount if tax has deducted. 2016-06-07 10:46:59 +05:30
ShashaQin
6cac50b52e Update bom.py 2016-06-07 09:38:57 +08:00
Nabin Hait
3bc300a207 Merge branch 'master' into develop 2016-06-03 11:57:30 +05:30
Nabin Hait
ef7b6ab8ef bumped to version 6.27.22 2016-06-03 12:20:19 +06:00
Rushabh Mehta
eb1e0673e2 Merge pull request #5354 from saurabh6790/cheque_print 
Cheque print
 2016-06-02 17:48:58 +05:30
Rushabh Mehta
c5c0d96064 Merge pull request #5395 from saurabh6790/payment_request_ux 
[enhance] ux fixes for payment request, added jinja for payment reque…
 2016-06-02 17:48:36 +05:30
Rushabh Mehta
aed79e993f [fix] item attribute validation, fixes #5308 2016-06-02 17:49:16 +05:30
Rushabh Mehta
675f9c6e6e [minor] reset barcode if item is changed, fixes #5314 2016-06-02 16:34:00 +05:30
Rushabh Mehta
af7d929386 [minor] fix supplier/customer and editable columns in BOM 2016-06-02 12:39:36 +05:30
bcornwellmott
c39c665136 [BUG] Fix Create Material Request OperationalError 
The call was invalid because "it.name" doesn't exist. Needs to be replaced with "item.name"
 2016-06-01 08:31:05 -07:00
shreyas
3b79f19614 [Fix] Allow user to quantity in fraction while transferring material using production order 2016-06-01 17:45:10 +05:30
Nabin Hait
9f98296c9c minor fix 2016-06-01 16:21:43 +05:30
Rushabh Mehta
7db1793543 [fix] notification control UX - add update to top, fixes #5349 2016-06-01 13:24:28 +05:30
Nabin Hait
2460ee897a Merge pull request #5367 from KanchanChauhan/job_openings_public 
[Minor Fix] Job Opening should not require login
 2016-06-01 13:18:26 +05:30
Nabin Hait
8e4ec8d84a Merge pull request #5416 from nabinhait/tax_rule_based_on_county 
Tax Rule based on County
 2016-06-01 13:09:53 +05:30
Nabin Hait
cc07148336 Merge pull request #5428 from ShashaQin/patch-21 
Update fiscal_year.py
 2016-06-01 12:58:13 +05:30
Nabin Hait
29d85b0ab8 test case fixed 2016-06-01 12:54:26 +05:30
Nabin Hait
9a5cf6000e [fix] Test cases and editable fields settings for request for quotation 2016-06-01 12:54:26 +05:30
Nabin Hait
4eaeda710d Tax Rule based on County 2016-06-01 12:54:26 +05:30
Rushabh Mehta
535f3b0975 [minor] make task editable in project and add description to designation fixing #5361 2016-06-01 12:52:50 +05:30
Rushabh Mehta
277cda195c [fix] for #5419 2016-06-01 12:29:08 +05:30
Rushabh Mehta
aa60fd9037 [fix] new_doc to frappe.new_doc 2016-06-01 11:46:33 +05:30
ShashaQin
5dd72fe196 Update fiscal_year.py 2016-06-01 11:39:53 +08:00
Nabin Hait
919b1b9d5b Merge pull request #5408 from neilLasrado/hotfix-2 
Fixed error in Gross Profit report
 2016-05-31 17:41:19 +05:30
Nabin Hait
54f723b654 Merge pull request #5413 from kressi/patch-1 
[doc] fixed typo
 2016-05-31 17:40:54 +05:30
Nabin Hait
7ab088ed3f Merge pull request #5414 from nabinhait/journal_entry_ux 
Fetch party info in Journal Entry on selection of reference Invoice
 2016-05-31 17:38:22 +05:30
Nabin Hait
6a110331e8 Merge pull request #5415 from nabinhait/company_permissions_fix 
Ignore permissions for account/warehouse creation from Company
 2016-05-31 17:38:08 +05:30
Nabin Hait
bb502f8588 Merge pull request #5417 from nabinhait/grid_editable_fields 
[fix] Enabled editable fields in Budget
 2016-05-31 17:37:36 +05:30
Nabin Hait
b0f7e5b23f Merge pull request #5424 from shreyasp/issue/delete-root-account 
[Fix] User allowed to delete the root account in Chart of Accounts
 2016-05-31 17:37:08 +05:30
shreyas
2bb845e53f [Fix] User allowed to delete the root account in Chart of Accounts 2016-05-31 17:15:28 +05:30
Rushabh Mehta
0dcb861b56 [minor] 2016-05-31 07:22:51 +05:30
Rushabh Mehta
bc92824bc4 [minor] rename item_name if same as item, on rename and removed item selector 2016-05-31 07:22:51 +05:30
Nabin Hait
37c53f0a04 [fix] Enabled editable fields in Budget 2016-05-30 18:20:31 +05:30
Nabin Hait
f169e5c04d Ignore permissions for account/warehouse creation from Company 2016-05-30 12:15:36 +05:30
Nabin Hait
9fdd37e1ad Fetch party info in Journal Entry on selection of reference Invoice 2016-05-30 11:49:16 +05:30
Michael Kressibucher
f96ec0950d [doc] fixed typo 2016-05-29 17:57:37 +02:00
Neil Trini Lasrado
efccb8a704 Fixed error in Gross Profit report 2016-05-27 13:24:02 +05:30
Neil Trini Lasrado
45328f7729 Fixed error in bom autoname 2016-05-27 13:04:20 +05:30
Nabin Hait
a60ceba6d4 [fix] reload gl entry doctype in patch 2016-05-27 12:44:18 +05:30
Nabin Hait
0014aa9c26 [fix] Charts in report 2016-05-27 12:21:36 +05:30
Nabin Hait
591a5aba56 Added Project in GL Entry and General Ledger report 2016-05-26 17:51:20 +05:30
Nabin Hait
37b5e0c99f Merge pull request #5399 from nabinhait/report-graph 
Charts on reports / activity page, deprecated financial analytics report
 2016-05-26 17:42:36 +05:30
Nabin Hait
1ade5927c4 fixed conflict 2016-05-26 16:56:30 +05:30
Nabin Hait
01eb7d02cc bumped to version 6.27.21 2016-05-26 17:25:34 +06:00
Nabin Hait
5af737dd67 Update sales_order.py 2016-05-26 16:54:25 +05:30
Anand Doshi
07dfb475ca [fix] newsletter progress percentage 2016-05-26 16:41:14 +05:30
Anand Doshi
ac7c81bb98 [fix] compiled erpnext.less to erpnext.css 2016-05-26 16:41:04 +05:30
Nabin Hait
310d64d565 Fixed conflict 2016-05-26 16:10:02 +05:30
Nabin Hait
c5d186c497 bumped to version 6.27.20 2016-05-26 16:15:34 +06:00
Nabin Hait
b46d021f2a Charts on reports / activity page, deprecated financial analytics report 2016-05-26 15:26:01 +05:30
Nabin Hait
44c1b8e63b Line/Bar chart in Balance Sheet / Profit and Loss statement 2016-05-26 15:26:01 +05:30
Nabin Hait
28bdff5a55 Pie chart for ageing analysis in accounts receivale/payable 2016-05-26 15:26:01 +05:30
Nabin Hait
8ed2f87480 Update company.py 2016-05-25 20:06:24 +05:30
Rohit Waghchaure
f2aa1764cc [POS] enhancement and minor fixes 2016-05-25 15:04:46 +05:30
Saurabh
ed0816832d [enhance] ux fixes for payment request, added jinja for payment request message 2016-05-25 11:55:30 +05:30
Rushabh Mehta
1885645d6d [fix] [patch] 2016-05-24 16:10:21 +05:30
Rushabh Mehta
c96c4d6424 [minor] ignore xss in email sender 2016-05-24 16:02:49 +05:30
Rushabh Mehta
b574658c93 [minor] allow any time logs to be batched, fixes #5386 2016-05-24 12:13:31 +05:30
Nabin Hait
40d63d0675 Merge pull request #5378 from saurabh6790/hotfix 
[fix] update setup wizard access
 2016-05-24 11:47:31 +05:30
Saurabh
e450490bfb [document] document for cheque print 2016-05-24 10:28:16 +05:30
Saurabh
81501ddc6d [fixes] add setting to mark cheque account pay only 2016-05-24 10:28:14 +05:30
Saurabh
2fc0ffad34 [fixes] js templating to get cheque print view 2016-05-24 10:28:14 +05:30
Saurabh
9ca9f2d551 [Fixes] UX fixes 2016-05-24 10:28:14 +05:30
Saurabh
bb95d36218 [fixes] field re-structuring 2016-05-24 10:28:14 +05:30
Saurabh
1b62ecea44 [enhancement] cheque print 2016-05-24 10:28:14 +05:30
Nabin Hait
79ddf67289 Merge pull request #5362 from nabinhait/budget 
Budgeting
 2016-05-23 17:56:42 +05:30
Rushabh Mehta
3b10619aef Merge pull request #5391 from rohitwaghchaure/posting_date 
Added today as default in transactions.
 2016-05-23 17:55:22 +05:30
Nabin Hait
8f70370457 Chart of accounts fixed for Spain 2016-05-23 17:41:51 +05:30
Nabin Hait
03b08e7a91 [fix] Period closing voucher 2016-05-23 16:28:39 +05:30
Rohit Waghchaure
bc894428ca Added today as default in transaction. 2016-05-23 15:22:36 +05:30
Nabin Hait
832988e2fd test case fixed 2016-05-23 13:04:26 +05:30
Nabin Hait
d9117cb726 reload budget doctype in patch 2016-05-23 13:04:26 +05:30
Nabin Hait
ca90963d5b Redesigned budgets 2016-05-23 13:04:26 +05:30
Nabin Hait
b9bc7d6df3 [feature] New document for Budget 2016-05-23 13:04:26 +05:30
Maxwell Morais
498cc58522 get_address_display cannot be called directly 
The new function get_address_display dont allow directly call, since it dont support, `frm, cdt, cdn` as arguments
 2016-05-22 20:19:30 -03:00
François
dfc0a30e69 minor edits 2016-05-22 14:22:02 +02:00
Rohit Waghchaure
62dbbfba0d [Fix] during making of material request from sales order, system fetching product bundle items only if so has both product bundle and purchase item 2016-05-20 17:09:29 +05:30
Rushabh Mehta
ac123c57f3 [cleanup] website / portal css 2016-05-20 16:37:14 +05:30
Nabin Hait
04f3286c04 Update company.py 2016-05-20 15:47:56 +05:30
Saurabh
31c0d43b95 [fix] update setup wizard access 2016-05-20 15:30:00 +05:30
Nabin Hait
66ee4d8cd7 Merge branch 'master' into develop 2016-05-20 15:15:21 +05:30
Nabin Hait
a54a2a99f4 bumped to version 6.27.19 2016-05-20 15:45:20 +06:00
Nabin Hait
d112417301 [hotfix] setup wizard access 2016-05-20 15:12:45 +05:30
Rohit Waghchaure
6c60c164f1 [Fixes] material request's editable fields overriding with purchase common 2016-05-20 14:03:09 +05:30
Rushabh Mehta
d0cee1b61b [fix] minor fixes to pos 2016-05-20 12:54:59 +05:30
Rushabh Mehta
40b3a5bcc4 [optimize] communication query for heatmap 2016-05-20 12:54:59 +05:30
Nabin Hait
563bd056d7 Merge branch 'master' into develop 2016-05-20 12:18:28 +05:30
Nabin Hait
6c5a9bbe6b bumped to version 6.27.18 2016-05-20 12:48:27 +06:00
Nabin Hait
3956c94bbb Merge pull request #5340 from rohitwaghchaure/support_week_new 
[Fix] Sales Invoice shows default date while no default mentioned
 2016-05-20 12:06:22 +05:30
Nabin Hait
2edf6b84d6 Merge pull request #5364 from rohitwaghchaure/setup_wizard_access_issue 
[Fix] Restrict access to setup wizard page if setup is already completed
 2016-05-20 11:40:00 +05:30
Nabin Hait
5dfcfc5606 Merge pull request #5366 from saurabh6790/set_default_bank_acc_in_bank_reco 
[fixes] set default bank account in bank reconciliation statement report
 2016-05-20 11:36:44 +05:30
Nabin Hait
baf3e3721f Merge pull request #5371 from saurabh6790/reset_user_must_always_select_on_transaction_change 
[fixes] Reset "User must always select" on change of transaction
 2016-05-20 11:36:06 +05:30
Nabin Hait
58e493ad51 Merge pull request #5372 from rohitwaghchaure/setup_wizard_translation_issue 
[Translation] [Fix] Exception in setup wizard, item attributes Large and Extra Large has same translation
 2016-05-20 11:35:53 +05:30
Anand Doshi
1d88c6a742 [fix] [patch] home page + erpnext.css 2016-05-20 10:42:04 +05:30
Rushabh Mehta
532eedf411 [enhance] more editable grids 2016-05-19 18:22:49 +05:30
Rohit Waghchaure
9333b6208a [Translation] [Fix] Exception in setup wizard, item attributes Large and Extra Large has same translation 2016-05-19 17:01:49 +05:30
Rohit Waghchaure
d818bcd888 [Fixes] tax rule, tax rule working even if tax template inside the rule is disabled. 2016-05-19 16:53:01 +05:30
Saurabh
c0c8af06da [fixes] set default bank account in bank reconciliation statement report 2016-05-19 12:32:08 +05:30
Saurabh
dc16b7e34a [fixes] Reset on change of transaction 2016-05-19 12:26:40 +05:30
Rushabh Mehta
35047ac283 [ux] direct editing in material request 2016-05-18 18:17:38 +05:30
Kanchan Chauhan
adad5fb11e [Minor Fix] Job Opening should not require login 2016-05-18 16:33:29 +05:30
Rohit Waghchaure
d2e02a3023 [Fix] Restrict access to setup wizard page if setup is already completed 2016-05-18 14:52:57 +05:30
Nabin Hait
1daebc04d0 Merge pull request #5360 from neilLasrado/hotfix 
Fixed reports
 2016-05-18 10:39:19 +05:30
Anand Doshi
e13c3ad048 [fix] [patch] homepage 2016-05-18 01:46:23 +05:30
Neil Trini Lasrado
4668a69cf5 Fixed reports 2016-05-17 19:04:08 +05:30
Rohit Waghchaure
5d97d89a03 [Fix] Sales Invoice shows default date while no default mentioned 2016-05-17 15:13:17 +05:30
Nabin Hait
a09285122f Added root type for Income. Fixes #5356 2016-05-17 10:37:31 +05:30
Anand Doshi
0d66260d31 [fix] [patch] update home page 2016-05-17 10:21:08 +05:30
Rushabh Mehta
a484ff751b Merge pull request #5353 from MaxMorais/patch-4 
Small improvement in maintenance scheduler
 2016-05-16 14:56:17 +05:30
Maxwell Morais
92b0be93c7 Removed HTML tags from messages 
Remove HTML from messages
 2016-05-16 06:24:55 -03:00
Maxwell Morais
89fdbdf404 Translation improvements 
Translation improvements
 2016-05-16 06:08:51 -03:00
Maxwell Morais
52a66fc90b Reduce start and end date verification 
Given the actual scenario, that verify if the start_date <= end_date, do schedule a Maintenance, 2 days are required, but in many cases only one day is required!
 2016-05-16 06:06:59 -03:00
Maxwell Morais
4e7b52952e Added warning 
Added a warning to show a information to the active user
 2016-05-16 05:38:04 -03:00
Rushabh Mehta
72615977d7 Merge pull request #5337 from rohitwaghchaure/pos 
[WIP] [POS] Some changes and fixes
 2016-05-16 12:06:42 +05:30
Rushabh Mehta
3a87c479c7 Merge pull request #5346 from umairsy/domains 
Domainifying
 2016-05-16 12:02:51 +05:30
Rushabh Mehta
dc997dc426 Merge pull request #5352 from fderyckel/patch-2 
Update multi-currency-accounting.md
 2016-05-16 12:02:23 +05:30
Rushabh Mehta
9f5ff9476e Merge pull request #5342 from rohitwaghchaure/support_week_2 
[Fix] Removed is_pro_applicable
 2016-05-16 12:02:01 +05:30
Rushabh Mehta
d474e0cb5b Merge pull request #5345 from nabinhait/coa 
Changes related for charts builder
 2016-05-16 12:01:32 +05:30
Rohit Waghchaure
e0934d118f [Fixes] Some changes and fixes 2016-05-16 12:01:16 +05:30
Rushabh Mehta
03578620e0 Merge pull request #5338 from fderyckel/patch-1 
Update make-field-visible-in-print-format.md
 2016-05-16 12:00:15 +05:30
Rushabh Mehta
a9e3936b20 Merge pull request #5335 from neilLasrado/patch-1 
Update manufacturing-settings.md
 2016-05-16 11:57:48 +05:30
Rushabh Mehta
6471e178f6 Merge pull request #5321 from rohitwaghchaure/rfq_fixes 
[Fixes] RFQ minor fixes
 2016-05-16 11:57:35 +05:30
Rushabh Mehta
c93caee284 Merge pull request #5265 from ShashaQin/patch-46 
Update opportunity.py
 2016-05-16 11:56:32 +05:30
Rushabh Mehta
02f76dc0f9 [patch] [fix] 2016-05-16 11:46:29 +05:30
Rushabh Mehta
f1bdae4496 [patch] [fix] 2016-05-16 11:41:29 +05:30
Rushabh Mehta
7c96dc1783 [minor] [fix] cart 2016-05-16 11:36:08 +05:30
Maxwell Morais
28453efece Small improvement in maintenance scheduler 
This improvement is intended to start disable blocking Maintenance Schedule submit, when the `Sales Person` does not have a `user_id` in the Employee!

The old logic try to use the `sales_person` email_id or the `owner` to create the event, but due some fails in the code, it dont occurs!
 2016-05-16 00:50:03 -03:00
François
0802c56625 Update multi-currency-accounting.md 2016-05-15 20:21:08 +02:00
Rushabh Mehta
c8b2a9d654 [patch] [fix] 2016-05-15 10:08:52 +05:30
Anand Doshi
a5e4dc85db Merge pull request #5341 from rohitwaghchaure/support_week_1 
[Fix] Warranty claim form, unexpected token illegal error
 2016-05-14 13:16:48 +05:30
Anand Doshi
97a70b226a Merge pull request #5332 from anandpdoshi/fix/validate-account-company 
[fix] Validate Company in Account autoname
 2016-05-14 13:10:42 +05:30
kressi
0179909db2 Merge branch 'develop' into docfix 2016-05-13 15:40:33 +02:00
kressi
472a84ab13 fixed broken links and links to content in different language 2016-05-13 15:22:22 +02:00
Umair Sayyed
e44d1430e1 fixes in domainification. Also reordered some fields in BOM 2016-05-13 18:31:20 +05:30
kressi
28737b6808 fixed formatting and punctuation 2016-05-13 14:37:42 +02:00
Umair Sayyed
90cea14ce3 domanifying EPRNext, fixes #5334 2016-05-13 18:06:17 +05:30
Umair Sayyed
99f7528578 domanifying ERPNext via #5334 2016-05-13 18:06:17 +05:30
Rushabh Mehta
9c6c0d2836 [patch] [fix] 2016-05-13 17:50:33 +05:30
kressi
e7c773310b fixed typos and inconsistencies 2016-05-13 13:20:25 +02:00
Rushabh Mehta
d774f40497 remove print in homepage 2016-05-13 16:21:37 +05:30
Nabin Hait
665568d87e ignore permissions while creating records from charts builder portal 2016-05-13 15:56:11 +05:30
Nabin Hait
a21f49dd94 Tax rate in chart of accounts 2016-05-13 15:56:11 +05:30
Nabin Hait
e4670a9a45 Cleaned up chart of accounts 2016-05-13 15:56:11 +05:30
Michael Kressibucher
c53df03262 fixed typo 2016-05-12 15:14:52 +02:00
Rohit Waghchaure
8904730cd4 [Fix] Removed is_pro_applicable 2016-05-12 18:03:08 +05:30
Rohit Waghchaure
a92560c851 [Fix] Warranty claim form, unexpected token illegal error 2016-05-12 16:30:56 +05:30
Rushabh Mehta
48c7658aee [minor] added set_value in domainify 2016-05-12 16:26:01 +05:30
Rushabh Mehta
4b9238a03b [cleanup] homepage 2016-05-12 15:23:17 +05:30
Nabin Hait
825070e504 Merge pull request #5331 from nabinhait/multi-fix-55 
Multiple fixes
 2016-05-12 12:27:42 +05:30
François
d9f7364289 Update make-field-visible-in-print-format.md 
Change a few typo
 2016-05-12 06:32:40 +02:00
Rohit Waghchaure
29c7876e87 [Fixes] RFQ minor fixes 2016-05-11 19:38:29 +05:30
Neil Trini Lasrado
0b1d7c032a Update manufacturing-settings.md 2016-05-11 16:47:55 +05:30
Rushabh Mehta
d42167e0e5 [cleanup] remove Features Setup 2016-05-11 16:47:14 +05:30
Rushabh Mehta
2dd0581134 [added] domainify.py 2016-05-11 15:14:15 +05:30
Anand Doshi
19fec06366 [fix] Validate Company in Account autoname 2016-05-11 13:27:18 +05:30
Nabin Hait
b81ed45b2b fixed conflict 2016-05-11 12:52:31 +05:30
Nabin Hait
a1fcded0ba bumped to version 6.27.17 2016-05-11 13:13:39 +06:00
Nabin Hait
719504a0fe Merge pull request #5325 from nabinhait/return_fix_2 
In Purchase Return entry, make sle and gle as per actual inward entry's valuation rate
 2016-05-11 12:38:58 +05:30
Nabin Hait
b3a0e05bae included path fixed in report print formats 2016-05-11 12:38:11 +05:30
Nabin Hait
a1ec7f1eed Add root account 2016-05-11 12:38:11 +05:30
Nabin Hait
1997350364 [fix] Divisional loss in purchase receipt 2016-05-11 12:06:29 +05:30
IAGAdmin
63b33d0478 Update concepts-and-terms.md 2016-05-11 09:43:10 +08:00
Rushabh Mehta
d95b4a5c5b [minor] added beta for homepage 2016-05-10 17:46:28 +05:30
Anand Doshi
a3f20ae9e6 Merge pull request #5329 from KanchanChauhan/shoppingcart-cleanup 
Shopping Cart error messages issue resolved
 2016-05-10 17:35:02 +05:30
Kanchan Chauhan
1d79f350bc Shopping Cart error messages issue resolved 2016-05-10 17:19:47 +05:30
Nabin Hait
9b5a049fff Merge pull request #5327 from nabinhait/pp_tool 
[fix] Create Material Requests for All Required Qty via Production Planning Tool
 2016-05-10 17:18:38 +05:30
Nabin Hait
3323d06be0 Mode of Payment columns and filters added in sales/purchase register 2016-05-10 13:17:02 +05:30
Nabin Hait
43d75448ea [fix] Create Material Requests for All Required Qty via Production Plannign Tool 2016-05-10 12:57:24 +05:30
Rohit Waghchaure
6087fe178e [Enhancement] POS 2016-05-09 23:36:15 +05:30
Nabin Hait
a9c4c8fc31 In Purchase Return entry, make sle and gle as per actual inward entry's valuation rate 2016-05-09 17:34:47 +05:30
Anand Doshi
e00a20d99d Merge pull request #5284 from kickapoo/develop 
Add (optional) Country field to Buying.Supplier DocType (fixes #5223)
 2016-05-09 16:58:30 +05:30
Anand Doshi
969863541d Merge pull request #5323 from KanchanChauhan/shoppingcart-changes 
Shopping cart dropdown changes
 2016-05-09 16:57:08 +05:30
Anand Doshi
c2ade3d34f Merge pull request #5298 from neilLasrado/sal-slip 
Moved email salary slip to employee under HR Settings
 2016-05-09 16:56:51 +05:30
Neil Trini Lasrado
b2b0b37cc1 Added reference_doctype and reference_name to link Bulk Email to Salary Slip 2016-05-09 13:24:31 +05:30
Kanchan Chauhan
b3573a881e Shopping cart dropdown changes 2016-05-09 12:30:58 +05:30
Nabin Hait
332d29f166 Merge branch 'master' into develop 2016-05-06 16:13:35 +05:30
Nabin Hait
42800d24cc bumped to version 6.27.16 2016-05-06 16:43:34 +06:00
Nabin Hait
845a980a79 Merge pull request #5320 from nabinhait/return_fix_1 
[fix] In purchase return entry, consider outgoing rate for serialized items
 2016-05-06 16:09:55 +05:30
Nabin Hait
e67c1cdf12 [fix] In purchase return entry, consider outgoing rate for serialized items 2016-05-06 15:46:31 +05:30
Nabin Hait
8704bead49 [fix] Validate returned serial nos and batch nos with original document 2016-05-06 15:30:10 +05:30
Valmik
5fb86ce570 Minor link fix 2016-05-06 12:06:40 +05:30