Nabin Hait
6e9d2a3c1f
fixed conflict
2017-01-09 17:21:34 +05:30
Saurabh
f65e8de5a5
[fix] if terms exists then only call render_template
2017-01-07 08:18:10 +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
0dab40f4a1
Merge pull request #7377 from KanchanChauhan/naming-series
...
[Fix] Naming series issue
2017-01-04 15:44:00 +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
Kanchan Chauhan
0e8361d1de
[Fix] Naming series issue
2017-01-03 14:29:17 +05:30
Nabin Hait
ab42fc006f
Merge branch 'master' into develop
2017-01-02 17:26:55 +05:30
Nabin Hait
ceea71bcfc
Merge pull request #7365 from rohitwaghchaure/terms_and_condition
...
minor fix
2017-01-02 17:24:42 +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
Rushabh Mehta
2097ccfaea
[fix] item_group.py #7358
2016-12-30 06:09:41 +05:30
Rohit Waghchaure
249bc6167f
fix company issue
2016-12-28 00:20:08 +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
Nabin Hait
58291c77e9
Fixed version conflict
2016-12-23 17:43:42 +05:30
Nabin Hait
f573d43b90
fixed version conflict
2016-12-20 11:40:15 +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
99c814b360
[fix] paging for products (support)
2016-12-19 11:55:10 +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
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
a756d64fca
Chart of accounts for some countries, added test cases for each country
2016-12-14 18:40:29 +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
Kanchan Chauhan
f0b0db444d
Added Is Active to Sales Person
2016-12-12 19:12:41 +05:30
Kanchan Chauhan
b642625ed2
Jinja template in Terms and Conditions
2016-12-12 17:34:30 +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
ad4f1c7fd1
date is optional in get_exchange_rate
2016-12-09 12:14:47 +05:30
Nabin Hait
d249c76ce0
Merge pull request #7165 from KanchanChauhan/salary-component-type-in-new-signups
...
[Minor]Added type to Salary Components
2016-12-09 11:50:43 +05:30
Kanchan Chauhan
13f19993c5
[Minor]Added type to Salary Components
2016-12-08 17:50:15 +05:30
Nabin Hait
288a18e0cc
Fixes and patch for Currency Exchange based on date
2016-12-08 15:36:23 +05:30
Nabin Hait
87d70279c6
get exchange rate on change of date
2016-12-08 14:43:11 +05:30
Nabin Hait
1cc55fbbcb
Fixed merge conflict
2016-12-08 14:09:23 +05:30
Nabin Hait
5c18bd9b61
Fixed merge conflict
2016-12-06 16:16:58 +05:30
robert schouten
7f72cd0f97
[fix] email digest cache by frequency
2016-12-06 08:51:40 +08:00
Rushabh Mehta
323c06ebbf
[minor] rename icons as per FontAwesome 4 ( #7136 )
2016-12-05 14:17:26 +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
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
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
d194cce35c
fixed merge conflict
2016-11-23 14:55:23 +05:30
robert schouten
085706bcbf
[fix] naming series only show non disabled role doctypes
2016-11-23 13:57:21 +08:00
Rushabh Mehta
9872d8cdb5
Revert "[optimize] remove count(*) from queries"
2016-11-21 21:04:47 +05:30
Rushabh Mehta
5a258cbc2d
[optimize] remove count(*) from queries
2016-11-21 14:57:36 +05:30
Rushabh Mehta
fe816c3852
[fix] [wip] daily work summary
2016-11-18 12:40:18 +05:30
Nabin Hait
95e6ccd419
Merge branch 'master' into develop
2016-11-14 12:42:26 +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
Rushabh Mehta
13fc52d713
[minor] added default standard filters ( #6854 )
2016-11-07 17:19:19 +05:30
pratu16x7
a43639edb4
[fix] role fix for schools setup ( #6824 )
2016-11-05 10:09:53 +05:30
Nabin Hait
f5d8dd3b18
Fixed merge conflict
2016-11-04 16:54:53 +05:30
Rohit Waghchaure
0d2f7e62c0
set remember last selected value as true for company field
2016-11-03 16:19:34 +05:30
Rushabh Mehta
1aac956306
[minor] [fixes] can rename program and disable role on domainify
2016-11-02 07:33:18 +05:30
Rohit Waghchaure
7488cf1ce1
[Fix] country wise tax, country name issue
2016-10-28 18:01:43 +05:30
Saurabh
468e41f24f
[enhance] introduce ignore_fields param for _tree and get_query
2016-10-27 15:23:19 +05:30
Neil Trini Lasrado
5ddd7acdbd
Typo fix
2016-10-24 15:25:47 +05:30
Umair Sayed
a56775ce9a
Update domainify.py
2016-10-24 13:00:17 +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
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
Rushabh Mehta
b62ed7a603
[fix] install issue
2016-10-13 11:00:00 +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
Nabin Hait
cd9c45f816
Fixed merge conflict
2016-10-07 16:53:07 +05:30
Nabin Hait
ad8218e5ac
minor fix
2016-10-07 16:39:30 +05:30
shreyas
c1b7104126
[Fix] Minor changes to logic
2016-10-07 14:20:51 +05:30
shreyas
a1d7646e70
[Fix] Allow user to save Notification Control without selecting transaction
2016-10-07 12:58:58 +05:30
Rushabh Mehta
aedad64445
[minor] fixes
2016-10-04 11:41:42 +05:30
Nabin Hait
5fd5a77750
Fixed version conflict
2016-10-03 14:13:50 +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
Neil Trini Lasrado
84154f546a
Removed Website Roles from Install Fixtures
2016-09-29 11:36:55 +05:30
Rohit Waghchaure
17adb970f1
[Fix] Timesheet detail records not deleted with company transactions deletion
2016-09-29 01:07:28 +05:30
Nabin Hait
706612bcd4
Fixed version conflict
2016-09-26 18:11:56 +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
Rushabh Mehta
fc800b3f2f
[enhance] added roles for portal users frappe/frappe#2091 ( #6452 )
2016-09-23 21:51:51 +05:30
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
0be6073f10
Fixed version conflict
2016-09-21 13:06:19 +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
Rushabh Mehta
57a1905576
[minor] bring back old grid style in material request
2016-09-20 17:22:54 +05:30
RobertSchouten
8d43b32c2c
improvements to email digest ( #6323 )
2016-09-20 11:11:39 +05:30
Saurabh
9aacf46c51
[fix] minor fix to accomodate custom fields in tree popup
2016-09-19 16:45:35 +05:30
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
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
Rushabh Mehta
59dc0ece9f
[enhance] added Lead Source master, fixes #6231
2016-09-16 11:44:49 +05:30
Rushabh Mehta
769dda0874
[translation] [fixes] #5860
2016-09-15 15:17:04 +05:30
Nabin Hait
d5ebd79ad7
Fixed version conflict
2016-09-14 15:50:22 +05:30
Rushabh Mehta
3aa315040f
[fix] paging for item group
2016-09-11 16:48:24 +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
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
Rushabh Mehta
d973c1606a
[revert] is_sales_item, is_purchase_item back
2016-08-16 11:32:08 +05:30
Rushabh Mehta
ec2d09c557
[minor] setting up website optional in setup wizard
2016-08-09 16:44:37 +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
84306ccc4c
Salary component fixtures
2016-08-01 11:54:19 +05:30
Rushabh Mehta
859843687e
[minor] add abbr if missing
2016-07-26 08:23:32 +05:30
Rushabh Mehta
6c3ac9587e
[fix] quick entry
2016-07-25 15:03:39 +05:30
Rushabh Mehta
c9478fc4f1
[minor] setup website before domainify
2016-07-25 12:09:21 +05:30
Rushabh Mehta
20038ad2c9
[fixes] setup wizard and domainify for schools;
2016-07-21 16:01:59 +05:30
Nabin Hait
e6cdb01bea
[fix] Query for account fields in Company
2016-07-16 10:59:48 +05:30
Saurabh
6bc7b892c4
[fix] alter fieldtype for is_group from select to check
2016-07-14 14:06:28 +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
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
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
Nabin Hait
249bbbc56f
fixes during testing version 5
2014-11-26 15:35:39 +05:30
Nabin Hait
1897360e4b
Set default language as English in setup wizard
2014-11-24 15:25:13 +05:30
Rushabh Mehta
7d36875d6f
[refactor] address and contact list in customer, supplier, lead, sales person
2014-11-24 14:16:47 +05:30
Nabin Hait
707322adb9
Fixes for standard chart of accounts
2014-11-14 18:13:33 +05:30
Nabin Hait
4cd60d7d61
Included standard charts in json format
2014-11-12 14:29:44 +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
Rushabh Mehta
98ae5bd9db
[form] show website link for website generator
2014-10-31 14:28:47 +05:30
Nabin Hait
0822dcbde6
get query for bank/cash account
2014-10-30 15:54:40 +05:30
Nabin Hait
f5b94143dc
Minor fixes
2014-10-22 16:14:41 +05:30
Rushabh Mehta
be1a8d82c5
[merge] develop
2014-10-21 13:14:55 +05:30
Nabin Hait
531077e504
Strip company in setup wizard
2014-10-15 13:55:37 +05:30
Nabin Hait
3d3f0bcf54
Minor fix in setup wizard
2014-10-13 11:32:41 +05:30
Nabin Hait
997a7a1d3e
Test case fixes
2014-10-06 13:15:21 +05:30
Nabin Hait
36cf4a4708
Test case fixes
2014-10-06 13:15:02 +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
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
9ddc002d6a
country wise chart of accounts restructured
2014-10-06 13:01:58 +05:30
Nabin Hait
c68646c694
[merge] 4.x to 5.0
2014-10-06 12:57:48 +05:30
Nabin Hait
18ccc27b1b
Minor fix in naming naming series
2014-09-26 14:23:00 +05:30
Nabin Hait
778ff463af
Minor fix in authorization control
2014-09-19 11:39:47 +05:30
Nabin Hait
bbc3d015a3
Update authorization_control.py
2014-09-18 14:09:20 +05:30
Nabin Hait
4073880ecf
Escaped single quote in authorization control queries
2014-09-18 11:01:26 +05:30
Anand Doshi
a23151b138
Merge pull request #2202 from 81552433qqcom/develop
...
hotfix for project wise report and translation.
2014-09-16 15:23:34 +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
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
81552433qqcom
1db294e837
hotfix for project wise report
...
translation patch for email digest and support ticket.
2014-09-16 16:49:58 +08:00
Anand Doshi
30c5b41398
[minor] removed Suggest
2014-09-15 16:43:34 +05:30
Anand Doshi
fc33d5a75b
Set allow_on_submit for 'page_break', 'letter_head', 'select_print_heading', 'print_heading'. Fixes frappe/erpnext#1810
2014-09-09 15:25:43 +05:30
Anand Doshi
dc79334f1c
[fix] Clear website cache for Item Group on saving Item
2014-09-09 12:35:15 +05:30
Nabin Hait
c017ed251d
Merge pull request #2151 from ankitjavalkarwork/fix1999
...
Allow renaming for Sales Partner Doctype
2014-09-08 14:23:17 +05:30
Anand Doshi
65a5f85af5
Setup Wizard: set corrected number format in system settings
2014-09-05 17:27:25 +05:30
ankitjavalkarwork
ce9a9eeecc
Allow renaming for Sales Partner Doctype
2014-09-05 14:58:21 +05:30
Anand Doshi
f680626f53
[minor] send translations in response
2014-08-29 11:19:10 +05:30
Neil Trini Lasrado
9d1e8b61fe
[Fix] Issue #980 final
2014-08-25 19:04:30 +05:30
Neil Trini Lasrado
d676491b6e
Merge https://github.com/frappe/erpnext into item_group
2014-08-25 16:18:31 +05:30
Rushabh Mehta
52f04da5f5
[style] default website
2014-08-25 15:17:20 +05:30
Neil Trini Lasrado
caba531e89
[fix] issue#980
2014-08-25 13:22:15 +05:30
Rushabh Mehta
e8dd4160d4
[cleanup] remove allow_attach
2014-08-25 13:04:21 +05:30
Anand Doshi
def374370f
Merge pull request #2083 from geo-poland/basic-polish-language-support
...
Basic Polish language support
2014-08-25 12:48:33 +05:30
Nabin Hait
4417529952
Packing list visibility issue
2014-08-21 16:44:32 +05:30
Rushabh Mehta
cb067aa579
[route] refactor, wip
2014-08-20 11:44:30 +05:30
Rushabh Mehta
74bc2baa1d
remove website route, wip
2014-08-20 11:43:58 +05:30
Tytus
35142cb206
Add Polish language to setup wizard.
2014-08-19 15:51:36 +02:00
Anand Doshi
78b6366325
[fix] Error Reports
2014-08-19 12:20:48 +05:30
Anand Doshi
67d249eea9
[logic] Email Digest - use transaction/posting date
2014-08-12 12:45:23 +05:30
Anand Doshi
6b8145a813
[patch] Add currency Turkish Lira
2014-08-08 14:05:01 +05:30
Rushabh Mehta
995185d02d
[ux] fixed primary action
2014-08-08 11:51:23 +05:30
nabinhait
c1f65dd863
Validation: Account must belong to the same company
2014-07-31 11:40:40 +05:30
Anand Doshi
35cc320e21
[fixes] Leave Application and Toggle Rounded Totals
2014-07-30 17:00:26 +05:30
Anand Doshi
bc708ee4c2
[print] Disable rounded total
2014-07-29 22:24:31 +05:30
Anand Doshi
9c018fe984
[minor] Fixed address listing
2014-07-28 12:59:52 +05:30
Rushabh Mehta
3c78ab5841
[email digest] [fix] [hot] only open to-do items
2014-07-23 10:19:31 +05:30
nabinhait
b1e7bf16ba
Translate while creating India specific accounts
2014-07-19 17:56:43 +05:30
nabinhait
d4e080be29
Country mandatory in company master
2014-07-17 19:32:12 +05:30
nabinhait
fa1cd5faff
Fixed root type of liability accounts
2014-07-17 11:52:50 +05:30
Anand Doshi
e73ed2afae
Setup Wizard: fixed attachment issue #1940
2014-07-16 11:48:51 +05:30
Anand Doshi
1829bd84d3
hotfix: website_image
2014-07-14 14:26:42 +05:30
nabinhait
8e4fcca216
Get query fixes in address in contact listing. Fixes #1911
2014-07-09 12:50:50 +05:30
nabinhait
ff2cc1626e
Merge branch 'reapply-price-list' of github.com:anandpdoshi/erpnext into anandpdoshi-reapply-price-list
2014-07-08 15:30:25 +05:30
Anand Doshi
e729516af7
Minor fix
2014-07-07 15:54:11 +05:30
Rushabh Mehta
58692fe4d1
sales order status bugfix, add leading / in website_image and removed send_print_in_body_and_attachment
2014-07-07 12:29:43 +05:30
Anand Doshi
dffec8fb85
Reapply Price List on Change
2014-07-04 15:44:48 +05:30
Anand Doshi
d2f44006bd
Issues originating due to sql_mode='STRICT_ALL_TABLES'
...
Fixes frappe/frappe-bench#18
2014-07-03 14:32:21 +05:30
Nabin Hait
669e789bc3
Minor fix in authorization rule
2014-06-30 17:15:52 +05:30
Anand Doshi
8ac4643fd7
Merge pull request #1867 from nabinhait/v4-hotfix
...
Multiple fixes
2014-06-30 13:20:49 +05:30
Nabin Hait
4e4a83bcef
Fixes in maintenance schedule
2014-06-30 11:50:17 +05:30
Anand Doshi
11ada53ed5
Fixes related to Website Route system and other misc fixes
2014-06-28 12:13:11 +05:30
Anand Doshi
56198f40ac
Changed System Signature to Footer
2014-06-26 12:47:45 +05:30
Anand Doshi
7f41ff26fa
Fixes frappe/erpnext#1849
2014-06-26 12:02:55 +05:30
Nabin Hait
48f1142523
Fixed address deletion issue
2014-06-25 16:57:50 +05:30
Nabin Hait
379d86f9a3
sms sending issue fixed
2014-06-25 16:57:49 +05:30
Anand Doshi
d709f4dfdd
Naming Series property type as Text
2014-06-25 16:57:47 +05:30
Anand Doshi
daa56ca50f
Fixed number format in currency
2014-06-25 16:57:08 +05:30
Anand Doshi
14920b447c
Fixed Currency Exchange error
2014-06-25 16:57:04 +05:30
Nabin Hait
e9b95bbfe8
Fixed address deletion issue
2014-06-24 16:35:00 +05:30
Nabin Hait
65efd0a9a1
sms sending issue fixed
2014-06-23 18:21:37 +05:30
Anand Doshi
f0a1735ac8
Naming Series property type as Text
2014-06-20 20:19:51 +05:30
Anand Doshi
aecddefbc8
Fixed number format in currency
2014-06-18 20:55:39 +05:30
Anand Doshi
72a178a37e
Fixed Currency Exchange error
2014-06-18 12:14:17 +05:30
Rushabh Mehta
9f887b436c
fixes new routing, for frappe/frappe#600
2014-06-17 16:53:44 +05:30
Rushabh Mehta
5df521bad5
updated generators for wip-4.2
2014-06-17 14:21:26 +05:30
Nabin Hait
6a3e97a9f8
Merge pull request #1781 from anandpdoshi/hotfix
...
Reload sales taxes and charges in patch
2014-06-10 16:37:59 +05:30
Anand Doshi
7656377f3f
Show website route for generator via set_intro, fix in Support Email Settings
2014-06-10 15:48:37 +05:30
Nabin Hait
7425634692
minor fix in global defaults
2014-06-10 14:12:28 +05:30
Nabin Hait
7cba72a0b7
Pricing Rule: price / discount percentage can not be negative
2014-06-10 11:09:21 +05:30
Anand Doshi
edb9efd9a6
Fixed manifest and website
2014-06-09 15:11:18 +05:30
Rushabh Mehta
0739937fa2
bug: added empty class for sms settings
2014-06-05 18:15:00 +05:30
Rushabh Mehta
ba83e9cfbe
removed sms control and related cleanup, fixes frappe/erpnext#462
2014-06-05 17:56:42 +05:30
Rushabh Mehta
c22e11d483
added address template:
2014-06-05 16:01:55 +05:30
Anand Doshi
9a0f6f5bb4
Enable Scheduler in System Settings when Setup Wizard is completed
2014-06-04 17:48:57 +05:30
Anand Doshi
4985691617
Role and User Permissions
2014-06-04 17:48:54 +05:30
Anand Doshi
a8ce570635
Permission relogication continued
2014-06-04 17:48:53 +05:30
Anand Doshi
fab0904af7
Started permission relogication
2014-06-04 17:48:52 +05:30
Nabin Hait
bc7efa6da6
Parent account mandatory for all non-root accounts
2014-06-03 23:02:02 +05:30
Anand Doshi
32063bb472
Removed designation 'Director' owing to problems with Greek translation
2014-05-27 22:40:53 +05:30
Rushabh Mehta
9f399f139b
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-05-26 11:40:46 +05:30
Rushabh Mehta
3b0f026522
fix to sales parter
2014-05-24 12:04:13 +05:30
Anand Doshi
5468740042
Fixed setup wizard errors for chinese simplified
2014-05-23 09:21:55 +05:30
Anand Doshi
69e4b16817
Setup Wizard: clear cache on language change
2014-05-22 22:52:36 +05:30
Anand Doshi
d6007e7d9c
Hook: setup_wizard_success
2014-05-21 15:22:15 +05:30
Nabin Hait
177fb132b9
description added in setup wizard
2014-05-21 12:39:37 +05:30
Nabin Hait
4efc5d74d4
Setup Wizard: company abbr length validation on onchange trigger
2014-05-21 11:53:59 +05:30
Nabin Hait
44ae408b36
Income/expense info in email digest
2014-05-21 11:53:58 +05:30
Nabin Hait
0e6554edc1
Root Type field added in account and patch for existing accoutns
2014-05-21 11:53:58 +05:30
Nabin Hait
2e0620e370
Server side onload functionality in multiple docs
2014-05-19 18:15:58 +05:30
Anand Doshi
6664af9557
Fixed multilingual UOM issue
2014-05-17 00:07:45 +05:30
Nabin Hait
e60853930b
traslation issue fixed in setup wizard and desktop
2014-05-16 19:56:43 +05:30