Rushabh Mehta
1e8025b327
[cleanup] yes/no selects changed to checks in Item
2015-07-29 11:38:33 +05:30
Rushabh Mehta
49a59c075f
[minor] [setup-wizard] add check for sample data
2015-07-28 12:23:40 +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
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
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
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
Rushabh Mehta
7cfa5f0508
[fix] contact name in setup wizard
2015-07-23 12:39:44 +05:30
Nabin Hait
098760f0e2
[fix] SMS status and log
2015-07-22 12:17:48 +05:30
Rushabh Mehta
856ee10dc4
[enhancement] update to setup wizard, added users, employees, sample data
2015-07-17 15:03:18 +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
Rushabh Mehta
ea4d63cef3
[cleanup] removed welcome emails
2015-07-16 14:17:59 +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
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
Rushabh Mehta
94157334a7
[rename] Material User > Stock User
2015-07-13 15:06:12 +05:30
Neil Trini Lasrado
ed8cecbdd8
Sales BOM renamed to Product Bundle
2015-07-13 12:41:27 +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
Pratik Vyas
a0f2510b01
Change currency exchange rate api to fixer.io
2015-06-30 12:36:17 +05:30
Nabin Hait
bd9aa13db3
Minor issue in naming series
2015-06-17 15:09:40 +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
bb429745c0
[fix] Blank option in naming series
2015-06-09 18:59:51 +05:30
Nabin Hait
030ade428b
dont reset company on deleting company transactions
2015-06-03 11:24:37 +05:30
Rushabh Mehta
ed43f8015c
[lang] let locale be en in setup wizard (?)
2015-06-02 12:31:03 +05:30
Rushabh Mehta
cf29f6468d
[minor] add attachment to issue via portal:
2015-06-01 17:47:03 +05:30
Rushabh Mehta
a33d468d30
[fixes] portal, issues, addresses etc
2015-06-01 17:15:42 +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
Rushabh Mehta
4a4a6594d1
[minor] [refactor]
2015-05-29 15:56:40 +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
e2c200a91e
Make gl entry for rounded-off amount
2015-05-29 10:39:09 +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
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
Rushabh Mehta
f29a618b69
[email] [website] footer cleanup
2015-05-26 12:15:39 +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
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
e372fb11ea
naming series fix
2015-05-21 14:27:20 +05:30
Rushabh Mehta
9624bac3cf
[fix] create SMS Log
2015-05-20 15:48:58 +05:30
Rushabh Mehta
5495bc54a5
[enhancement] default terms in company, fixes #3231
2015-05-19 13:03:01 +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
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
0718292bfa
[minor] naming series not set message
2015-05-18 11:19:10 +05:30
Rushabh Mehta
8f96c39be6
[minor] setup wizard via error report
2015-05-12 11:32:25 +05:30
Rushabh Mehta
4439493232
[welcome-mails] add video links
2015-05-11 12:52:36 +05:30
Rushabh Mehta
3545575c8b
[jsonrates api] add from global defaults
2015-05-07 15:16:37 +05:30
Rushabh Mehta
66fa1ff878
[enhancement] automatic exchange rates via jsonrates
2015-05-07 12:26:09 +05:30
Nabin Hait
c91a9e5231
Delete company and company transactions are separate functions
2015-05-04 11:51:21 +05:30
Rushabh Mehta
5dbf8a7418
[cleanup] frappe.get_user
2015-05-01 11:51:26 +05:30
Rushabh Mehta
50ce9753e0
[minor] added cache in get_value
2015-04-27 13:13:50 +05:30
Rushabh Mehta
38c6b52770
[rename] group_or_ledger to is_group
2015-04-23 13:14:17 +05:30
Rushabh Mehta
e9bd77d674
[minor] fixes in welcome mails
2015-04-20 13:00:56 +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
Neil Trini Lasrado
28b0cc4d0b
fixes in offer letter
2015-04-08 12:28:21 +05:30
Anand Doshi
e4e112a6bc
setup wizard - don't send welcome mail
2015-04-07 11:03:58 +05:30
Anand Doshi
c399709789
fixes to test cases
2015-04-06 19:29:16 +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
432c12ad93
[fix] email account patch fix and minor setup wizard fix
2015-04-03 14:30:15 +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
54448aabd6
Setup wizard fixes
2015-04-02 15:39:44 +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
Rushabh Mehta
eb928b950f
[fix] journal entry 3 cols, default weekly digest
2015-03-25 17:34:20 +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
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
da5cfb1630
Exchange rate upto 9 decimals
2015-03-23 14:51:45 +05:30
Anand Doshi
2b2b639492
fixes
2015-03-20 14:29:23 +05:30
Anand Doshi
3353ad42bc
setup wizard bounce animation when working
2015-03-17 12:45:44 +05:30
Nabin Hait
7c9d003917
Test case cleanup and fixes
2015-03-13 08:14:46 +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
Anand Doshi
838ba02d34
setup wizard image fix
2015-03-10 19:15:49 +05:30
Anand Doshi
ecd2e0f386
Setup Wizard: catch duplicate entry error
2015-03-09 15:42:52 +05:30
Rushabh Mehta
0c677aa151
fix #2847
2015-03-04 12:32:59 +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
Anand Doshi
885e074697
Changed company name from Web Notes to Frappe Technologies
2015-03-03 14:56:43 +05:30
Rushabh Mehta
3384cb7e63
[fix] #2836
2015-03-02 16:20:23 +05:30
Rushabh Mehta
905f8328ab
cleanup global defaults, fix #2838 :
2015-03-02 13:01:39 +05:30
Nabin Hait
8be6939288
help description for party account
2015-02-26 12:31:07 +05:30
Rushabh Mehta
66a92792b4
[fix] default account for manufacturing stock entry should be cogs
2015-02-25 17:15:45 +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
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
d57e793bf3
[fix] Added unicode_literals if missing in py files
2015-02-24 12:24:53 +05:30
Nabin Hait
2b019ed430
Fixes for discount amount
2015-02-24 10:02:27 +05:30
Anand Doshi
f9fc04ce8e
Website Listing
2015-02-23 22:34:27 +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
e8a37949cf
[issue fixes] + added fixtures for item attribute and operation
2015-02-20 20:10:11 +05:30
Rushabh Mehta
813f0eda05
[form] section labels
2015-02-20 16:02:48 +05:30
Rushabh Mehta
50dc4e90e3
[cleanup] item grid views, removed desc etc
2015-02-19 20:05:45 +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
7c28fc4014
Merge branch 'v5.0' of https://github.com/frappe/erpnext into v5.0
2015-02-18 12:24:49 +05:30
Nabin Hait
e55def23af
Merge pull request #2745 from neilLasrado/time-log
...
activity type fixes
2015-02-18 11:21:25 +05:30
Rushabh Mehta
df9e80c87a
[refactor] stock entry, minor ux
2015-02-17 19:56:04 +05:30
Neil Trini Lasrado
744aec8def
activity type fixs
2015-02-17 16:12:32 +05:30
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
Nabin Hait
6f0a3ed8d4
fixed conflict
2015-02-17 11:12:04 +05:30
Rushabh Mehta
60cfccbf77
[new-module] crm
2015-02-17 10:36:54 +05:30
Rushabh Mehta
36b84408a8
[fixes] precision in purchase receipt and item group route
2015-02-16 18:26:38 +05:30
Anand Doshi
c82331bc19
[design] Setup Wizard
2015-02-12 20:02:17 +05:30
Nabin Hait
5690be103c
Replaced renamed total fields in code files
2015-02-12 16:09:11 +05:30
Nabin Hait
108e935744
minor fix in authorization rule
2015-02-11 12:24:45 +05:30
Anand Doshi
6dfd430a2f
Moved flags like ignore_mandatory, ignore_validate etc to doc.flags
2015-02-10 14:41:27 +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
Anand Doshi
e241569303
Allow non-english characters in Naming Series
2015-02-06 12:56:26 +05:30
Rushabh Mehta
a232c80d77
[share] add share permission
2015-02-05 15:52:58 +05:30
Rushabh Mehta
06fa46fafe
[fix] onshow > on_page_show
2015-01-29 18:09:11 +05:30
Nabin Hait
ecce5141eb
replaced budget distribution
2015-01-23 16:32:35 +05:30
Rushabh Mehta
5bceebc6a1
[fix] fixes birthday reminders #2021
2015-01-23 15:22:30 +05:30
Rushabh Mehta
81e972eac4
[cleanups]
2015-01-19 17:34:54 +05:30
Rushabh Mehta
0335005eea
[minor] added allow rename
2015-01-15 15:29:22 +05:30
Rushabh Mehta
5293aa7ca0
[ui] setup wizard
2015-01-15 12:07:02 +05:30
Nabin Hait
e8500ad4e6
Multiple fixes
2015-01-10 16:05:17 +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
4c36d7388c
[ux] fixed creation via tree views for Item Group etc
2015-01-01 15:59:34 +05:30
Rushabh Mehta
419ae33c3e
[merge] v5-design
2014-12-31 15:03:14 +05:30
Nabin Hait
54361e8651
fixed conflict while merging develop into v5
2014-12-31 13:24:36 +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
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
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
Neil Trini Lasrado
31a92bd9d9
company wise letter head feature added
2014-12-23 17:52:41 +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
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
Anand Doshi
ca2c297f72
[fix] In Setup Wizard, load languages from languages.txt
2014-12-18 17:31:21 +05:30
Nabin Hait
1b5afe737f
Fixes in authorization rule based on average discount
2014-11-28 16:59:32 +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
