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 |
|