Rushabh Mehta
cca33b2ff0
[cleanup]
2016-07-11 13:01:58 +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
Rohit Waghchaure
e94d18b4cd
Rename Time Sheet doctype
2016-07-06 20:38:50 +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
Anand Doshi
3177138655
[fix] moved disable setup wizard access to frappe
2016-07-05 21:34:21 +05:30
Saurabh
51f66efc7a
[minor][fix] set transactions_exist on load of company
2016-07-04 13:06:29 +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
Kanchan Chauhan
9116a84969
Enable shopping cart by default during company creation in setup
2016-06-30 15:02:26 +05:30
Anand Doshi
0e4119b2de
[fix] use get_domains to prevent mutation of nested dictionary
2016-06-28 21:37:28 +05:30
Saurabh
93d68ac0c2
[fixes] change is group to check box
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
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
d9131ec4ff
[minor][fix] remove website generator call on after rename
2016-06-27 12:25:05 +05:30
Rushabh Mehta
723cd64249
[fix] tree view hooks and patch fix
2016-06-25 18:30:03 +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
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
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
a4a3b022ee
[fix] return route from make_route of child class
2016-06-25 10:43:02 +05:30
Rushabh Mehta
a334062b03
[redesign] website routing system
2016-06-24 16:18:07 +05:30
Rushabh Mehta
8a065e0028
[rename] Bulk Email to Email Queue
2016-06-22 12:58:39 +05:30
Rushabh Mehta
d1eba515e9
[cleanup] fixes to v7
2016-06-13 17:47:13 +05:30
Rushabh Mehta
e0686b32f3
[minor] cleanups
2016-06-10 12:38:52 +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
29d85b0ab8
test case fixed
2016-06-01 12:54:26 +05:30
Nabin Hait
f169e5c04d
Ignore permissions for account/warehouse creation from Company
2016-05-30 12:15:36 +05:30
Nabin Hait
310d64d565
Fixed conflict
2016-05-26 16:10:02 +05:30
Nabin Hait
8ed2f87480
Update company.py
2016-05-25 20:06:24 +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
Nabin Hait
ca90963d5b
Redesigned budgets
2016-05-23 13:04:26 +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
d112417301
[hotfix] setup wizard access
2016-05-20 15:12:45 +05:30
Rushabh Mehta
d0cee1b61b
[fix] minor fixes to pos
2016-05-20 12:54:59 +05:30
Nabin Hait
563bd056d7
Merge branch 'master' into develop
2016-05-20 12:18:28 +05:30
Saurabh
dc16b7e34a
[fixes] Reset on change of transaction
2016-05-19 12:26:40 +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
Rushabh Mehta
3a87c479c7
Merge pull request #5346 from umairsy/domains
...
Domainifying
2016-05-16 12:02:51 +05:30
Umair Sayyed
e44d1430e1
fixes in domainification. Also reordered some fields in BOM
2016-05-13 18:31:20 +05:30
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
Nabin Hait
665568d87e
ignore permissions while creating records from charts builder portal
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
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
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
Kanchan Chauhan
239b351367
New look to the website
2016-05-02 11:43:44 +05:30
Anand Doshi
a6f48688bc
[enhancement] website: optionally show products as list
2016-04-22 19:10:49 +05:30
Kanchan Chauhan
11638ba358
Changes 3
2016-04-20 16:24:25 +05:30
Rushabh Mehta
86a824c767
[ux] added opening stock and rate in new Item
2016-04-15 16:44:44 +05:30
Rushabh Mehta
a305c29b0e
[cleanup] remove is_pro_applicable
2016-04-15 15:03:16 +05:30
Umair Sayyed
72534deea2
removed Is Sales Item and Is Purchase Item
2016-04-15 12:57:00 +05:30
Nabin Hait
972c25f78d
Fixed conflict
2016-04-14 18:25:53 +05:30
Neil Trini Lasrado
7b46e5148a
Fixed setup wizard
2016-04-08 17:28:44 +05:30
Anand Doshi
1a0d32cdfb
[fix] [minor] Learn link in welcome to ERPNext
2016-04-07 16:28:01 +05:30
Rushabh Mehta
78b7a53635
[cleanup] set default bold, print_hide for prints
2016-04-06 15:29:45 +05:30
Nabin Hait
adddf6f471
[fix] Test cases
2016-04-01 16:47:46 +05:30
Rushabh Mehta
acf28af19c
[fix] set default depreciation accounts and test fix
2016-03-31 15:04:06 +05:30
Rushabh Mehta
c78b3110b5
[enhancement] configurable portal menu;
2016-03-30 12:29:48 +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
DrTrills
6e9c8916c0
Update quotes.py
...
Added a fun fact to change it up
2016-03-23 18:27:34 -04:00
Nabin Hait
24f1c50dca
Create sample Material Requests via setup wizard only if warehouse exists
2016-03-17 19:14:53 +05:30
Nabin Hait
653f68d2e4
[fix] delete company transactions
2016-03-11 17:36:57 +05:30
Anand Doshi
4284fcf2a6
[fix] additional fixes for removal of Fiscal Year form Holiday List
2016-03-11 17:16:30 +05:30
Anand Doshi
b015f9eca2
[fix] [hot] web form fixtures - removed Contact, added Issues and Addresses
2016-03-10 12:40:10 +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
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
shreyas
6f8dfa4c8d
[Minor] Fix print settings for custom print format
2016-03-07 18:22:40 +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
rohitwaghchaure
4151e3dc92
[enhancement] Multi-lingual print format
2016-03-01 16:33:08 +05:30
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
Neil Trini Lasrado
3c0d5cbab5
Fixes in Setup Wizard
2016-02-24 18:02:08 +05:30
Kanchan Chauhan
0d6db633f7
Added pagination to Products web page
2016-02-24 17:29:25 +05:30
Anand Doshi
acd1bcffde
[fix] changed field type to Code
2016-02-24 12:38:08 +05:30
saurabh
64ec677cf7
deleted extra doctype
2016-02-24 01:07:49 +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
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
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
Nabin Hait
ddcd8c58bf
minor fix
2016-02-19 16:09:11 +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
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
Anand Doshi
9a933788be
[cleanup] Compact Item Print
2016-02-16 15:30:17 +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
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
c83802fae1
[fix] Setup Wizard: use correct customer, supplier name in create contact. Fixes #4804 .
2016-02-16 13:30:17 +05:30
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
4fcf7bf01a
[minor] Setup Wizard sample data: Clear Fiscal Year Error message
2016-02-10 14:35:48 +05:30
Anand Doshi
247a8eedce
[minor] fix add_comment
2016-02-10 13:17:40 +05:30
Rushabh Mehta
060f32d452
[fix] [minor] reset naming series in delete_company_transactions.py
2016-02-08 17:57: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
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
92c6c617de
[fix] Remove filters on item group in territory and sales person target settings
2016-02-04 17:22:57 +05:30
Nabin Hait
afb8ec9cb6
[fix] Validate company abbr
2016-02-01 15:55:09 +05:30
Rushabh Mehta
bad13369d4
[minor] added abbreviate function in company
2016-01-27 18:58:21 +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
Rushabh Mehta
34fb5cf0e2
[fix] make setup_wizard.create_bank_account multi-company safe
2016-01-18 12:35:24 +05:30
Saurabh
cbebb4b8ba
[fixes] code cleanup
2016-01-12 14:13:35 +05:30
Rushabh Mehta
659bc1aca4
[minor] fixes reported on support
2016-01-12 11:57:25 +05:30
Rushabh Mehta
5dfd1d48fa
[minor] disabled in terms and conditions, fixes #4602
2016-01-12 10:29:29 +05:30
Rushabh Mehta
5facb60bbe
[fix] cleanup old style js in email digest
2016-01-11 10:37:20 +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
03e7e581d8
[minor] removed Communication table
2016-01-06 13:23:45 +05:30
Nabin Hait
ea8bc8ecb0
Chart of accounts added for Singapore and some other fixes
2016-01-06 12:32:48 +05:30
Rushabh Mehta
e64fbd6d3c
[minor] fixes for chart_of_accounts_builder app
2016-01-04 18:11:21 +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
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
Nabin Hait
82a1561120
[fix] Create bank accounts from setup wizard #4546
2015-12-30 15:32:57 +05:30
Neil Trini Lasrado
49febea6f5
Added education as a domain in Company
2015-12-24 15:10:35 +05:30
Anand Doshi
542782e400
[fix] delete lead addresses in delete company transactions
2015-12-15 15:17:04 +05:30
Anand Doshi
8ee5498fe0
[fix] delete lead addresses in delete company transaction
2015-12-15 13:14:38 +05:30
Nabin Hait
2164595933
[fix] Ignore permissions while creating sms logs
2015-12-10 18:09:57 +05:30
Rushabh Mehta
a5cf8a86c1
[minor] lang fixes for email digest
2015-12-10 10:38:46 +05:30
Nabin Hait
0f5d97a156
[fix] Get exchange rate as 1 if same currency
2015-12-04 16:47:34 +05:30
Rushabh Mehta
7909102edd
[minor] system settings in setup wizard moved to frappe
2015-11-30 15:12:45 +05:30
Rushabh Mehta
d6c5235d58
[minor] [translation] fix #4343
2015-11-30 11:33:01 +05:30
Rushabh Mehta
9785cd35dc
[minor] quote optional in email digest
2015-11-27 14:50:15 +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
Anand Doshi
7221805587
[fix] Changed Country fieldtype to Link in Web Form
2015-11-23 19:20:51 +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
Rushabh Mehta
d962d1c96f
[minor] remove feedback line from digest
2015-11-18 10:53:03 +05:30
Anand Doshi
da79740cdf
[fix] injection
2015-11-17 18:27:50 +05:30
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
Anand Doshi
1ed82834ce
[fix] re-make setup wizard slides on change of language
2015-11-16 12:58:14 +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
ca5b593e38
[hotfix] setup wizard tax rate
2015-11-12 20:00:50 +05:30
Anand Doshi
6303f84d45
[minor] fix test case
2015-11-12 18:11:58 +05:30
Rushabh Mehta
37b4d75e4a
[re-org] setup wizard in frappe
2015-11-12 11:45:47 +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
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
bd4814fbb7
[fix] email digest periods for weekly and monthly
2015-11-03 16:55:33 +05:30
Nabin Hait
915778fb69
[fix] Clear addressed and contacts on a new form
2015-10-30 14:43:13 +05:30
Anand Doshi
c39cef363c
[fix] stop welcome video if user moves to another page
2015-10-29 18:37:17 +05:30
Anand Doshi
7dab3c1f85
Show Welcome to ERPNext after completing Setup Wizard
2015-10-29 15:32:00 +05:30
Anand Doshi
21e09a2bd8
[enhancement] Ability to disable an Item
2015-10-29 12:39:47 +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
13a65d52dd
Merge pull request #4226 from nabinhait/email_digest
...
[fix] Events in Email Digest
2015-10-26 14:47:09 +05:30
Nabin Hait
23bd21778e
[fix] Events in Email Digest
2015-10-26 14:14:09 +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
e6791ee78e
[fix] digest values in absolute
2015-10-23 10:39:46 +05:30
Anand Doshi
9a2a6d8fcb
[hotfix] setup wizard is_pro_application if not service
2015-10-22 22:02:22 +05:30
Anand Doshi
58344cbb81
[hotfix] setup wizard is_pro_application if not service
2015-10-22 21:57:13 +05:30
Rushabh Mehta
2c867fdd73
[fix] email digest cache
2015-10-21 11:13:40 +05:30
Anand Doshi
3395e7a2e4
[fix] Daily digest date format
2015-10-20 08:48:43 +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
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
Rushabh Mehta
2e7f9d2b8f
[fixes] email digest
2015-10-15 16:31:16 +05:30
Anand Doshi
77760db89c
[fix] strip whitespace in setup wizard args
2015-10-15 12:54:40 +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
ee6862b277
[fix] VARCHAR lengths as 140
2015-10-14 17:28:35 +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
80d2a55342
[enhancement] add variants in website
2015-10-14 16:16:00 +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
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
Neil Trini Lasrado
58e9590850
Fixed issues with Permissions in Company Doctype
2015-10-13 17:45:43 +05:30
Neil Trini Lasrado
ec5deb6e48
Changed label in Company
2015-10-13 15:28:12 +05:30
Nabin Hait
ae92fc7f35
[fix] Create sample opportunity and quotation only if Customer exists
2015-10-03 13:42:44 +05:30
Nabin Hait
fbef1fdf3a
Minor fix
2015-10-02 16:26:18 +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
7f75dbf061
[cleanup] remove backup manager
2015-09-28 19:12:54 +05:30
Rushabh Mehta
72b1128467
[fixes] accounts controller add flt
2015-09-28 17:29:46 +05:30
Rushabh Mehta
b5ff9421e1
[optimize] customer outstanding query
2015-09-25 12:25:12 +05:30
Anand Doshi
06ad308ca1
[fixes] setup wizard and other fixes related to cart
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
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
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
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
Neil Trini Lasrado
949d7dbaba
Added validations, test-cases to Tax Rule
2015-09-15 15:41:00 +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
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
5d9cfc76cd
Don't copy title field in Duplicate
2015-09-11 15:35:26 +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
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
5a803d76ad
[fix] Bypass Root Not Editable validation from Setup Wizard
2015-09-10 13:20:35 +05:30
Nabin Hait
2377cdfa4e
Fixed conflict
2015-09-09 18:45:41 +05:30
Anand Doshi
888a70c2d4
[fix] Setup Wizard - the case of forgetting mute emails
2015-09-09 15:14:54 +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
3f1f2dd307
[fix] setup wizard - industry type
2015-09-08 15:53:53 +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
Anand Doshi
4df98d52c1
[fix] setup wizard - industry type
2015-09-07 10:11:23 +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
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
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
Rushabh Mehta
19e560e73f
[fix] dropbox backup check not working
2015-09-01 09:57:25 +05:30
Nabin Hait
76bb927337
Fixed conflict
2015-08-31 17:28:05 +05:30
Nabin Hait
6e439a5e53
Multi currency: test case and fixes
2015-08-28 19:24:22 +05:30
Anand Doshi
8b66f2a691
Exported all doctypes
2015-08-27 16:45:52 +05:30
Anand Doshi
282e4947fa
[fix] Changed more section label to 'More Information'
2015-08-27 13:11:46 +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
d999dd1bb9
[minor] fix setup wizard buying_items query
2015-08-24 14:23:55 +05:30
Rushabh Mehta
b52724f5b9
[minor] should fix #3884
2015-08-19 11:41:41 +05:30
thecarly
56f5156f3c
[minor] fixed typo
2015-08-10 12:50:44 +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
Nabin Hait
b24d2efc4b
[fix] Updated 'Include Holiday' in existing and default leave type records
2015-07-29 16:15:08 +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
Rushabh Mehta
92b6f76612
[fix] disable save in naming series
2015-07-29 15:17:30 +05:30
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