Anand Doshi
|
414248b792
|
[fix] event creation on Contact Date
|
2015-08-26 17:56:55 +05:30 |
|
Nabin Hait
|
3f321ebfde
|
utilities/repost_stock file renamed to stock/stock_balance
|
2015-08-25 14:11:13 +05:30 |
|
Rushabh Mehta
|
81e9d4e8f5
|
[fix] changed text > text editor for description fields in tables
|
2015-08-19 13:00:03 +05:30 |
|
Nabin Hait
|
5b19dc3a5f
|
Note files deleted, shifted to frappe repo
|
2015-08-18 11:46:53 +05:30 |
|
Rushabh Mehta
|
907ea7dd8a
|
[minor] pincode label changed to postal code, #3770
|
2015-08-13 12:35:43 +05:30 |
|
Dominik
|
28eff7fb91
|
Phone removed from mandatory in Address
|
2015-08-10 20:22:21 +05:30 |
|
Nabin Hait
|
3c3a3ecea8
|
Additional Costs in Stock Entry
|
2015-08-10 14:07:45 +05:30 |
|
Rushabh Mehta
|
1e8025b327
|
[cleanup] yes/no selects changed to checks in Item
|
2015-07-29 11:38:33 +05:30 |
|
Nabin Hait
|
3cf67a462b
|
Cleanup and test cases for serialized item
|
2015-07-24 13:26:54 +05:30 |
|
Nabin Hait
|
1d21842f68
|
Sales / Purchase Return redesigned via negative DN / SI / PR / PI
|
2015-07-24 13:26:53 +05:30 |
|
Nabin Hait
|
098760f0e2
|
[fix] SMS status and log
|
2015-07-22 12:17:48 +05:30 |
|
Neil Trini Lasrado
|
09a66c4201
|
Fixed issue with Customer Contacts in Transaction Documents
|
2015-07-13 12:41:27 +05:30 |
|
Nabin Hait
|
fde13e666a
|
Merge pull request #3609 from rmehta/address-link
[fix] link address via owner, if created in portal #3540
|
2015-07-09 19:09:39 +05:30 |
|
Neil Trini Lasrado
|
5a6ff218e8
|
Allowed same contact to be Linked to Customer AND Supplier AND Sales Partner
|
2015-07-09 17:49:40 +05:30 |
|
Rushabh Mehta
|
f0737667c6
|
[fix] link address via owner, if created in portal #3540
|
2015-07-09 11:09:01 +05:30 |
|
Nabin Hait
|
5e3646ad6e
|
validation message fix
|
2015-07-08 14:39:03 +05:30 |
|
Nabin Hait
|
28a9e35de9
|
Validate item rate with reference document with tolerance 0.009
|
2015-07-08 13:10:59 +05:30 |
|
Nabin Hait
|
e06d01e3ed
|
Delete events via query instead of delete_doc function, to save time
|
2015-06-29 18:38:38 +05:30 |
|
Rushabh Mehta
|
a33d468d30
|
[fixes] portal, issues, addresses etc
|
2015-06-01 17:15:42 +05:30 |
|
Nabin Hait
|
3b0adc5246
|
[fix] ignore share permission while creating events on the background
|
2015-05-21 16:51:37 +05:30 |
|
Rushabh Mehta
|
9dd8aab211
|
[fix] status updater
|
2015-05-18 11:19:10 +05:30 |
|
Anand Doshi
|
92af795f12
|
Fixed note permission query
|
2015-03-31 14:42:22 +05:30 |
|
Rushabh Mehta
|
611b513a2d
|
[newsletter] fixed tests
|
2015-03-19 17:16:03 +05:30 |
|
Rushabh Mehta
|
14ae4c3603
|
[email] many fixes, newsletter, unsubscribe
|
2015-03-19 17:16:03 +05:30 |
|
Anand Doshi
|
885e074697
|
Changed company name from Web Notes to Frappe Technologies
|
2015-03-03 14:56:43 +05:30 |
|
Rushabh Mehta
|
00e3b26597
|
[fix] rename tool #2861
|
2015-03-02 15:05:36 +05:30 |
|
Anand Doshi
|
d35354cc06
|
Merge remote-tracking branch 'frappe/develop' into v5.0
Conflicts:
erpnext/__version__.py
erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py
erpnext/hooks.py
erpnext/patches.txt
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
erpnext/stock/get_item_details.py
erpnext/translations/ar.csv
erpnext/translations/bs.csv
erpnext/translations/ca.csv
erpnext/translations/el.csv
erpnext/translations/es.csv
erpnext/translations/fr.csv
erpnext/translations/hr.csv
erpnext/translations/id.csv
erpnext/translations/is.csv
erpnext/translations/ja.csv
erpnext/translations/nl.csv
erpnext/translations/pl.csv
erpnext/translations/pt-BR.csv
erpnext/translations/ru.csv
erpnext/translations/tr.csv
erpnext/translations/zh-cn.csv
erpnext/translations/zh-tw.csv
setup.py
|
2015-02-24 18:12:17 +05:30 |
|
Anand Doshi
|
d57e793bf3
|
[fix] Added unicode_literals if missing in py files
|
2015-02-24 12:24:53 +05:30 |
|
Anand Doshi
|
f9fc04ce8e
|
Website Listing
|
2015-02-23 22:34:27 +05:30 |
|
Pratik Vyas
|
7f9489e814
|
Update transaction_base.py
|
2015-02-20 16:22:24 +05:30 |
|
Rushabh Mehta
|
813f0eda05
|
[form] section labels
|
2015-02-20 16:02:48 +05:30 |
|
Rushabh Mehta
|
50dc4e90e3
|
[cleanup] item grid views, removed desc etc
|
2015-02-19 20:05:45 +05:30 |
|
Rushabh Mehta
|
6efbc9dacd
|
[event] share with user
|
2015-02-13 10:17:13 +05:30 |
|
Nabin Hait
|
8fa503e177
|
Fixed conflict while merging v4 into v5
|
2015-02-10 16:44:00 +05:30 |
|
Nabin Hait
|
15cd12214e
|
Fixed conflict while merging v4 into v5
|
2015-02-10 16:37:18 +05:30 |
|
Anand Doshi
|
6dfd430a2f
|
Moved flags like ignore_mandatory, ignore_validate etc to doc.flags
|
2015-02-10 14:41:27 +05:30 |
|
Nabin Hait
|
c5fb88c1cd
|
UOM validation for BOM Items
|
2015-02-09 16:48:02 +05:30 |
|
Rushabh Mehta
|
a232c80d77
|
[share] add share permission
|
2015-02-05 15:52:58 +05:30 |
|
Rushabh Mehta
|
0e13221338
|
[print] item tables - override description and uom
|
2015-02-04 17:02:24 +05:30 |
|
Nabin Hait
|
aabeb38c15
|
minor fix
|
2015-01-19 11:07:32 +05:30 |
|
Nabin Hait
|
fe93ea56b6
|
Minor fixes: escaped characters
|
2015-01-19 11:07:32 +05:30 |
|
Rushabh Mehta
|
0335005eea
|
[minor] added allow rename
|
2015-01-15 15:29:22 +05:30 |
|
Nabin Hait
|
fff3ab752c
|
Fixed conflict
|
2015-01-14 16:27:13 +05:30 |
|
Nabin Hait
|
4e7cc93af9
|
minor fix in reposting utility
|
2015-01-12 10:55:48 +05:30 |
|
Rushabh Mehta
|
e1cb0ae738
|
[design] list views
|
2015-01-05 17:39:05 +05:30 |
|
Rushabh Mehta
|
419ae33c3e
|
[merge] v5-design
|
2014-12-31 15:03:14 +05:30 |
|
Nabin Hait
|
dd38a266b8
|
Removed tname and fname from code
|
2014-12-26 13:15:21 +05:30 |
|
Rushabh Mehta
|
a5b149c061
|
[design] module pages, messages, timelines
|
2014-12-26 12:53:02 +05:30 |
|
Nabin Hait
|
e7d153624f
|
Table Field Renaming: code replace, JV and budget distribution renamed
|
2014-12-25 16:01:55 +05:30 |
|
Rushabh Mehta
|
9f32a50379
|
[merge] fix
|
2014-12-03 12:35:19 +05:30 |
|
Nabin Hait
|
eca7e22cda
|
Shopping cart test fixed
|
2014-12-02 11:35:29 +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 |
|
Rushabh Mehta
|
2f4567fa3c
|
[minor] [ux] address refresh for lead
|
2014-11-24 15:18:40 +05:30 |
|
Rushabh Mehta
|
5eeef7f065
|
[refactor] address and contact list in customer, supplier, lead, sales person
|
2014-11-24 14:16:51 +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
|
ae1dcabcb5
|
Fixed merge conflict
|
2014-11-05 12:41:02 +05:30 |
|
Nabin Hait
|
4acd431b92
|
Requested qty calculation logic
|
2014-11-04 15:34:03 +05:30 |
|
Nabin Hait
|
10b155a486
|
cost center based on project
|
2014-10-23 13:18:59 +05:30 |
|
Rushabh Mehta
|
be1a8d82c5
|
[merge] develop
|
2014-10-21 13:14:55 +05:30 |
|
Nabin Hait
|
fc2dd44694
|
Partial payment reconciliation. Fixes #1982
|
2014-10-17 14:57:20 +05:30 |
|
Nabin Hait
|
2348a5f592
|
repost stock utility
|
2014-10-15 15:31:33 +05:30 |
|
Nabin Hait
|
f1a07ff105
|
Allow zero rate while reposting
|
2014-10-15 12:23:35 +05:30 |
|
Nabin Hait
|
8a28ccfa2f
|
Repost gl entries where mismatch with stock balance
|
2014-10-14 11:41:56 +05:30 |
|
Nabin Hait
|
7c6f990cf9
|
Minor fix for moving average
|
2014-10-10 18:03:27 +05:30 |
|
Nabin Hait
|
4d74216147
|
Maintain negative stock balance if balance qty is negative
|
2014-10-09 19:25:19 +05:30 |
|
Nabin Hait
|
e96e83d557
|
stock reco and repost vouchers
|
2014-10-08 18:06:14 +05:30 |
|
Nabin Hait
|
6c48ef781b
|
Utility: Repost stock ledger entries and gl entries for all stock transactions
|
2014-10-08 11:02:18 +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 |
|
Rushabh Mehta
|
e10cf021d9
|
[email] remove communicationlist #561
|
2014-09-16 15:12:18 +05:30 |
|
Rushabh Mehta
|
ce00772ac0
|
[cleanup] removed communication js, fields
|
2014-09-16 15:11:42 +05:30 |
|
Rushabh Mehta
|
c0bb453b88
|
[refactor] [frappe 5.0]
|
2014-09-16 15:10:54 +05:30 |
|
Anand Doshi
|
30c5b41398
|
[minor] removed Suggest
|
2014-09-15 16:43:34 +05:30 |
|
Nabin Hait
|
65bef02607
|
Fixes in address template
|
2014-09-15 12:18:28 +05:30 |
|
Nabin Hait
|
7f3f2a0f0a
|
Fixes in repost_stock utility
|
2014-09-01 18:16:24 +05:30 |
|
Anand Doshi
|
580f447bbd
|
Merge pull request #2100 from rmehta/aug-22
[cleanup] remove allow_attach
|
2014-08-25 16:07:50 +05:30 |
|
Nabin Hait
|
06927a20b2
|
Update repost_stock.py
|
2014-08-25 14:08:54 +05:30 |
|
Rushabh Mehta
|
7a6ab91080
|
remove set_title_left
|
2014-08-25 13:04:22 +05:30 |
|
Rushabh Mehta
|
e8dd4160d4
|
[cleanup] remove allow_attach
|
2014-08-25 13:04:21 +05:30 |
|
Anand Doshi
|
62aa8fa4e7
|
[minor] Removed 'PIN: ' from default Address Template
|
2014-08-18 12:53:37 +05:30 |
|
nabinhait
|
f807cda375
|
PR and PI gl entries fixes for landed cost
|
2014-08-11 16:12:31 +05:30 |
|
Rushabh Mehta
|
139ec2a64f
|
Update note_list.html
|
2014-08-08 15:47:56 +05:30 |
|
Anand Doshi
|
4cc94df752
|
[tests] Fixed Test Records
|
2014-08-08 11:56:32 +05:30 |
|
Rushabh Mehta
|
7a4e739d6c
|
templating for hr
|
2014-08-08 11:56:32 +05:30 |
|
Rushabh Mehta
|
8544447b19
|
added more listview templates
|
2014-08-08 11:56:32 +05:30 |
|
Rushabh Mehta
|
18eb4f5015
|
added listviews for sales, purchase
|
2014-08-08 11:56:31 +05:30 |
|
Anand Doshi
|
62b1cbf003
|
[impact] Limit available functions in jinja environment
|
2014-07-25 13:02:29 +05:30 |
|
Rushabh Mehta
|
f84c240d1c
|
cleanup for print format
|
2014-07-25 13:01:52 +05:30 |
|
nabinhait
|
7700c62fa8
|
Minor fix
|
2014-07-14 14:21:21 +05:30 |
|
nabinhait
|
b0a8d000b1
|
Utility: reset serial no status and warehouse
|
2014-07-14 11:56:03 +05:30 |
|
nabinhait
|
5c38488590
|
Utility: reset serial no status and warehouse
|
2014-07-14 11:44:42 +05:30 |
|
nabinhait
|
7e848b1924
|
Title mandatory in Note. Fixes #1913
|
2014-07-09 12:54:56 +05:30 |
|
Anand Doshi
|
cd0aed993a
|
Fixed Address Template Patch
|
2014-06-06 17:37:31 +05:30 |
|
Anand Doshi
|
fc601659f5
|
Fixed Address Template
|
2014-06-06 17:07:50 +05:30 |
|
Anand Doshi
|
2ec93590e4
|
Minor fix in address template
|
2014-06-06 11:45:30 +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
|
5036706f81
|
removed address_title from address and removed test
|
2014-06-05 16:16:13 +05:30 |
|
Rushabh Mehta
|
c02fbd22fa
|
removed address_title from address and removed test
|
2014-06-05 16:16:13 +05:30 |
|
Rushabh Mehta
|
33020a63b8
|
patch for address template fixes #1749
|
2014-06-05 16:16:13 +05:30 |
|
Rushabh Mehta
|
eaa2e55d20
|
patch for address template fixes #1749
|
2014-06-05 16:16:13 +05:30 |
|
Rushabh Mehta
|
c22e11d483
|
added address template:
|
2014-06-05 16:01:55 +05:30 |
|
Anand Doshi
|
85479bcbc0
|
Fixes for apply user permissions and momentjs
|
2014-06-04 18:15:43 +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
|
62ec60188b
|
use build_filter_conditions from db_query. Fixes #1679
|
2014-05-30 11:22:10 +05:30 |
|
Rushabh Mehta
|
92ce693e6f
|
added ignore_permission in Lead for creating Event
|
2014-05-21 14:59:56 +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
|
3fcec56f7b
|
Bulk rename tool fixes #1594
|
2014-05-06 19:13:46 +05:30 |
|
Anand Doshi
|
2b0e4266cf
|
Go to home page on clicking left arrow in note list
|
2014-05-02 19:43:11 +05:30 |
|
Anand Doshi
|
07339fc69e
|
Fixes in Setup Wizard and Attachments
|
2014-04-22 15:30:24 +05:30 |
|
Rushabh Mehta
|
370a024e46
|
cleaned up sample website and separated fixtures by country
|
2014-04-18 16:00:41 +05:30 |
|
Anand Doshi
|
ac32bad25a
|
Fixes in Taxes, Quotation and Address Territory
|
2014-04-18 01:32:02 +05:30 |
|
Nabin Hait
|
6298536e46
|
set stock balance as per serial no count
Cherry Picked and Modified by @anandpdoshi
Conflicts:
stock/doctype/stock_ledger/stock_ledger.py
utilities/repost_stock.py
|
2014-04-16 15:23:08 +05:30 |
|
Rushabh Mehta
|
2c45899a02
|
fixed strings for translation
|
2014-04-15 14:41:56 +05:30 |
|
Pratik Vyas
|
b52618c142
|
frappe._ to __
|
2014-04-14 16:25:30 +05:30 |
|
Rushabh Mehta
|
558a9aabfb
|
removed control panel
|
2014-04-04 12:00:36 +05:30 |
|
Rushabh Mehta
|
cfb6ccfe51
|
frappe/frappe#478 removed self.doclist
|
2014-04-03 11:46:52 +05:30 |
|
Rushabh Mehta
|
f191f854cd
|
frappe/frappe#478 erpnext install works
|
2014-04-02 18:09:34 +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
|
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
|
66d52b55c0
|
#478
|
2014-03-27 14:17:33 +05:30 |
|
Nabin Hait
|
4d713ac5ba
|
sql injection fixes
|
2014-03-21 11:22:37 +05:30 |
|
Rushabh Mehta
|
7c932003ed
|
rename Profile to User frappe/frappe#470
|
2014-03-11 16:15:59 +05:30 |
|
Anand Doshi
|
e9baaa68e7
|
Changed frappe.conn to frappe.db
|
2014-02-26 12:35:33 +05:30 |
|
Nabin Hait
|
a1c96de9fc
|
party related cleanup
|
2014-02-21 14:45:10 +05:30 |
|
Nabin Hait
|
9d1f077922
|
get lead details in quotation
|
2014-02-19 17:43:24 +05:30 |
|
Rushabh Mehta
|
793ba6bd37
|
-webnotes +frappe 💥
|
2014-02-14 15:47:51 +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 |
|
Nabin Hait
|
574c7e7c63
|
item related cleanup
|
2014-02-06 15:51:01 +05:30 |
|
Rushabh Mehta
|
347889b233
|
merge
|
2014-02-03 14:49:53 +05:30 |
|
Rushabh Mehta
|
9adcf85a14
|
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-wip
|
2014-02-03 10:44:34 +05:30 |
|
Nabin Hait
|
b5be7bab9b
|
Stock Return: fetch customer and supplier details
|
2014-01-30 18:47:12 +05:30 |
|
Akhilesh Darjee
|
e0a1039756
|
merge conflict fixed
|
2014-01-30 14:44:35 +05:30 |
|
Akhilesh Darjee
|
4cdb79941b
|
map charge to taxes and charges in transactions
|
2014-01-30 13:56:57 +05:30 |
|
Nabin Hait
|
0ff32e73ba
|
Merged with 4.0.0-wip
|
2014-01-30 12:41:52 +05:30 |
|
Nabin Hait
|
fe8db590a1
|
Fixed conflict while merging with develop
|
2014-01-30 12:32:47 +05:30 |
|
Nabin Hait
|
b87e9f2651
|
Fixes in fetching party details
|
2014-01-29 19:51:36 +05:30 |
|
Akhilesh Darjee
|
4f7215662d
|
webnotes/erpnext#1090 set default tax type in customer and supplier
|
2014-01-29 16:31:38 +05:30 |
|
Akhilesh Darjee
|
2ced3b07d4
|
changed fieldname from charge to taxes
|
2014-01-28 19:16:05 +05:30 |
|
Rushabh Mehta
|
49dd7bee87
|
added get_supplier_details and commonified invoice functions
|
2014-01-28 17:43:10 +05:30 |
|
Rushabh Mehta
|
3b432dce88
|
added listviews
|
2014-01-28 16:10:15 +05:30 |
|
Nabin Hait
|
21d324c597
|
Merged with 4.0-wip
|
2014-01-28 15:52:25 +05:30 |
|
Akhilesh Darjee
|
ffa4769b51
|
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0-hotfix
|
2014-01-27 17:32:32 +05:30 |
|
Rushabh Mehta
|
1230e3a28b
|
don't hide customer / supplier links, webnotes/erpenxt#796
|
2014-01-27 11:02:27 +05:30 |
|
Akhilesh Darjee
|
a4e0a1c061
|
minor changes
|
2014-01-24 19:57:52 +05:30 |
|
Rushabh Mehta
|
1cd96a136f
|
updates for restriction
|
2014-01-24 11:10:24 +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 |
|
Rushabh Mehta
|
b09d9dabc5
|
started cleanup of address / contact calls - partly fixed for customer, to fix shipping_address, get_pos_values, for all supplier transactions
|
2014-01-02 11:47:23 +05:30 |
|
Rushabh Mehta
|
61bf425935
|
deleted moves
|
2013-12-27 17:58:39 +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
|
2b08985e16
|
Translations redesigned webnotes/wnframework#351
|
2013-12-19 18:27:48 +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
|
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 |
|
Rushabh Mehta
|
473f7d6314
|
removed signin.erpnext.com
|
2012-09-24 10:05:14 +05:30 |
|
Nabin Hait
|
214d62a09a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-09-18 11:19:59 +05:30 |
|
Nabin Hait
|
82efcc780b
|
reset standard transaction series in cleanup_data
|
2012-09-18 11:19:34 +05:30 |
|
Rushabh Mehta
|
4156523175
|
added flot for graphs in report_grid
|
2012-09-17 19:10:36 +05:30 |
|
Anand Doshi
|
0dab087be1
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
erpnext/accounts/doctype/sales_invoice/sales_invoice.txt
public/js/all-app.js
|
2012-09-10 11:31:18 +05:30 |
|
Rushabh Mehta
|
62aa086e80
|
todo: assignment notification fix
|
2012-09-07 10:05:13 +05:30 |
|
Rushabh Mehta
|
38cc3d6534
|
todo: do not send message to if assigned to self
|
2012-09-07 09:54:19 +05:30 |
|
Anand Doshi
|
8456eabed8
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-08-09 12:17:44 +05:30 |
|
Anand Doshi
|
c6cf4a2630
|
do not display mouse as a clickable pointer when hovering on description in todo list
|
2012-08-09 12:16:03 +05:30 |
|
Rushabh Mehta
|
899fe5d3f0
|
links enabled in todo
|
2012-08-08 15:30:19 +05:30 |
|
Rushabh Mehta
|
17588987a4
|
file upload should not be decoded
|
2012-08-08 10:37:02 +05:30 |
|
Rushabh Mehta
|
bf8cac53c7
|
pre, code style fix
|
2012-08-08 10:05:51 +05:30 |
|
Rushabh Mehta
|
586c6f3cbe
|
calendar: links to ref document
|
2012-08-07 16:36:40 +05:30 |
|
Rushabh Mehta
|
c2ef064ebb
|
todo page background bugfix
|
2012-08-07 16:36:10 +05:30 |
|
Anand Doshi
|
e81c07ff4d
|
appended unicode literals import after merge
|
2012-08-07 15:08:52 +05:30 |
|
Anand Doshi
|
16ad50f641
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
erpnext/stock/doctype/item/item.txt
|
2012-08-07 15:07:56 +05:30 |
|
Rushabh Mehta
|
6252c13ec8
|
added code style and mardown in todo
|
2012-08-07 12:53:49 +05:30 |
|
Rushabh Mehta
|
e6ecb06001
|
added markdown reference page
|
2012-08-07 12:48:41 +05:30 |
|
Rushabh Mehta
|
c7dbe293c3
|
updates to kb: unanswered questions show in desktop, questions query moved to server-side
|
2012-08-07 12:12:55 +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
|
486f9dfcec
|
added unicode_literals import at start of each file
|
2012-07-19 13:40:31 +05:30 |
|
Anand Doshi
|
5756630efb
|
Merge branch 'master' of github.com:webnotes/erpnext into dev
Conflicts:
erpnext/stock/doctype/delivery_note/delivery_note.py
public/js/all-app.js
|
2012-07-18 20:31:37 +05:30 |
|
Anand Doshi
|
249659d673
|
Changed file names from listview.js to doctype_name_list.js
|
2012-07-18 20:25:58 +05:30 |
|
Anand Doshi
|
f2f5c94c41
|
Default Currency specification for Customer and Supplier
This will get fetched in sales and purchase transactions respectively.
Fix in sales order list view
|
2012-07-18 20:13:52 +05:30 |
|
Rushabh Mehta
|
91ba346354
|
profile cleanup start and new auth table for better security
|
2012-07-13 14:54:40 +05:30 |
|
Rushabh Mehta
|
d47efd57ac
|
check_required fix
|
2012-07-13 11:15:25 +05:30 |
|
Rushabh Mehta
|
4feae61b62
|
fixes to taxes and charges master and naming_series
|
2012-07-12 16:01:20 +05:30 |
|
Anand Doshi
|
090a12d167
|
do not force send email using conf.py configuration
|
2012-07-10 15:15:46 +05:30 |
|
Nabin Hait
|
94a6c7e8ac
|
changes in reset_series
|
2012-07-09 16:06:53 +05:30 |
|
Nabin Hait
|
cbd23dace7
|
Merge branch 'master' of git://github.com/webnotes/erpnext
|
2012-07-09 15:26:10 +05:30 |
|
Nabin Hait
|
1c9903594b
|
utility script for cleanup test data
|
2012-07-09 15:25:08 +05:30 |
|
Anand Doshi
|
c6fce634cf
|
added app frame to todo list
|
2012-07-09 12:34:02 +05:30 |
|
Anand Doshi
|
1b8f24b507
|
update in contact's permissions
|
2012-07-03 12:55:17 +05:30 |
|
Anand Doshi
|
851b9c0aad
|
address contact permissions
|
2012-07-02 20:25:26 +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
|
cec84e1ec7
|
logout a disabled user
|
2012-07-02 11:55:29 +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
|
616c355d20
|
fix in todos and email settings
|
2012-06-14 16:46:48 +05:30 |
|
Anand Doshi
|
47afacc8e9
|
1. Reports List - allow read permission to All
2. Display message when ToDo doesnt contain any item
|
2012-06-13 18:02:43 +05:30 |
|
Anand Doshi
|
d104f4bc32
|
fix in todo
|
2012-06-13 17:01:52 +05:30 |
|
Anand Doshi
|
3c3f996ade
|
todo list with assigned to others list
|
2012-06-13 12:01:41 +05:30 |
|
Anand Doshi
|
64ddb9f069
|
show assigned to others list in todo
|
2012-06-12 19:24:12 +05:30 |
|
Anand Doshi
|
6971f577da
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-05-29 15:47:47 +05:30 |
|
Rushabh Mehta
|
92c2c8f1f6
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-05-29 10:53:58 +05:30 |
|
Rushabh Mehta
|
16aea34a37
|
show new reports as well as old
|
2012-05-29 10:53:37 +05:30 |
|
Anand Doshi
|
4792f51e2a
|
remove euro currency patch, address / contact supplier/customer can now contain slashes in their name
|
2012-05-28 13:26:17 +05:30 |
|
Anand Doshi
|
002191f166
|
fix in rename tool
|
2012-05-25 12:20:27 +05:30 |
|
Nabin Hait
|
86df78aabc
|
fixed conflict
|
2012-05-23 11:33:28 +05:30 |
|
Nabin Hait
|
53dab4ac40
|
validation in customer
|
2012-05-23 11:29:13 +05:30 |
|
Nabin Hait
|
611157447f
|
sms fix
|
2012-05-22 17:25:39 +05:30 |
|
Rushabh Mehta
|
0eb790a0ae
|
cleaned up imports, doc
|
2012-05-11 15:53:37 +05:30 |
|
Anand Doshi
|
951d8ec342
|
fix in issues arising due to wn.require
|
2012-05-10 14:19:11 +05:30 |
|
Rushabh Mehta
|
a920943e43
|
new cms with public folder
|
2012-05-07 18:00:57 +05:30 |
|
Anand Doshi
|
f36aee2c6b
|
fix in contact address saving issue
|
2012-05-05 20:05:58 +05:30 |
|
Anand Doshi
|
f09bd67e53
|
fix in security settings
|
2012-05-03 16:44:54 +05:30 |
|
Rushabh Mehta
|
39489278ec
|
update messages fix
|
2012-05-03 10:44:44 +05:30 |
|
Rushabh Mehta
|
acd0769098
|
list in listview and sales order fix
|
2012-05-03 10:20:38 +05:30 |
|
Nabin Hait
|
5af62d0857
|
fixed conflict using theirs
|
2012-05-01 16:29:40 +05:30 |
|
Anand Doshi
|
3f6eed2dc2
|
fix in account subscription info box creation
|
2012-05-01 12:23:28 +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 |
|
Anand Doshi
|
5c2a792d03
|
if max_users = 0, consider unlimited users
|
2012-04-30 20:03:23 +05:30 |
|
Anand Doshi
|
4b2b159d12
|
if max_users = 0, consider unlimited users
|
2012-04-30 20:00:19 +05:30 |
|
Nabin Hait
|
41cc32790f
|
Fixed issie in auto notification
|
2012-04-30 14:36:18 +05:30 |
|
Rushabh Mehta
|
a4be4d3390
|
website, product and grid bugfix
|
2012-04-30 14:22:02 +05:30 |
|
Anand Doshi
|
1ed4ef1946
|
fixes in setup
|
2012-04-27 15:30:23 +05:30 |
|
Nabin Hait
|
51834a45a7
|
purchase invoice with write off feature
|
2012-04-23 12:47:12 +05:30 |
|
Rushabh Mehta
|
f4a8c87db5
|
kb bug fix
|
2012-04-23 10:31:29 +05:30 |
|
Anand Doshi
|
3d9f436ce9
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-04-20 13:43:05 +05:30 |
|
Anand Doshi
|
0f8e491bdd
|
removed Knowledge Base module, fixed questions page name
|
2012-04-20 13:42:43 +05:30 |
|
Rushabh Mehta
|
5bce61d58e
|
merge
|
2012-04-20 13:40:48 +05:30 |
|
Anand Doshi
|
37df8abfc7
|
knowledge base module removed
|
2012-04-20 11:17:10 +05:30 |
|
Nabin Hait
|
239e79038f
|
Customer/customer group wise price list
|
2012-04-20 10:25:03 +05:30 |
|
Rushabh Mehta
|
c8abe5b2ad
|
style cleanups and new builds
|
2012-04-15 22:31:32 +05:30 |
|
Rushabh Mehta
|
cabfc65fe0
|
lib/py/webnotes/defs.py -> conf.py (see sample in lib/conf/conf.py)
|
2012-04-14 16:08:45 +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
|
130dfaee8c
|
fix in todo
|
2012-04-03 12:18:35 +05:30 |
|
Anand Doshi
|
5112b5b6b8
|
rerun of rename_dt
|
2012-04-02 19:12:29 +05:30 |
|
Anand Doshi
|
fedfd89e4a
|
rename dt first cut
|
2012-03-30 12:29:06 +05:30 |
|
Anand Doshi
|
2513e50dc4
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_merge
Conflicts:
erpnext/website/doctype/style_settings/style_settings.txt
version.num
|
2012-03-27 19:37:10 +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
|
4943af6d6c
|
fix in address issue - customer coming in supplied field
|
2012-03-26 11:42:09 +05:30 |
|
Nabin Hait
|
e2fe5629f0
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-26 11:07:01 +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 |
|
Anand Doshi
|
134ca41db8
|
Merge branch 'sync_file_db' of github.com:webnotes/erpnext into sync_file_db
|
2012-03-23 12:45:05 +05:30 |
|
Nabin Hait
|
f88326ba3f
|
sync ref db
|
2012-03-22 15:07:05 +05:30 |
|
Anand Doshi
|
7944b4b888
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-22 14:34:35 +05:30 |
|
Anand Doshi
|
3697534f10
|
Merge branch 'master' into handlerupdate
|
2012-03-22 14:32:10 +05:30 |
|
Rushabh Mehta
|
0807227b92
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-22 09:24:11 +01:00 |
|
Rushabh Mehta
|
fa0e7b6933
|
listing/messages fix
|
2012-03-22 13:44:04 +05:30 |
|
Rushabh Mehta
|
cb11585ff1
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-22 07:08:34 +01:00 |
|
Rushabh Mehta
|
27cf13b541
|
merge
|
2012-03-22 11:37:56 +05:30 |
|
Rushabh Mehta
|
3f46696db2
|
removed slider ui
|
2012-03-22 11:37:08 +05:30 |
|
Rushabh Mehta
|
421e25c5ae
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-22 06:48:45 +01:00 |
|
Anand Doshi
|
98f847c01f
|
fix in todo
|
2012-03-22 11:18:28 +05:30 |
|
Rushabh Mehta
|
a12a28bec6
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
Conflicts:
version.num
|
2012-03-22 06:35:35 +01:00 |
|
Anand Doshi
|
06fcfdfcde
|
assign to - allow comments
|
2012-03-22 11:01:38 +05:30 |
|
Nabin Hait
|
9066dcaba5
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-22 10:26:07 +05:30 |
|
Rushabh Mehta
|
d0f26026af
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-21 13:34:00 +01:00 |
|
Anand Doshi
|
29ed95ba22
|
simple fixes in todo
|
2012-03-21 18:02:17 +05:30 |
|
Rushabh Mehta
|
b1f77d1bde
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-21 12:39:54 +01:00 |
|
Nabin Hait
|
f676824791
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-21 17:08:35 +05:30 |
|
Nabin Hait
|
653536596d
|
fax added in address display
|
2012-03-21 17:07:42 +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 |
|
Rushabh Mehta
|
454c6ac716
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-21 05:42:31 +01:00 |
|
Nabin Hait
|
9ff92369ad
|
lead organization fld added in quotation for printing
|
2012-03-20 16:44:15 +05:30 |
|
Rushabh Mehta
|
9b1afe197d
|
cleanup of form, rename, route, added fonts
|
2012-03-20 14:37:44 +05:30 |
|
Rushabh Mehta
|
7afaa8665d
|
major reworking of page navigation
|
2012-03-16 18:28:09 +05:30 |
|
Anand Doshi
|
96188f0310
|
sync with gateway moved to defs
|
2012-03-15 11:11:57 +05:30 |
|
Rushabh Mehta
|
08b670bddd
|
listing with stats
|
2012-03-14 19:06:20 +05:30 |
|
Rushabh Mehta
|
052b7e4049
|
fixed list->new->onload hooks
|
2012-03-13 15:19:06 +05:30 |
|
Anand Doshi
|
20f63da794
|
fix in messages
|
2012-03-08 12:10:51 +05:30 |
|
Anand Doshi
|
eb55df0aa3
|
fix in messages
|
2012-03-08 12:06:27 +05:30 |
|
Anand Doshi
|
a6952c935c
|
doctype refactor first commit
|
2012-03-07 19:37:23 +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
|
60871c3f54
|
merge, doclist2
|
2012-03-05 18:29:34 +05:30 |
|
Rushabh Mehta
|
b9004bd6d0
|
doclist2
|
2012-03-05 18:28:33 +05:30 |
|
Anand Doshi
|
d536f16c53
|
user addition fix
|
2012-03-02 17:05:04 +05:30 |
|
Anand Doshi
|
ecd8df8cfb
|
fix in user password change by system manager
|
2012-03-02 12:18:47 +05:30 |
|
Anand Doshi
|
a7c2de6164
|
fix in user passwordgs
|
2012-03-02 11:27:50 +05:30 |
|
Anand Doshi
|
08c8edb87f
|
fix in desktop and notifications
|
2012-03-01 14:53:05 +05:30 |
|
Rushabh Mehta
|
b6023a4d34
|
users - list condition
|
2012-03-01 13:47:51 +05:30 |
|