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 |
|
Anand Doshi
|
5ce287d611
|
Setup Wizard width fix for chrome
|
2014-05-14 13:31:11 +05:30 |
|
Anand Doshi
|
51ba6f816b
|
Fixed Setup Wizard
|
2014-05-13 21:02:47 +05:30 |
|
Anand Doshi
|
8fe0208fb6
|
Improved Item maker in Setup Wizard. Fixes #1501 and #1601
|
2014-05-13 16:52:26 +05:30 |
|
Rushabh Mehta
|
37f54f9a35
|
added description to letter head in setup wizard
|
2014-05-12 16:45:49 +05:30 |
|
Anand Doshi
|
02edae8fac
|
Added hook: setup_wizard_exception
|
2014-05-12 12:37:32 +05:30 |
|
Rushabh Mehta
|
2667a50334
|
clear cache before running setup wizard
|
2014-05-09 19:20:31 +05:30 |
|
Anand Doshi
|
78e9c6ef70
|
Deprecate Select fields with options as link:
|
2014-05-09 13:36:13 +05:30 |
|
Anand Doshi
|
f410bd9bf9
|
Better default permissions, ignore_restrictions for defaults, removed field trash_reason
Additions:
Account --> Material User: Read
Cost Center --> Sales User, Purchase User: Read
Mode of Payment --> Accounts User: Read
Supplier --> Material User, Accounts User: Read
Employee --> Employee: Restricted Read
Leave Type --> Employee: Read
Production Order --> Material User: Read
Sales Order --> Material User: Read
Print Heading --> All: Read
Terms and Conditions --> Purchase User, Material User: Read
Territory --> Material User, Maintenance User: Read
Item --> Sales User, Purchase User, Maintenance User, Accounts User: Read
Price List --> Manufacturing User: Read
Purchase Receipt --> Accounts User: Read
Warehouse --> Manufacturing User: Read
|
2014-05-07 17:20:42 +05:30 |
|
Nabin Hait
|
50e962b279
|
Special characters allowed in company name. Fixes #1259
|
2014-05-06 16:46:32 +05:30 |
|
Nabin Hait
|
b63384b3d4
|
Merge pull request #1588 from nabinhait/v4-hotfix
Allow Rename option added in multiple docs. Fixes #1521
|
2014-05-06 12:34:50 +05:30 |
|
Nabin Hait
|
02d37bbb5a
|
Allow Rename option added in multiple docs. Fixes #1521
|
2014-05-06 12:18:50 +05:30 |
|
Anand Doshi
|
de560aa094
|
Enable frequently used currencies. Fixes #1561
|
2014-05-06 12:02:23 +05:30 |
|
Anand Doshi
|
4ab5382d3f
|
Item Group delete permission, Serial No status and item code should be non-editable. Fixes #1564
|
2014-05-04 11:50:10 +05:30 |
|
Rushabh Mehta
|
24a3ec57e3
|
update to tests
|
2014-05-03 16:22:46 +05:30 |
|
Anand Doshi
|
f29bcaf436
|
Added new fixtures (Fixes #1540). Removed Employee Grade from HR.
|
2014-05-02 13:55:07 +05:30 |
|
Rushabh Mehta
|
a15164750d
|
started client side testing using selenium and other related and unrelated fixes
|
2014-04-30 19:39:13 +05:30 |
|
Anand Doshi
|
a47bf2ab66
|
Removed check for duplicate in sales bom, set default income account in Company
|
2014-04-30 18:54:05 +05:30 |
|
Rushabh Mehta
|
33003c6168
|
fix for feature setup in install.py
|
2014-04-30 11:16:02 +05:30 |
|
Rushabh Mehta
|
d21f55b5d2
|
fix in naming and feature setup on install:
|
2014-04-29 16:25:07 +05:30 |
|
Nabin Hait
|
17910aa0d6
|
Removed income and expense related info temporarily from email digest
|
2014-04-29 11:31:11 +05:30 |
|
Nabin Hait
|
985918d42b
|
Minor fixes in company and account
|
2014-04-28 17:08:28 +05:30 |
|
Anand Doshi
|
7f2d08b03f
|
Fixed Naming Series page loading fails #1524
|
2014-04-24 13:51:35 +05:30 |
|
Anand Doshi
|
78eeacb53c
|
Fixes in Lead, Opportunity, Quotation, Setup Wizard
|
2014-04-23 19:15:15 +05:30 |
|
Anand Doshi
|
f50a65294f
|
Fixed NameError handling
|
2014-04-23 13:41:28 +05:30 |
|
Anand Doshi
|
4bb87373dc
|
Fixed default website creation
Default website generation was creating company page twice,
which led to duplicate website route validation
|
2014-04-22 19:50:08 +05:30 |
|
Anand Doshi
|
3e41fd1fd3
|
List route for tree browser based doctypes; Fixes to add child in tree browsers
|
2014-04-22 18:55:21 +05:30 |
|
Rushabh Mehta
|
4ef1835bee
|
website updates
|
2014-04-22 16:52:35 +05:30 |
|
Anand Doshi
|
2944f49974
|
Setup Wizard: on country select, change date format, save logo in Website Settings > Brand HTML
|
2014-04-22 16:25:58 +05:30 |
|
Anand Doshi
|
07339fc69e
|
Fixes in Setup Wizard and Attachments
|
2014-04-22 15:30:24 +05:30 |
|
Rushabh Mehta
|
3f51705ba4
|
website cleanups
|
2014-04-21 22:10:43 +05:30 |
|
Anand Doshi
|
21ae930b4c
|
Removed controller.py
|
2014-04-21 15:12:50 +05:30 |
|
Anand Doshi
|
424c033395
|
Removed controller.py
|
2014-04-21 15:06:56 +05:30 |
|
Rushabh Mehta
|
40b2b03bcb
|
demo fixes
|
2014-04-21 13:43:35 +05:30 |
|
Rushabh Mehta
|
f63513ed38
|
minor fixes to website
|
2014-04-21 13:43:35 +05:30 |
|
Anand Doshi
|
cbbf451974
|
Fixes throw
|
2014-04-21 11:33:49 +05:30 |
|
Anand Doshi
|
5d591ebe83
|
Item, Item Group and Partner Web Page generators moved from Shopping Cart to ERPNext
|
2014-04-18 16:20:07 +05:30 |
|
Rushabh Mehta
|
603e6e21b5
|
test fixes
|
2014-04-18 16:17:29 +05:30 |
|
Rushabh Mehta
|
370a024e46
|
cleaned up sample website and separated fixtures by country
|
2014-04-18 16:00:41 +05:30 |
|
Rushabh Mehta
|
169c1fd93b
|
fixed translation for setup-wizard and removed purchase validation for Material Request #925
|
2014-04-18 10:40:17 +05:30 |
|
Anand Doshi
|
ac32bad25a
|
Fixes in Taxes, Quotation and Address Territory
|
2014-04-18 01:32:02 +05:30 |
|
Rushabh Mehta
|
52e618d0b2
|
updates to Setup Wizard, set language as first input
|
2014-04-17 18:50:33 +05:30 |
|
Rushabh Mehta
|
c38fc713c6
|
updated translations
|
2014-04-16 17:46:30 +05:30 |
|
Nabin Hait
|
13429a3b34
|
Space allowed in naming series
Conflicts:
setup/doctype/naming_series/naming_series.py
|
2014-04-16 15:24:04 +05:30 |
|
Rushabh Mehta
|
ff93802d58
|
more message fixes
|
2014-04-15 18:40:31 +05:30 |
|
Pratik Vyas
|
f37d6fe32b
|
Merge pull request #1514 from frappe/js-translate-refactor
JS translation refactor
|
2014-04-15 11:44:16 +05:30 |
|
Pratik Vyas
|
e1eeb22f1e
|
remove linebreaks for translation strings (js)
|
2014-04-15 10:50:36 +05:30 |
|
Rushabh Mehta
|
9f0d625300
|
update translation strings #1403
|
2014-04-14 19:20:45 +05:30 |
|
Pratik Vyas
|
b52618c142
|
frappe._ to __
|
2014-04-14 16:25:30 +05:30 |
|
Anand Doshi
|
13ae548ff6
|
Fixes for model-cleanup frappe/frappe#478
|
2014-04-10 18:43:07 +05:30 |
|
Anand Doshi
|
9fd50bcfb6
|
Fixed rest of the test cases frappe/frapp#478
|
2014-04-09 19:20:01 +05:30 |
|
Rushabh Mehta
|
322d39f3a6
|
Merge branch 'model-cleanup' of github.com:frappe/erpnext into model-cleanup
|
2014-04-07 15:09:25 +05:30 |
|
Rushabh Mehta
|
49f49ea603
|
started party frappe/erpnext#1503
|
2014-04-07 15:09:09 +05:30 |
|
Nabin Hait
|
e7885e3ee0
|
frappe/frappe#478 replaced doclist in testcases
|
2014-04-04 13:26:50 +05:30 |
|
Rushabh Mehta
|
a504f0638b
|
frappe/frappe#478, fixed list passed in
|
2014-04-04 12:16:26 +05:30 |
|
Rushabh Mehta
|
558a9aabfb
|
removed control panel
|
2014-04-04 12:00:36 +05:30 |
|
Nabin Hait
|
312ba99e71
|
frappe/frappe#478 fixes
|
2014-04-04 11:06:10 +05:30 |
|
Nabin Hait
|
365ae27acf
|
frappe/frappe#478 fixes
|
2014-04-03 17:38:54 +05:30 |
|
Rushabh Mehta
|
f14b809ab5
|
frappe/frappe#478, more changes, removed bean
|
2014-04-03 14:30:42 +05:30 |
|
Rushabh Mehta
|
f191f854cd
|
frappe/frappe#478 erpnext install works
|
2014-04-02 18:09:34 +05:30 |
|
Anand Doshi
|
943e614810
|
frappe/frappe#478
|
2014-04-02 16:37:35 +05:30 |
|
Anand Doshi
|
5b552b51f1
|
frappe/frappe#478
|
2014-04-02 15:03:35 +05:30 |
|
Rushabh Mehta
|
f2227d033c
|
frappe/frappe#478, removed instances of .fields
|
2014-03-31 23:37:40 +05:30 |
|
Rushabh Mehta
|
231f6a5b58
|
frappe/frappe#478 added test_records.json
|
2014-03-31 23:05:12 +05:30 |
|
Rushabh Mehta
|
0a0f2495a2
|
frappe/frappe#478, frappe tests pass, .txt renamed to .json
|
2014-03-31 17:27:06 +05:30 |
|
Nabin Hait
|
0e13cd5ac9
|
frappe/frappe#478
|
2014-03-28 17:01:32 +05:30 |
|
Nabin Hait
|
0d8d30e1cc
|
frappe/frappe#478
|
2014-03-28 16:57:21 +05:30 |
|
Rushabh Mehta
|
b385ecf65e
|
frappe/frappe#478
|
2014-03-28 16:54:45 +05:30 |
|
Anand Doshi
|
81ba0b29da
|
frappe/frappe#478
|
2014-03-28 15:23:26 +05:30 |
|
Anand Doshi
|
f78d1aee28
|
Replaced doc, doc.fields frappe/frappe#478
|
2014-03-28 13:55:00 +05:30 |
|
Anand Doshi
|
40534f076b
|
Changed creation, modified format frappe/frappe#478
|
2014-03-28 12:46:53 +05:30 |
|
Rushabh Mehta
|
daae743608
|
frappe/frappe#478
|
2014-03-27 17:54:18 +05:30 |
|
Rushabh Mehta
|
e88bc8b12a
|
frappe/frappe#478
|
2014-03-27 17:51:41 +05:30 |
|
Rushabh Mehta
|
d2b34dc30c
|
frappe/frappe#478
|
2014-03-27 16:12:56 +05:30 |
|
Rushabh Mehta
|
aa355af2cf
|
refactored client side Model and Meta - frappe/frappe#478
|
2014-03-26 18:24:30 +05:30 |
|
Nabin Hait
|
d6e4ab3fd4
|
maintenance schedule: validate amc dates and update in serial no
|
2014-03-26 10:23:27 +05:30 |
|
Nabin Hait
|
2c517e0a62
|
Fixes related to countrywise coa
|
2014-03-25 18:28:49 +05:30 |
|
Anand Doshi
|
7fbdba02ab
|
Fixed Countrywise Chart of Accounts patch
|
2014-03-25 13:50:52 +05:30 |
|
Nabin Hait
|
06a595090d
|
coa: minor fix
|
2014-03-21 18:30:46 +05:30 |
|
Nabin Hait
|
0c21e2afef
|
Is_pl_account and debit_or_credit field removed and added report_type field in account
|
2014-03-21 11:35:59 +05:30 |
|
Nabin Hait
|
eb1192771f
|
set root type from parent or child
|
2014-03-21 11:25:17 +05:30 |
|
Nabin Hait
|
037bf6b382
|
More country charts imported from openerp
|
2014-03-21 11:25:17 +05:30 |
|
Nabin Hait
|
b93ebaebe4
|
Added new account types and patch for existing
|
2014-03-21 11:22:41 +05:30 |
|
Nabin Hait
|
d7d9d25d71
|
Country and chart fields added in company master
|
2014-03-21 11:22:40 +05:30 |
|
Nabin Hait
|
813a93d78d
|
import chart records into database frm json
|
2014-03-21 11:22:40 +05:30 |
|
Nabin Hait
|
a69c30edec
|
country code added
|
2014-03-21 11:22:39 +05:30 |
|
Nabin Hait
|
d89f3403ac
|
charts of account doctype added and imported charts json from openerp
|
2014-03-21 11:22:39 +05:30 |
|
Nabin Hait
|
49a6f0754e
|
Removed debit_or_credit field
|
2014-03-21 11:22:38 +05:30 |
|
Nabin Hait
|
4d713ac5ba
|
sql injection fixes
|
2014-03-21 11:22:37 +05:30 |
|
Anand Doshi
|
eb7fea673b
|
Fixed set_single_defaults during install
|
2014-03-19 17:10:01 +05:30 |
|
Anand Doshi
|
76f330ca66
|
Fixed Fiscal Year input issue in Setup Wizard
|
2014-03-19 15:45:05 +05:30 |
|
Anand Doshi
|
2134d24b36
|
Removed cloud subscription logic
|
2014-03-14 15:24:57 +05:30 |
|
Anand Doshi
|
49e0a687b3
|
Minor Fixes
|
2014-03-13 20:44:28 +05:30 |
|
Rushabh Mehta
|
7c932003ed
|
rename Profile to User frappe/frappe#470
|
2014-03-11 16:15:59 +05:30 |
|
Anand Doshi
|
c379c78fec
|
Fixed Dropbox, Scheduler, 3to4 migration
|
2014-03-11 15:17:13 +05:30 |
|
Rushabh Mehta
|
d8de921c40
|
fixed erpnext/frappe#1441 and other pos related cleanups
|
2014-03-06 15:40:22 +05:30 |
|
Anand Doshi
|
e30511d315
|
Email Settings split into Outgoing Email Settings and Support Email Settings
|
2014-03-03 20:32:20 +05:30 |
|
Anand Doshi
|
f5794f1c07
|
Module Home Pages using Module View
|
2014-03-03 15:06:34 +05:30 |
|
Anand Doshi
|
e9baaa68e7
|
Changed frappe.conn to frappe.db
|
2014-02-26 12:35:33 +05:30 |
|
Anand Doshi
|
0936ae6dca
|
Fixed company web page creation
|
2014-02-25 16:21:50 +05:30 |
|
Rushabh Mehta
|
a6628eee56
|
rename sitemap to route
|
2014-02-25 11:08:37 +05:30 |
|
Rushabh Mehta
|
6fbda08583
|
fixed sitemap patch
|
2014-02-20 19:03:03 +05:30 |
|
Pratik Vyas
|
28da7523be
|
set single defaults after install
|
2014-02-19 20:53:45 +05:30 |
|
Nabin Hait
|
ce64afaa51
|
default value in single doctypes
|
2014-02-19 19:12:01 +05:30 |
|
Nabin Hait
|
32f168617c
|
default value in global defaults
|
2014-02-19 18:11:42 +05:30 |
|
Rushabh Mehta
|
e0e3f92019
|
fixed sales / accounts tree
|
2014-02-19 12:43:16 +05:30 |
|
Rushabh Mehta
|
793ba6bd37
|
-webnotes +frappe 💥
|
2014-02-14 15:47:51 +05:30 |
|
Nabin Hait
|
7979f7ed21
|
Field Rename: rate field mass replacement
|
2014-02-12 14:54:14 +05:30 |
|
Nabin Hait
|
a7f757a3f4
|
Rename fields: initial commit
|
2014-02-12 14:54:13 +05:30 |
|
Nabin Hait
|
436f526102
|
commonify get_item_details and rename fields to sync selling and purchase
|
2014-02-12 14:54:12 +05:30 |
|
Anand Doshi
|
93fdc670fe
|
Fixes in Test Cases
|
2014-02-11 14:40:21 +05:30 |
|
Anand Doshi
|
d7cc47e3ac
|
Do not validate Material Request against Sales Order, Moved Setup page to Framework
|
2014-02-10 17:39:12 +05:30 |
|
Anand Doshi
|
080b64a98f
|
Fixes in Sales Partner and Support Mails
|
2014-02-07 19:14:21 +05:30 |
|
Rushabh Mehta
|
22ababbec1
|
configs
|
2014-02-07 18:16:11 +05:30 |
|
Anand Doshi
|
7c34f1c472
|
Test Item Group
|
2014-02-07 14:52:14 +05:30 |
|
Anand Doshi
|
7bb9c3f125
|
Nested Set Test using Test Item group
|
2014-02-06 17:51:18 +05:30 |
|
Nabin Hait
|
a03f654446
|
Merge pull request #1382 from akhileshdarjee/4.0-hotfix
Newsletter can also be sent to employees
|
2014-02-06 16:02:39 +05:30 |
|
Anand Doshi
|
3decf4dbc5
|
Fixes related website hierarchy
|
2014-02-06 12:50:35 +05:30 |
|
Akhilesh Darjee
|
8f674fe0fb
|
minor changes
|
2014-02-03 17:47:50 +05:30 |
|
Akhilesh Darjee
|
abb3af7b30
|
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0-hotfix
|
2014-02-03 16:44:14 +05:30 |
|
Akhilesh Darjee
|
d6d2193f91
|
newsletter reload
|
2014-01-31 19:59:25 +05:30 |
|
Nabin Hait
|
8dc2c6a16c
|
Default accounts in company should not be copied
|
2014-01-30 17:00:09 +05:30 |
|
Akhilesh Darjee
|
86894f3bbf
|
merge conflict fixed
|
2014-01-27 15:42:02 +05:30 |
|
Anand Doshi
|
cb39e0878e
|
Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip
Conflicts:
config.json
erpnext/accounts/utils.py
erpnext/patches/patch_list.py
erpnext/stock/doctype/price_list/price_list.txt
erpnext/stock/doctype/warehouse/warehouse.py
portal/templates/sale.html
portal/utils.py
selling/doctype/sales_order/templates/pages/order.py
selling/utils/cart.py
selling/utils/product.py
utilities/demo/demo_docs/Fiscal_Year.csv
utilities/demo/make_demo.py
|
2014-01-24 21:44:36 +05:30 |
|
Nabin Hait
|
5ae6a61c4d
|
Fixes related to appifing shopping cart
|
2014-01-23 15:33:30 +05:30 |
|
Rushabh Mehta
|
f96bcf943b
|
added explicit delete perimssions
|
2014-01-20 17:52:13 +05:30 |
|
Nabin Hait
|
dc15b4fa8a
|
Fixed conflict while merging with develop brnach
|
2014-01-20 16:48:49 +05:30 |
|
Akhilesh Darjee
|
2a79b00700
|
minor fix
|
2014-01-15 11:54:05 +05:30 |
|
Akhilesh Darjee
|
5c96b75a68
|
fixed maintenance schedule
|
2014-01-02 17:54:12 +05:30 |
|
Anand Doshi
|
9a4a13cb73
|
Moved Portal and Shopping Cart to Shopping Cart app, and some minor fixes
|
2013-12-31 17:38:21 +05:30 |
|
Rushabh Mehta
|
c4a0ed63ef
|
Moved demo to separate app, moved patches folder
|
2013-12-27 17:30:24 +05:30 |
|
Rushabh Mehta
|
4ac68952e8
|
Moved patches and fixed method routing in pages
|
2013-12-27 13:43:40 +05:30 |
|
Anand Doshi
|
8e332ffd16
|
Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions
Conflicts:
erpnext/accounts/page/accounts_browser/accounts_browser.css
erpnext/controllers/buying_controller.py
erpnext/manufacturing/doctype/production_order/production_order.py
erpnext/patches/patch_list.py
erpnext/selling/doctype/customer/customer.txt
erpnext/selling/doctype/sales_order/sales_order.py
erpnext/selling/doctype/sales_order/test_sales_order.py
erpnext/setup/doctype/features_setup/features_setup.txt
erpnext/stock/doctype/stock_entry/test_stock_entry.py
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
startup/query_handlers.py
|
2013-12-26 19:12:51 +05:30 |
|
Rushabh Mehta
|
54047780fc
|
Merge with 3.3.8
|
2013-12-26 11:07:46 +05:30 |
|
Rushabh Mehta
|
df200f305b
|
Redesigned templates. Now all templates must be inside templates/pages templates/generators
|
2013-12-25 15:19:22 +05:30 |
|
Rushabh Mehta
|
3c68488873
|
Fixes to setup wizard
|
2013-12-24 18:51:49 +05:30 |
|
Rushabh Mehta
|
b63d550a70
|
Added Applications page and fixed issues in translations and hooks
|
2013-12-23 16:09:00 +05:30 |
|
Rushabh Mehta
|
c652a6254f
|
Rewrote hooks for scheduler, notifications, boot, session, login, webpage webnotes/wnframework#351
|
2013-12-16 12:48:38 +05:30 |
|
Rushabh Mehta
|
6de403f2be
|
added manifest, hooks and fixed requires webnotes/wnframework#351
|
2013-12-13 14:10:14 +05:30 |
|
Rushabh Mehta
|
1f84799f2d
|
install, web serving, session booting webnotes/wnframework#351
|
2013-12-12 19:12:19 +05:30 |
|
Rushabh Mehta
|
d2dd83c3a3
|
fixed template loader webnotes/wnframework#351
|
2013-12-12 13:57:58 +05:30 |
|
Rushabh Mehta
|
39bb8e2ed4
|
step 0: install
|
2013-12-11 15:32:14 +05:30 |
|
Rushabh Mehta
|
afea58b7a1
|
moved modules inside erpnext folder
|
2013-12-11 10:43:52 +05:30 |
|
Rushabh Mehta
|
2fa2f7178d
|
moved directory structure
|
2012-09-24 19:13:42 +05:30 |
|
Anand Doshi
|
1fc9ae2230
|
Fixes and Validations for nested doctypes
|
2012-09-24 14:00:59 +05:30 |
|
Rushabh Mehta
|
09d84b6575
|
Stock Ageing & release of Analytics
|
2012-09-21 19:46:24 +05:30 |
|
Anand Doshi
|
8bdfaa3438
|
msgprint fix, company abbreviation length validation
|
2012-09-19 12:41:06 +05:30 |
|
Anand Doshi
|
1953f04e68
|
added validation that abbreviation should not be more than 5 characters when creating company
|
2012-09-19 12:12:07 +05:30 |
|
Anand Doshi
|
d86e282eda
|
show only those bank/cash balances which have non-zero value
|
2012-09-15 22:42:45 +05:30 |
|
Anand Doshi
|
609b25bcdb
|
refactor email digest
|
2012-09-15 22:11:23 +05:30 |
|
Anand Doshi
|
f03e3bb06b
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-09-06 07:55:19 +05:30 |
|
Nabin Hait
|
d948e9b15c
|
reload doc before auto nification
|
2012-09-05 12:59:07 +05:30 |
|
Anand Doshi
|
b4ea4adeec
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
erpnext/setup/doctype/price_list/price_list.py
|
2012-08-31 16:56:44 +05:30 |
|
Anand Doshi
|
41cd5a68f4
|
autocommit for price list update
|
2012-08-31 13:57:22 +05:30 |
|
Anand Doshi
|
7b20428976
|
merged master
|
2012-08-16 17:10:39 +05:30 |
|
Anand Doshi
|
1467a059ed
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-08-16 17:09:37 +05:30 |
|
Anand Doshi
|
37b1b88710
|
fix in email settings: json.loads defaults to unicode string, hence encode string for smtp login
|
2012-08-16 17:09:13 +05:30 |
|
Anand Doshi
|
241437995f
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
erpnext/setup/doctype/company/company.txt
|
2012-08-10 12:58:48 +05:30 |
|
Anand Doshi
|
6810979dab
|
Company Form: do not hide 'Default Settings' section break for a new company, as it contains a mandatory field 'Default Currency'
|
2012-08-10 12:38:48 +05:30 |
|
Anand Doshi
|
0cedc1cc9c
|
removed reply_to while sending email in email digest
|
2012-08-08 10:54:11 +05:30 |
|
Rushabh Mehta
|
49dc5da0dc
|
refactor unicode changes and merge with master with refactored email
|
2012-08-03 16:02:24 +05:30 |
|
Rushabh Mehta
|
f0018b5e05
|
added unsubscribed fields in Lead and Contact and cleaned up sendmail function
|
2012-08-02 18:03:12 +05:30 |
|
Anand Doshi
|
dbe31be55c
|
deprecated bulk rename tool
|
2012-07-20 18:11:41 +05:30 |
|
Anand Doshi
|
76ec66dd65
|
fixes for unicode
|
2012-07-20 18:11:30 +05:30 |
|
Anand Doshi
|
1703cc89b4
|
fixes for unicode
|
2012-07-19 20:31:56 +05:30 |
|
Anand Doshi
|
486f9dfcec
|
added unicode_literals import at start of each file
|
2012-07-19 13:40:31 +05:30 |
|
Rushabh Mehta
|
4ae82ca0c2
|
users pages deprecated
|
2012-07-16 16:20:11 +05:30 |
|
Rushabh Mehta
|
2eef40bf1e
|
get_field > wn.meta.get_docfield
|
2012-07-16 14:16:57 +05:30 |
|
Rushabh Mehta
|
8cbbab2e75
|
Merge branch 'dev' of github.com:webnotes/erpnext into dev
|
2012-07-12 18:01:31 +05:30 |
|
Rushabh Mehta
|
357fb2640b
|
sales bom fixes and mandatory in table fields
|
2012-07-12 18:00:21 +05:30 |
|
Rushabh Mehta
|
4feae61b62
|
fixes to taxes and charges master and naming_series
|
2012-07-12 16:01:20 +05:30 |
|
Nabin Hait
|
70db682a9a
|
fixed conflict in setup control
|
2012-07-12 11:47:40 +05:30 |
|
Rushabh Mehta
|
5faf37f312
|
item group cleanup
|
2012-07-12 11:33:00 +05:30 |
|
Rushabh Mehta
|
cf969143f2
|
cleaned up customer group
|
2012-07-12 09:54:43 +05:30 |
|
Rushabh Mehta
|
b9fabf8e16
|
sales bom cleanup
|
2012-07-11 19:18:50 +05:30 |
|
Rushabh Mehta
|
cda9732f51
|
price list cleanup
|
2012-07-11 17:29:46 +05:30 |
|
Rushabh Mehta
|
3a0f191658
|
cleaned up fiscal_year, currency and added select-all + help in doclistview
|
2012-07-11 16:35:39 +05:30 |
|
Nabin Hait
|
3b0f5dddea
|
fiscal_year_closed and abbr removed from code
|
2012-07-11 15:14:06 +05:30 |
|
Rushabh Mehta
|
9acf463427
|
budget distribution cleanup and formatting of markdown
|
2012-07-11 14:39:33 +05:30 |
|
Rushabh Mehta
|
e3dd54c220
|
Merge branch 'dev' of github.com:webnotes/erpnext into dev
|
2012-07-11 13:19:36 +05:30 |
|
Rushabh Mehta
|
e57267f79a
|
added patch for account and cleanups to breadcrumbs and msgprint
|
2012-07-11 13:18:58 +05:30 |
|
Anand Doshi
|
45ec64a58e
|
fixes in outgoing email connection error handling
|
2012-07-11 12:06:38 +05:30 |
|
Anand Doshi
|
090a12d167
|
do not force send email using conf.py configuration
|
2012-07-10 15:15:46 +05:30 |
|
Anand Doshi
|
0f5e220d6c
|
Email Digest: New Transactions --> consider feed_type is null records only
|
2012-07-09 12:48:32 +05:30 |
|
Anand Doshi
|
af539fa5bd
|
deprecate import data control
|
2012-07-03 14:45:03 +05:30 |
|
Anand Doshi
|
d383e573fc
|
contact, address list views and allow their deletion from customer / supplier form
|
2012-07-02 19:45:35 +05:30 |
|
Anand Doshi
|
d4425cc57d
|
Merge branch 'master' into dev
Conflicts:
erpnext/support/doctype/maintenance_visit/maintenance_visit.py
|
2012-06-27 14:13:34 +05:30 |
|
Anand Doshi
|
74962a9213
|
auto create email digest after setup is completed
|
2012-06-26 12:47:14 +05:30 |
|
Anand Doshi
|
8ae5ba9abf
|
fixes related to --> clear locals and then sync locals when whole doclist is passed
|
2012-06-25 20:05:35 +05:30 |
|
Anand Doshi
|
b4aa0f8ce8
|
fix in price list: check if a row has content before checking its length; allow only 1 attachment
|
2012-06-22 10:56:12 +05:30 |
|
Anand Doshi
|
616c355d20
|
fix in todos and email settings
|
2012-06-14 16:46:48 +05:30 |
|
Anand Doshi
|
92fd9cce35
|
fixes in support ticket and email settings
|
2012-06-14 14:55:44 +05:30 |
|
Rushabh Mehta
|
4c56275d26
|
appframe is now heading
|
2012-06-14 11:05:09 +05:30 |
|
Anand Doshi
|
4f4f58293f
|
fix in item group on_trash
|
2012-06-12 17:03:09 +05:30 |
|
Nabin Hait
|
2e3579a4eb
|
Item Barcode implemented
|
2012-06-07 19:09:17 +05:30 |
|
Rushabh Mehta
|
0873e75fb2
|
better notification message
|
2012-06-07 11:00:33 +05:30 |
|
Rushabh Mehta
|
c91e16dd1e
|
email_digest updates
|
2012-06-06 11:27:38 +05:30 |
|
Rushabh Mehta
|
0b00b46a99
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-06-06 11:11:58 +05:30 |
|
Rushabh Mehta
|
260162db1b
|
email digest: mobile friendly
|
2012-06-06 11:11:35 +05:30 |
|
Anand Doshi
|
937d838bdc
|
min height for communication history and transaction history
|
2012-06-05 20:19:52 +05:30 |
|
Anand Doshi
|
dbb84a271e
|
Merge branch 'master' of github.com:webnotes/erpnext into comm_log
Conflicts:
erpnext/selling/doctype/lead/lead.js
erpnext/setup/doctype/contact_control/contact_control.js
|
2012-06-05 18:37:17 +05:30 |
|
Nabin Hait
|
f24d2efe2c
|
Parent node validation fixed for tree
|
2012-06-05 10:41:27 +05:30 |
|
Nabin Hait
|
0e4afb910b
|
parent node get_query modified in all tree
|
2012-06-04 10:32:31 +05:30 |
|
Anand Doshi
|
a6708fb748
|
new doctype: communication
|
2012-05-31 14:53:55 +05:30 |
|
Nabin Hait
|
0908b2709b
|
fixed conflict
|
2012-05-31 11:49:37 +05:30 |
|
Nabin Hait
|
5c1de3a639
|
fixed conflict
|
2012-05-31 11:47:09 +05:30 |
|
Nabin Hait
|
353bc313a6
|
Link to Sales/accounts browser fixed
|
2012-05-31 11:43:14 +05:30 |
|
Anand Doshi
|
82695ddd90
|
fixes in transaction history of customer and supplier
|
2012-05-29 14:14:27 +05:30 |
|
Nabin Hait
|
86df78aabc
|
fixed conflict
|
2012-05-23 11:33:28 +05:30 |
|
Nabin Hait
|
b695f73293
|
Maintain same rate throughout pur cycle: in global defaults, by default set true
|
2012-05-22 14:53:40 +05:30 |
|
Nabin Hait
|
86375f089a
|
Merge branch 'shf_rename'
Conflicts:
erpnext/patches/patch_list.py
|
2012-05-21 15:48:21 +05:30 |
|
Nabin Hait
|
d9742a6a58
|
on_trash modified for item group, territory, customer group, and sales person
|
2012-05-21 13:33:09 +05:30 |
|
Rushabh Mehta
|
6598b6276b
|
fixes to website settings and linking import data in setup
|
2012-05-14 15:02:35 +05:30 |
|
Rushabh Mehta
|
0eb790a0ae
|
cleaned up imports, doc
|
2012-05-11 15:53:37 +05:30 |
|
Rushabh Mehta
|
a920943e43
|
new cms with public folder
|
2012-05-07 18:00:57 +05:30 |
|
Anand Doshi
|
29d36a6cea
|
fixes in account setup
|
2012-05-04 16:20:30 +05:30 |
|
Anand Doshi
|
4b6c1f8de5
|
fixes in notification control due to renaming of doctype
|
2012-05-03 16:26:38 +05:30 |
|
Anand Doshi
|
359852e3d9
|
fix in email digest
|
2012-05-03 13:23:06 +05:30 |
|
Anand Doshi
|
57bc3f424f
|
fix in email digest
|
2012-05-03 12:57:56 +05:30 |
|
Anand Doshi
|
996abdd155
|
fix in email digest
|
2012-05-03 12:48:44 +05:30 |
|
Anand Doshi
|
e5982c0399
|
email digest fixes
|
2012-05-03 12:37:26 +05:30 |
|
Nabin Hait
|
926f46f04a
|
Fixed conflict while merging with master
|
2012-05-01 11:51:08 +05:30 |
|
Nabin Hait
|
d58da50f50
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-05-01 11:37:45 +05:30 |
|
Nabin Hait
|
41cc32790f
|
Fixed issie in auto notification
|
2012-04-30 14:36:18 +05:30 |
|
Anand Doshi
|
b60807c325
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-04-30 12:23:03 +05:30 |
|
Anand Doshi
|
c55d9ad033
|
working on setup account
|
2012-04-30 12:22:47 +05:30 |
|
Nabin Hait
|
ebbd328977
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-04-27 18:15:13 +05:30 |
|
Anand Doshi
|
f5216b46e3
|
fixes
|
2012-04-27 18:03:47 +05:30 |
|
Nabin Hait
|
914d67a1a3
|
selective deletes from child table while overwriting
|
2012-04-27 17:47:46 +05:30 |
|
Anand Doshi
|
3fbf2ec0c5
|
fix in setup control
|
2012-04-27 16:11:56 +05:30 |
|
Anand Doshi
|
1dac43159a
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-04-27 15:31:35 +05:30 |
|
Anand Doshi
|
1ed4ef1946
|
fixes in setup
|
2012-04-27 15:30:23 +05:30 |
|
Nabin Hait
|
a6b7886175
|
resolved conflict while merging with master
|
2012-04-26 13:02:36 +05:30 |
|
Nabin Hait
|
50c799880a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-04-26 12:47:30 +05:30 |
|
Nabin Hait
|
e6d808820a
|
Error fixed in notification control
|
2012-04-24 11:06:48 +05:30 |
|
Nabin Hait
|
a8d83b6c51
|
update modified date
|
2012-04-20 14:02:44 +05:30 |
|
Nabin Hait
|
f7c506d69e
|
fixed conflict while merging with master branch
|
2012-04-20 13:58:43 +05:30 |
|
Nabin Hait
|
e72ae2a19b
|
fixed conflict
|
2012-04-20 13:41:09 +05:30 |
|
Nabin Hait
|
239e79038f
|
Customer/customer group wise price list
|
2012-04-20 10:25:03 +05:30 |
|
Anand Doshi
|
7c67aad059
|
removed account_url from global defaults
|
2012-04-18 17:25:06 +05:30 |
|
Anand Doshi
|
619e16c956
|
removed account_url from global defaults
|
2012-04-18 17:17:02 +05:30 |
|
Anand Doshi
|
8d1a0b4061
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-04-18 16:08:15 +05:30 |
|
Anand Doshi
|
385380125b
|
fixes in customize form, naming series form loading
|
2012-04-18 16:04:02 +05:30 |
|
Nabin Hait
|
97051ba79f
|
allow negative stock field in global defaults
|
2012-04-18 12:51:11 +05:30 |
|
Rushabh Mehta
|
3a9ddaf2c1
|
permission engine bugfix
|
2012-04-18 12:34:18 +05:30 |
|
Nabin Hait
|
7afc2124a6
|
allow negative qty feature
|
2012-04-18 12:04:20 +05:30 |
|
Anand Doshi
|
acb3d56e02
|
fix in install docs
|
2012-04-17 11:39:18 +05:30 |
|
Nabin Hait
|
6c615d9527
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-04-13 14:14:39 +05:30 |
|
Nabin Hait
|
7fca9e617d
|
fixes in global defaults
|
2012-04-13 12:18:06 +05:30 |
|
Anand Doshi
|
09e8c4cd2d
|
further fixes
|
2012-04-12 17:51:53 +05:30 |
|
Nabin Hait
|
c594bbcae0
|
address html issue fixed
|
2012-04-11 17:14:45 +05:30 |
|
Anand Doshi
|
2424387651
|
fixes after sync testing
|
2012-04-10 19:14:37 +05:30 |
|
Anand Doshi
|
a9ccc7d6bd
|
naming series changes now saved as property setter
|
2012-04-10 15:31:48 +05:30 |
|
Anand Doshi
|
859cb72606
|
new favicon
|
2012-04-10 11:35:19 +05:30 |
|
Anand Doshi
|
87a2c5cc69
|
Merge branch 'master' of github.com:webnotes/erpnext into shf_rename
Conflicts:
erpnext/accounts/doctype/c_form/c_form.txt
erpnext/patches/patch_list.py
erpnext/setup/doctype/permission_control/permission_control.py
|
2012-04-09 12:14:53 +05:30 |
|
Anand Doshi
|
82042f1cff
|
fixes after sync
|
2012-04-06 17:54:17 +05:30 |
|
Anand Doshi
|
fa0cd89a7c
|
change from labels to fieldname in cur_frm.cscript
|
2012-04-05 13:03:35 +05:30 |
|
Anand Doshi
|
00ceafb42d
|
fix in fiscal year of email digest
|
2012-04-03 18:43:17 +05:30 |
|
Anand Doshi
|
fc8bf7b1d8
|
add select type link fields in permission control
|
2012-04-03 13:49:14 +05:30 |
|
Anand Doshi
|
5112b5b6b8
|
rerun of rename_dt
|
2012-04-02 19:12:29 +05:30 |
|
Anand Doshi
|
c88ae2be4d
|
rename dt second cut
|
2012-03-30 18:18:36 +05:30 |
|
Anand Doshi
|
fedfd89e4a
|
rename dt first cut
|
2012-03-30 12:29:06 +05:30 |
|
Anand Doshi
|
7ff696fb12
|
Merge branch 'renamedt' into shf_rename
Conflicts:
erpnext/patches/patch_list.py
|
2012-03-29 15:31:17 +05:30 |
|
Anand Doshi
|
fddb782a82
|
Merge branch 'renamedt' of github.com:webnotes/erpnext into renamedt
|
2012-03-29 15:28:16 +05:30 |
|
Anand Doshi
|
779a365420
|
fix in print hide of amount in words
|
2012-03-28 18:31:26 +05:30 |
|
Anand Doshi
|
a30fbd004e
|
merge of sync handler and sync_file_db - first cut
|
2012-03-27 19:31:38 +05:30 |
|
Anand Doshi
|
5f9501d4d8
|
Merge branch 'sync_file_db' into shf_merge
Conflicts:
erpnext/projects/doctype/project/project.txt
|
2012-03-23 14:51:35 +05:30 |
|
Anand Doshi
|
9b56a8ada9
|
Merge branch 'handlerupdate' into sync_handler_merge
Conflicts:
js/all-app.js
version.num
|
2012-03-23 13:55:20 +05:30 |
|
Nabin Hait
|
f88326ba3f
|
sync ref db
|
2012-03-22 15:07:05 +05:30 |
|
Anand Doshi
|
8463870a4f
|
Added Custom Scripts in setup page
|
2012-03-22 13:39:23 +05:30 |
|
Anand Doshi
|
71d0b2a428
|
permission engine fix - is doctype submittable
|
2012-03-21 17:15:49 +05:30 |
|
Nabin Hait
|
0ad2ef2111
|
sync with respect to file
|
2012-03-21 15:02:39 +05:30 |
|
Rushabh Mehta
|
f74ef4c64b
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-21 07:18:41 +01:00 |
|
Anand Doshi
|
986caee03d
|
clear item cache on update of certain docs
|
2012-03-20 17:30:31 +05:30 |
|
Anand Doshi
|
8347aad402
|
email settings separated from control panel
|
2012-03-20 14:54:25 +05:30 |
|
Rushabh Mehta
|
9b1afe197d
|
cleanup of form, rename, route, added fonts
|
2012-03-20 14:37:44 +05:30 |
|
Rushabh Mehta
|
ffe9d358e8
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-19 12:40:07 +01:00 |
|
Nabin Hait
|
16d9f4942a
|
Update erpnext/setup/doctype/manage_account/manage_account.txt
|
2012-03-19 15:48:08 +05:30 |
|
Nabin Hait
|
9aa3777ba6
|
Update erpnext/setup/doctype/sales_person/sales_person.txt
|
2012-03-19 15:21:30 +05:30 |
|
Nabin Hait
|
e5d99f5ed1
|
Update erpnext/setup/doctype/manage_account/manage_account.txt
|
2012-03-19 15:15:20 +05:30 |
|
Rushabh Mehta
|
052b7e4049
|
fixed list->new->onload hooks
|
2012-03-13 15:19:06 +05:30 |
|
Rushabh Mehta
|
b9878d01e1
|
style fixes
|
2012-03-12 16:12:09 +05:30 |
|
Rushabh Mehta
|
f81a64e57f
|
new listing and changed wn.widgets.listing to wn.ui.listing
|
2012-03-07 18:19:41 +05:30 |
|
Rushabh Mehta
|
0dd5da2299
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-06 18:41:52 +05:30 |
|
Rushabh Mehta
|
15da133de9
|
removed
|
2012-03-06 18:41:11 +05:30 |
|
Anand Doshi
|
2bc141f5db
|
fix in support ticket and email settings
|
2012-03-06 18:05:23 +05:30 |
|
Anand Doshi
|
bb64d302df
|
email digest fix
|
2012-03-06 11:42:32 +05:30 |
|
Rushabh Mehta
|
b9004bd6d0
|
doclist2
|
2012-03-05 18:28:33 +05:30 |
|
Anand Doshi
|
68fb2c9b19
|
fix in import error due to indentation issues in item_grou[
|
2012-03-01 18:20:31 +05:30 |
|
Anand Doshi
|
e90e35dcda
|
restoring contact control
|
2012-03-01 17:52:31 +05:30 |
|
Anand Doshi
|
0e140962b8
|
Fixes in support ticket overflow, desktop gradients and shadows, setup control fiscal defaults
|
2012-03-01 12:16:02 +05:30 |
|
Anand Doshi
|
fd5a213890
|
fix in account setup and user addition
|
2012-02-29 18:58:02 +05:30 |
|
Anand Doshi
|
0b8ac7fc68
|
fix in company setup
|
2012-02-29 18:33:39 +05:30 |
|
Anand Doshi
|
8049c27d78
|
Merge branch 'master' into navupdate
|
2012-02-29 16:22:30 +05:30 |
|
Rushabh Mehta
|
864a47933e
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
|
2012-02-29 15:11:27 +05:30 |
|
Rushabh Mehta
|
12852e73ab
|
added activity page
|
2012-02-29 15:11:06 +05:30 |
|
Anand Doshi
|
1304d97416
|
fix in import data page
|
2012-02-29 14:05:43 +05:30 |
|
Nabin Hait
|
41d6852218
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
|
2012-02-29 11:25:09 +05:30 |
|
Nabin Hait
|
a3eee118fc
|
Added on_trash function for checking link of the master
|
2012-02-29 11:24:55 +05:30 |
|
Rushabh Mehta
|
a38bbe28ce
|
home page fixes
|
2012-02-29 10:55:43 +05:30 |
|
Rushabh Mehta
|
17da764d04
|
modules_setup
|
2012-02-28 18:56:56 +05:30 |
|
Anand Doshi
|
f9e4b16731
|
fix in scheduler related import issue
|
2012-02-28 11:31:46 +05:30 |
|
Anand Doshi
|
0455ddfb98
|
Merge branch 'master' into navupdate
Conflicts:
version.num
|
2012-02-27 13:21:48 +05:30 |
|
Anand Doshi
|
ef041114bb
|
show submittable warning
|
2012-02-23 12:56:45 +05:30 |
|
Rushabh Mehta
|
3966f1dc5d
|
added license files
|
2012-02-23 12:35:32 +05:30 |
|
Rushabh Mehta
|
1a35574afe
|
redesigned scheduler
|
2012-02-23 11:46:28 +05:30 |
|
Rushabh Mehta
|
17773d0763
|
added docdiff and removed un-necessary files
|
2012-02-22 15:55:41 +05:30 |
|
Rushabh Mehta
|
c5471ddb8d
|
added setup and removed multi-col layout in body
|
2012-02-22 12:07:42 +05:30 |
|
Anand Doshi
|
0b3f4d40c4
|
fix in support ticket and email digest
|
2012-02-20 18:38:33 +05:30 |
|
Nabin Hait
|
db0df4fd53
|
over-wrinting of child tables data in import_data
|
2012-02-17 15:55:51 +05:30 |
|
Anand Doshi
|
e7ecb86ce7
|
roles for a new company's first user
|
2012-02-16 16:34:47 +05:30 |
|
Anand Doshi
|
aa92ecdd26
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-16 15:56:57 +05:30 |
|
Anand Doshi
|
8aa841866f
|
add Website Manager Role to first user
|
2012-02-16 15:56:36 +05:30 |
|
Rushabh Mehta
|
8425c87d5f
|
fixed old style file names
|
2012-02-16 13:01:28 +05:30 |
|
Anand Doshi
|
ec1af179cb
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-16 12:08:10 +05:30 |
|
Anand Doshi
|
f8395343f7
|
fix in password not copied to server database during company creation
|
2012-02-16 12:07:38 +05:30 |
|
Nabin Hait
|
da1f48b96e
|
mentioed account type for some tax/chargeable account
|
2012-02-16 10:55:05 +05:30 |
|
Anand Doshi
|
ec6f9fedd6
|
Fix in smtplib import issue
|
2012-02-14 13:54:04 +05:30 |
|
Nabin Hait
|
7eda1cac27
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-14 09:57:57 +05:30 |
|
Anand Doshi
|
ce0c65f173
|
Merge branch 'stable' into latest
|
2012-02-13 18:01:23 +05:30 |
|
Anand Doshi
|
5fe5df370f
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-13 17:57:45 +05:30 |
|
Anand Doshi
|
e8928b8bff
|
website settings
|
2012-02-13 17:56:59 +05:30 |
|
Rushabh Mehta
|
f17ce7bc67
|
added whitelist check
|
2012-02-13 16:50:52 +05:30 |
|
Nabin Hait
|
bd0c05bf94
|
Mentioned account type in default accounts
|
2012-02-13 14:48:34 +05:30 |
|
Anand Doshi
|
945b3c4680
|
Domain Name list in Website Settings
|
2012-02-13 14:04:54 +05:30 |
|
Nabin Hait
|
043b0f26bd
|
Merge branch 'stable' of github.com:webnotes/erpnext
|
2012-02-13 12:26:45 +05:30 |
|
Nabin Hait
|
bf0d92e125
|
deleted and disabled users excluded in applicable to and approver link fields
|
2012-02-13 12:22:08 +05:30 |
|
Anand Doshi
|
95e89de21d
|
Merge branch 'stable' into latest
Conflicts:
erpnext/home/page/event_updates/event_updates.js
|
2012-02-09 12:23:15 +05:30 |
|
Anand Doshi
|
3801804a8a
|
First Name and Last Name in setup account dialog box
|
2012-02-09 12:16:47 +05:30 |
|
Anand Doshi
|
67d2c8396c
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
version.num
|
2012-02-07 10:59:29 +05:30 |
|
Anand Doshi
|
e00e70841c
|
Merge branch 'stable' into latest
Conflicts:
erpnext/accounts/doctype/journal_voucher/journal_voucher.js
erpnext/accounts/doctype/payable_voucher/payable_voucher.js
index.html
version.num
|
2012-02-07 10:58:45 +05:30 |
|
Anand Doshi
|
d008964fd6
|
Fetch defaults in purchase common and sales common related doctypes and fix minor utf-8 issues
|
2012-02-07 10:48:11 +05:30 |
|
Rushabh Mehta
|
0a45f96c48
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-06 17:40:46 +05:30 |
|
Rushabh Mehta
|
28307193a1
|
item group txt
|
2012-02-06 17:40:37 +05:30 |
|
Rushabh Mehta
|
cc54fd46bc
|
website fixes
|
2012-02-06 13:09:08 +01:00 |
|
Rushabh Mehta
|
04048ff890
|
Merge branch 'stable' of github.com:webnotes/erpnext into latest
|
2012-02-06 07:12:43 +01:00 |
|
Anand Doshi
|
7e13f9b4b5
|
Fix in email digest due to unicode change
|
2012-02-06 11:41:25 +05:30 |
|
Rushabh Mehta
|
fd5005567b
|
Fix in setup role permissions
|
2012-02-06 06:34:04 +01:00 |
|
Rushabh Mehta
|
bc5ec4f19e
|
version
|
2012-01-30 14:02:41 +05:30 |
|
Rushabh Mehta
|
d6840b202a
|
added products + cleanups
|
2012-01-30 14:00:46 +05:30 |
|
Anand Doshi
|
e72de12993
|
Merge branch 'master' into latest
Conflicts:
index.html
version.num
|
2012-01-30 11:59:05 +05:30 |
|
Anand Doshi
|
69cfc5566a
|
Email settings check on save
|
2012-01-30 11:54:59 +05:30 |
|
Anand Doshi
|
327269fbc6
|
Check email settings while saving
|
2012-01-27 18:49:51 +05:30 |
|
Anand Doshi
|
6e174cc2c4
|
Merge branch 'master' into latest
Conflicts:
erpnext/setup/doctype/notification_control/notification_control.js
index.html
version.num
|
2012-01-25 17:21:14 +05:30 |
|
Anand Doshi
|
d194e6b5cf
|
Fix: show message if contact doesn't have email if notification control is enabled
|
2012-01-24 17:08:53 +05:30 |
|
Rushabh Mehta
|
865c00a79a
|
started website
|
2012-01-24 14:33:21 +05:30 |
|
Anand Doshi
|
cfdd827a84
|
Merge branch 'master' into latest
|
2012-01-23 14:09:50 +05:30 |
|
Anand Doshi
|
0529bc1e53
|
Doc's name in subject of auto notifications
|
2012-01-23 10:54:53 +05:30 |
|
Rushabh Mehta
|
764fdb942e
|
updated account url and js version
|
2012-01-20 12:07:56 +05:30 |
|
Anand Doshi
|
cb1f361461
|
Fix: Notify via email on new post on my company page
|
2012-01-12 13:46:46 +05:30 |
|
Anand Doshi
|
06d43bcfe2
|
Fix: Rounded Total appearing extra in Standard Print Format
|
2012-01-11 15:05:24 +05:30 |
|
Anand Doshi
|
a8c2f59d1b
|
Escape (') in customer name in authorization control
|
2012-01-11 12:07:48 +05:30 |
|
Anand Doshi
|
385299903d
|
Escape (') in customer name in authorization control
|
2012-01-11 12:03:47 +05:30 |
|
Anand Doshi
|
266829f024
|
Merge branch 'master' into stable
|
2012-01-10 13:59:14 +05:30 |
|
Anand Doshi
|
a0aa3d5605
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-01-10 13:59:04 +05:30 |
|
Anand Doshi
|
a9df960494
|
On Print Hide, hide net_total, rounded_total_export and grand_total_export
|
2012-01-09 16:55:30 +05:30 |
|
Nabin Hait
|
40de49110e
|
Removed webforms link from setup
|
2012-01-09 12:54:20 +05:30 |
|
Nabin Hait
|
b50c02214c
|
removed pur of service
|
2012-01-05 12:21:03 +05:30 |
|
Anand Doshi
|
5e57a39bb1
|
Merge branch 'master' into stable
|
2012-01-04 19:32:01 +05:30 |
|
Anand Doshi
|
f80f20f480
|
Changes in Notifications
|
2012-01-04 19:31:32 +05:30 |
|
Nabin Hait
|
15e8277a46
|
Dont update series starts from if no prefix
|
2012-01-04 16:23:09 +05:30 |
|
Nabin Hait
|
9d8e85c1f5
|
Dont update series starts from if no prefix
|
2012-01-04 16:17:18 +05:30 |
|
Anand Doshi
|
6ac1d4bb44
|
Merge branch 'stable' of github.com:webnotes/erpnext into stable
Conflicts:
erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
|
2012-01-03 11:45:11 +05:30 |
|
Anand Doshi
|
d56d57d205
|
Patch system changes, Inclusive Price feature and session cache clear on disabling user or on new login
|
2012-01-02 16:25:05 +05:30 |
|
Anand Doshi
|
62dbf27780
|
Merge pull request #192 from anandpdoshi/master
New transaction entries fix for email digest
|
2011-12-30 02:33:05 -08:00 |
|
Anand Doshi
|
34b9f5b1e0
|
Fix new transaction entries issue
|
2011-12-30 16:02:03 +05:30 |
|
Nabin Hait
|
6182b929bf
|
set default value as blank insead of None through manage account
|
2011-12-29 12:56:55 +05:30 |
|
Anand Doshi
|
ac20eb2107
|
Changes in Permission Manager to exclude doctype of 'Core' module and mark Profile as not in create
|
2011-12-23 13:50:28 +05:30 |
|
Anand Doshi
|
bd269cdbe7
|
Fix: Email digest gets deleted if even one is disabled.
|
2011-12-23 11:55:00 +05:30 |
|
Anand Doshi
|
f5d5f10ff3
|
Remove "Add Recipients" button from Email Digest (again!)
|
2011-12-22 19:02:15 +05:30 |
|
Anand Doshi
|
a4db9e9b5a
|
Merge pull request #175 from anandpdoshi/master
Added feature: Income Year To Date in Email Digest
|
2011-12-22 04:33:35 -08:00 |
|
Anand Doshi
|
61a4a498cf
|
Added feature: Income Year To Date in Email Digest
|
2011-12-22 18:02:36 +05:30 |
|
Anand Doshi
|
6d0be02364
|
Merge pull request #174 from anandpdoshi/master
Fixed issue: If account of type "Bank or Cash" is not associated to a GL Entry, then it displays an alert in the email digest email body
|
2011-12-22 04:06:35 -08:00 |
|
Anand Doshi
|
94a18109d7
|
Fixed issue: If account of type "Bank or Cash" is not associated to any GL Entry, then it displays an alert in the email digest email body
|
2011-12-22 17:34:11 +05:30 |
|
Anand Doshi
|
3ca92bb3e4
|
Merge pull request #173 from anandpdoshi/master
Dont show bank balance if no ledger of type "Bank or Cash"
|
2011-12-22 03:54:48 -08:00 |
|
Anand Doshi
|
7792d08408
|
Dont show bank balance if no ledger of type "Bank or Cash"
|
2011-12-22 17:23:11 +05:30 |
|
Nabin Hait
|
b9e8a41cd2
|
Account and cost center get_query changes for other charges table
|
2011-12-21 17:33:57 +05:30 |
|
Nijil Y
|
2c19960996
|
account conflict
|
2011-12-21 13:30:09 +05:30 |
|
Nabin Hait
|
da9e2e6898
|
Company master link in global defaults
|
2011-12-21 13:24:10 +05:30 |
|
Nijil Y
|
0f9eaeaa3c
|
updation Merge branch 'master' of git://github.com/webnotes/erpnext
Conflicts:
erpnext/projects/doctype/ticket/ticket.py
|
2011-12-21 12:34:13 +05:30 |
|
Nabin Hait
|
7c03cfad6a
|
Default Price List Currency fld added in Global Defaults
|
2011-12-20 18:50:41 +05:30 |
|
Nijil Y
|
8dd861bda5
|
Auto Indent creation when stock reaches re-order level
|
2011-12-20 17:17:51 +05:30 |
|
Nabin Hait
|
74fcb69b13
|
Error fixed in cust group
|
2011-12-20 11:48:27 +05:30 |
|
Anand Doshi
|
48d8d36b79
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-12-15 14:28:02 +05:30 |
|
Anand Doshi
|
7f18dd3b94
|
Patches for email digest and remove page break from defaults
|
2011-12-15 14:24:55 +05:30 |
|
Nabin Hait
|
b3081fafb6
|
Merge pull request #160 from nijil/master
Accounts Default Form Fix
|
2011-12-14 22:28:52 -08:00 |
|
Anand Doshi
|
21c649527a
|
Provides better error message to the user
|
2011-12-14 20:35:19 +05:30 |
|
Anand Doshi
|
e7982f0f85
|
Merge branch 'master' of github.com:anandpdoshi/erpnext
Conflicts:
erpnext/setup/doctype/email_digest/email_digest.py
|
2011-12-14 20:05:16 +05:30 |
|
Anand Doshi
|
ddf4c2655d
|
Resolved bug: if account of type 'Bank or Cash' does not exists, then it shows error in the email digest email but does not raise exception
|
2011-12-14 20:04:04 +05:30 |
|
Anand Doshi
|
3fe9795020
|
Resolved bug: if account of type 'Bank or Cash' does not exists, then it shows error in the email digest email but does not raise exception
|
2011-12-14 20:00:55 +05:30 |
|
Anand Doshi
|
ad42e558df
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-12-14 16:10:44 +05:30 |
|
Anand Doshi
|
ed73fb2b26
|
Fixed bug regarding setting of banner
|
2011-12-14 16:09:59 +05:30 |
|
Nijil Y
|
d18153e413
|
Account Default settings form fix
|
2011-12-14 15:28:51 +05:30 |
|
Anand Doshi
|
e47be26682
|
Merge pull request #159 from anandpdoshi/master
Commented print statement in email_digest.py
|
2011-12-13 23:07:30 -08:00 |
|
Anand Doshi
|
8875d91a8e
|
Commented print statement while inserting record in scheduler
|
2011-12-14 12:35:07 +05:30 |
|
Nabin Hait
|
9e4d5b9649
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-12-14 11:27:50 +05:30 |
|
Nabin Hait
|
3a2fcba15f
|
Purchase Discount option in Features Setup
|
2011-12-14 11:26:46 +05:30 |
|
Anand Doshi
|
17c1a7d9ed
|
Merge branch 'master' of github.com:webnotes/erpnext into edigest
|
2011-12-08 19:36:54 +05:30 |
|
Anand Doshi
|
633edbef46
|
Email Digest - ready to be deployed
|
2011-12-08 19:34:01 +05:30 |
|
Nabin Hait
|
cde8bec0a6
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-12-06 19:05:14 +05:30 |
|
Nabin Hait
|
38d24534d7
|
Recurring invoice checkbox added in features setup
|
2011-12-06 19:04:21 +05:30 |
|
Anand Doshi
|
590448aaef
|
Changes in email digest
|
2011-12-06 18:51:14 +05:30 |
|
Anand Doshi
|
41e542ce4d
|
Email Digest changes
|
2011-12-06 10:41:54 +05:30 |
|
Anand Doshi
|
adf2f777d3
|
Removed print format option. Instead show html code.
|
2011-12-05 12:16:31 +05:30 |
|
Anand Doshi
|
393f5e6078
|
Queries to get new records in a particular doctype
|
2011-12-02 19:20:10 +05:30 |
|
Anand Doshi
|
f10ad98ebf
|
Refactored queries to be more clean
|
2011-12-02 17:53:08 +05:30 |
|
Anand Doshi
|
7057cbf9e5
|
Started with email digest
|
2011-12-02 15:15:38 +05:30 |
|
Anand Doshi
|
ed825062f1
|
Hide programming error messages from user on update_security
|
2011-11-30 15:23:37 +05:30 |
|
Anand Doshi
|
6e5e30c420
|
Merge pull request #147 from anandpdoshi/master
Added Customize Form View and Print Formats to Setup Page
|
2011-11-23 04:35:20 -08:00 |
|
Anand Doshi
|
a04afc9b3b
|
Added Customize Form View (DocLayer) and Print Formats(docbrowser) to Setup Page
|
2011-11-23 13:51:52 +05:30 |
|
Nabin Hait
|
ed6b489715
|
filter property changed in address
|
2011-11-23 13:17:54 +05:30 |
|
Nabin Hait
|
3addd27f2c
|
Address is added in setup for deleting purpose
|
2011-11-23 13:11:15 +05:30 |
|
Nabin Hait
|
685564f71d
|
Resolved conflict after merging with master
|
2011-10-11 14:42:34 +05:30 |
|
Ravi Dey
|
24ef523cac
|
Issue fixed in setup control
|
2011-10-10 18:39:49 +05:30 |
|
Nabin Hait
|
da50c0859c
|
features by default on
|
2011-10-05 12:10:08 +05:30 |
|
Nabin Hait
|
b30c4a6611
|
Fieldname changed in Features Setup
|
2011-10-05 11:36:16 +05:30 |
|
Nabin Hait
|
525887fd8a
|
Error fixed in auth control
|
2011-09-27 17:00:01 +05:30 |
|
Nabin Hait
|
5941ae3b75
|
Default account creation order changed
|
2011-09-22 16:10:43 +05:30 |
|
Nabin Hait
|
e10900115e
|
updated company on_trash function
|
2011-09-16 15:50:45 +05:30 |
|
Rushabh Mehta
|
1e11cb486d
|
merging from master and usability fixes to setup
|
2011-09-14 13:25:10 +05:30 |
|
Rushabh Mehta
|
5f50617121
|
removed readme
|
2011-09-13 15:48:51 +05:30 |
|
Rushabh Mehta
|
8cf45175a7
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-09-08 14:17:41 +05:30 |
|
Rushabh Mehta
|
5ede3e8411
|
fixes to home (multiple loading)
|
2011-09-08 14:16:34 +05:30 |
|
Rushabh Mehta
|
66ac2b018a
|
first cut for lazy loading framework
|
2011-09-05 18:43:09 +05:30 |
|