Anand Doshi
|
dc644c37e6
|
Merge pull request #1597 from anandpdoshi/naming-series-by-fiscal-year
Naming series by fiscal year
|
2014-05-07 11:06:36 +05:30 |
|
Anand Doshi
|
8c2dbab878
|
Changed default naming series options
C-Form: C-FORM-.#####
Purchase Invoice: PINV-.#####
Sales Invoice: SINV-.#####
Purchase Order: PO-.#####
Quality Inspection: QI-.#####
Supplier: SUPP-.#####
Supplier Quotation: SQTN-.#####
Attendance: ATT-.#####
Production Order: PRO-.#####
Installation Note: IN-.#####
Lead: LEAD-.#####
Opportunity: OPTY-.#####
Quotation: QTN-.#####
Sales Order: SO-.#####
Delivery Note: DN-.#####
Item: ITEM-.#####
Material Request: MREQ-.#####
Packing Slip: PS-.#####
Purchase Receipt: PREC-.#####
Stock Entry: STE-.#####
Customer Issue: CI-.#####
Support Ticket: SUP-.#####
Customer: CUST-.#####
Journal Voucher: JV-.#####
|
2014-05-06 19:43:11 +05:30 |
|
Nabin Hait
|
ce4a87ce83
|
Maintenance schedule: get no of visits and period validation. Fixes #1591
|
2014-05-06 18:52:36 +05:30 |
|
Anand Doshi
|
8bde7f9b3a
|
Conditionally toggle Naming Series. Fixes #1526
|
2014-04-24 18:11:49 +05:30 |
|
Rushabh Mehta
|
c38fc713c6
|
updated translations
|
2014-04-16 17:46:30 +05:30 |
|
Anand Doshi
|
652bc0784a
|
Ported v3 fixes to v4
Commit range: webnotes/erpnext@e4b72df2f4bd7272c42e90f6faec3c27aa763b82..webnotes/erpnext@85441b0180f84246259d5a0ab4e3bcbf29355efe
|
2014-04-16 15:26:42 +05:30 |
|
Rushabh Mehta
|
d85dc868ca
|
more message fixes for translation
|
2014-04-15 22:54:34 +05:30 |
|
Rushabh Mehta
|
ff93802d58
|
more message fixes
|
2014-04-15 18:40:31 +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 |
|
Anand Doshi
|
9fd50bcfb6
|
Fixed rest of the test cases frappe/frapp#478
|
2014-04-09 19:20:01 +05:30 |
|
Anand Doshi
|
d29465029d
|
Fixed Test Cases frappe/frappe#478
|
2014-04-08 20:15:22 +05:30 |
|
Rushabh Mehta
|
a504f0638b
|
frappe/frappe#478, fixed list passed in
|
2014-04-04 12:16:26 +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 |
|
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
|
66d52b55c0
|
#478
|
2014-03-27 14:17:33 +05:30 |
|
Rushabh Mehta
|
aa355af2cf
|
refactored client side Model and Meta - frappe/frappe#478
|
2014-03-26 18:24:30 +05:30 |
|
Nabin Hait
|
5c6b34a84c
|
minor fix
|
2014-03-26 10:30:25 +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
|
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
|
09a9f4c0c9
|
Added module to Report doctype
|
2014-03-07 17:20:22 +05:30 |
|
Rushabh Mehta
|
73f0bf36c1
|
fixed #1454
|
2014-03-06 14:45:02 +05:30 |
|
Anand Doshi
|
2d5727b17b
|
Ignore mandatory during email pulling
|
2014-03-05 19:24:07 +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 |
|
Rushabh Mehta
|
793ba6bd37
|
-webnotes +frappe 💥
|
2014-02-14 15:47:51 +05:30 |
|
Nabin Hait
|
f0d29be1d5
|
Removed on_trash function from support ticket
|
2014-02-12 14:54:11 +05:30 |
|
Anand Doshi
|
93fdc670fe
|
Fixes in Test Cases
|
2014-02-11 14:40:21 +05:30 |
|
Anand Doshi
|
080b64a98f
|
Fixes in Sales Partner and Support Mails
|
2014-02-07 19:14:21 +05:30 |
|
Akhilesh Darjee
|
f1c3537924
|
webnotes/erpnext#869 newsletter to send to employees
|
2014-02-03 19:28:36 +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 |
|
Rushabh Mehta
|
347889b233
|
merge
|
2014-02-03 14:49:53 +05:30 |
|
Akhilesh Darjee
|
53593c9c47
|
Newsletter allow delete
|
2014-02-03 13:40:27 +05:30 |
|
Akhilesh Darjee
|
d6d2193f91
|
newsletter reload
|
2014-01-31 19:59:25 +05:30 |
|
Nabin Hait
|
bec11fa86e
|
Newsletter permissions
|
2014-01-31 17:33:23 +05:30 |
|
Rushabh Mehta
|
49dd7bee87
|
added get_supplier_details and commonified invoice functions
|
2014-01-28 17:43:10 +05:30 |
|
Nabin Hait
|
21d324c597
|
Merged with 4.0-wip
|
2014-01-28 15:52:25 +05:30 |
|
Akhilesh Darjee
|
86894f3bbf
|
merge conflict fixed
|
2014-01-27 15:42:02 +05:30 |
|
Rushabh Mehta
|
e288e5238a
|
added title_fields for Task, Newsletter
|
2014-01-24 15:33:42 +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
|
6a749e3a8e
|
removed while loop
|
2014-01-15 11:43:47 +05:30 |
|
Akhilesh Darjee
|
5dd92fd5d6
|
reload doc in maintenance schedule
|
2014-01-03 19:14:01 +05:30 |
|
Akhilesh Darjee
|
5c96b75a68
|
fixed maintenance schedule
|
2014-01-02 17:54:12 +05:30 |
|
Akhilesh Darjee
|
064d2ba16a
|
fixed sr no in maintenance schedule
|
2014-01-02 17:47:32 +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 |
|
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
|
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 |
|
Rushabh Mehta
|
feaea28fdf
|
bulk email: parse html2text only once and autocommit on many writes
|
2012-09-24 13:09:05 +05:30 |
|
Anand Doshi
|
70f76117ac
|
Show Create Button for link fields which are allowed for submit
|
2012-09-19 13:06:58 +05:30 |
|
Rushabh Mehta
|
93af75a160
|
added unicode literals in patch
|
2012-09-07 10:57:14 +02:00 |
|
Anand Doshi
|
3d498ccfb1
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-09-06 07:56:07 +05:30 |
|
Anand Doshi
|
76ef96f24f
|
begin transaction after commit in support ticket
|
2012-09-06 07:53:37 +05:30 |
|
Anand Doshi
|
eb3089e6e3
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-08-31 16:57:04 +05:30 |
|
Anand Doshi
|
c53a0ffe34
|
by default, communication content is of type 'Text' instead of 'Text Editor'
|
2012-08-31 16:54:59 +05:30 |
|
Anand Doshi
|
b211a41547
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-08-31 13:39:58 +05:30 |
|
Anand Doshi
|
29abc389eb
|
run communication list if a new communication is added
|
2012-08-31 13:39:18 +05:30 |
|
Anand Doshi
|
00d3c7c67d
|
open communication in dialog
|
2012-08-31 13:25:03 +05:30 |
|
Anand Doshi
|
9ee4adb27a
|
send newsletter as owner
|
2012-08-24 15:18:48 +05:30 |
|
Anand Doshi
|
ad86d0f474
|
show message after sending test email
|
2012-08-24 14:47:30 +05:30 |
|
Anand Doshi
|
c6800106fb
|
added newsletter listing
|
2012-08-24 14:47:10 +05:30 |
|
Anand Doshi
|
3f8277b6bb
|
added newsletter link in support home page. also hide naming series after save
|
2012-08-24 14:23:27 +05:30 |
|
Anand Doshi
|
9fdc4abced
|
added newsletter feature
|
2012-08-24 14:13:42 +05:30 |
|
Anand Doshi
|
297f37da03
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-08-22 14:59:14 +05:30 |
|
Anand Doshi
|
73c6542e6c
|
minor fix in communication.js
|
2012-08-22 14:57:35 +05:30 |
|
Rushabh Mehta
|
a49a552a37
|
merge
|
2012-08-06 14:30:31 +05:30 |
|
Anand Doshi
|
786444e6bf
|
changed document_type of 'Communication' to 'Master' to enable importing
|
2012-08-03 16:15:39 +05:30 |
|
Anand Doshi
|
ccee92e5c0
|
fixes in header decoding in receiving support ticket email
|
2012-07-31 10:56:24 +05:30 |
|
Anand Doshi
|
3e7a143539
|
fixes in header decoding in receiving support ticket email
|
2012-07-31 10:54:56 +05:30 |
|
Anand Doshi
|
6a223fe77e
|
fixes in receive email
|
2012-07-23 12:51:50 +05:30 |
|
Anand Doshi
|
7118086658
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-07-23 11:28:10 +05:30 |
|
Anand Doshi
|
486f9dfcec
|
added unicode_literals import at start of each file
|
2012-07-19 13:40:31 +05:30 |
|
Nabin Hait
|
bbc2d44241
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-07-19 09:15:49 +05:30 |
|
Nabin Hait
|
cea01c7212
|
item code get query in customer issue
|
2012-07-19 09:15:12 +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
|
ebe23b0f89
|
allow deletion of communication
|
2012-06-29 16:38:07 +05:30 |
|
Anand Doshi
|
e301e8a6c1
|
Merge branch 'master' into dev
Conflicts:
erpnext/buying/doctype/quality_inspection/quality_inspection.py
|
2012-06-28 18:40:57 +05:30 |
|
Anand Doshi
|
cbf181c390
|
employee list -- show status
|
2012-06-28 18:38:38 +05:30 |
|
Anand Doshi
|
36f5e257ed
|
minor fix in support ticket list view
|
2012-06-28 13:08:43 +05:30 |
|
Anand Doshi
|
fef4a71177
|
minor fix in communication list view
|
2012-06-28 13:05:39 +05:30 |
|
Anand Doshi
|
0afab07a1f
|
communication listview - show pretty date
|
2012-06-28 12:59:33 +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 |
|
Nabin Hait
|
490ae41cee
|
maintenance visit cleanup and integrated with maintenance schedule
|
2012-06-27 13:21:12 +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
|
a86d7887f0
|
fixes in support ticket autoreply
|
2012-06-14 14:59:04 +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
|
a65ad2c901
|
fetch customer/supplier given a contact in communication
|
2012-06-08 18:21:35 +05:30 |
|
Anand Doshi
|
4dbeae1eae
|
escape double quotes in communication content, allow 0 as value in data/int field
|
2012-06-07 14:39:42 +05:30 |
|
Anand Doshi
|
afb3d53f55
|
fix in gs
|
2012-06-07 11:50:52 +05:30 |
|
Anand Doshi
|
e5de85aec2
|
fix in communication list in parent forms
|
2012-06-07 11:41:42 +05:30 |
|
Rushabh Mehta
|
a89f52041f
|
communication is now created when email is sent
|
2012-06-07 11:30:02 +05:30 |
|
Anand Doshi
|
08c4f64d5f
|
fix in communication listing
|
2012-06-06 13:19:38 +05:30 |
|
Anand Doshi
|
e37bf2215a
|
do not load communication if no permission
|
2012-06-06 12:41:34 +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 |
|
Anand Doshi
|
390b788e7b
|
communication
|
2012-06-05 18:28:38 +05:30 |
|
Nabin Hait
|
c84c86e458
|
customer info added in maintenance schedule event
|
2012-06-04 17:47:47 +05:30 |
|
Anand Doshi
|
c5d857896e
|
fixes in communication doctype
|
2012-05-31 18:23:16 +05:30 |
|
Anand Doshi
|
a6708fb748
|
new doctype: communication
|
2012-05-31 14:53:55 +05:30 |
|
Anand Doshi
|
fc243ea7d4
|
removed debug from maintenace scheduler
|
2012-05-24 15:56:34 +05:30 |
|
Anand Doshi
|
5fda36f2c0
|
fix in profile permissions and support ticket response should update modified datetime
|
2012-05-24 12:39:18 +05:30 |
|
Anand Doshi
|
9327bb9585
|
fix in tag viewing in doclistview
|
2012-05-23 15:12:22 +05:30 |
|
Anand Doshi
|
d287962cd9
|
removed the double check box in support ticket list
|
2012-05-21 19:36:47 +05:30 |
|
Anand Doshi
|
cb909d518c
|
Merge branch 'shf_rename'
|
2012-05-21 18:44:19 +05:30 |
|
Anand Doshi
|
2c4cd08844
|
more listviews
|
2012-05-21 18:40:53 +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
|
8b426a6142
|
customer issue cleanup
|
2012-05-21 14:50:28 +05:30 |
|
Anand Doshi
|
1aae261490
|
delete button in doclistview
|
2012-05-21 14:31:03 +05:30 |
|
Anand Doshi
|
f295591168
|
Merge branch 'shf_rename'
|
2012-05-14 18:03:45 +05:30 |
|
Anand Doshi
|
4924c96380
|
sync support emails only when sync_support_mails is set to 1
|
2012-05-14 18:02:21 +05:30 |
|
Rushabh Mehta
|
0eb790a0ae
|
cleaned up imports, doc
|
2012-05-11 15:53:37 +05:30 |
|
Rushabh Mehta
|
078867c411
|
fixes to listview
|
2012-05-09 16:15:51 +05:30 |
|
Rushabh Mehta
|
7b4a60a980
|
form toolbar lables and support ticket fix
|
2012-05-02 11:35:04 +05:30 |
|
Anand Doshi
|
8cffe7e440
|
fix in support ticket, expiry banner
|
2012-04-30 12:13:51 +05:30 |
|
Anand Doshi
|
385380125b
|
fixes in customize form, naming series form loading
|
2012-04-18 16:04:02 +05:30 |
|
Anand Doshi
|
1fb128158c
|
fix in support ticket options of naming_series
|
2012-04-18 11:18:54 +05:30 |
|
Anand Doshi
|
b2974e8e59
|
fix in delete check
|
2012-04-17 11:57:50 +05:30 |
|
Anand Doshi
|
acb3d56e02
|
fix in install docs
|
2012-04-17 11:39:18 +05:30 |
|
Rushabh Mehta
|
97ae17eaf7
|
merge
|
2012-04-13 11:42:56 +05:30 |
|
Rushabh Mehta
|
f1264a7f76
|
listing, module pages in appframe
|
2012-04-13 11:41:43 +05:30 |
|
Anand Doshi
|
1c2ac00a82
|
fixes in sales cycle
|
2012-04-13 11:38:01 +05:30 |
|
Anand Doshi
|
2424387651
|
fixes after sync testing
|
2012-04-10 19:14:37 +05:30 |
|
Anand Doshi
|
fa0cd89a7c
|
change from labels to fieldname in cur_frm.cscript
|
2012-04-05 13:03:35 +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
|
37fb9c8f27
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_rename
Conflicts:
version.num
|
2012-03-29 15:35:08 +05:30 |
|
Anand Doshi
|
c9456c18dc
|
listviews
|
2012-03-28 17:48:30 +05:30 |
|