Nabin Hait
|
ca8ad210d2
|
Merge branch 'i18n' of git://github.com/bperretti/erpnext into bperretti-i18n
|
2013-10-24 11:40:32 +05:30 |
|
Rushabh Mehta
|
f3f496a8d7
|
[naming series] [minor] [fix]
|
2013-10-21 15:24:49 +05:30 |
|
Bárbara Perretti
|
4b41e5f7f7
|
Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n
Conflicts:
accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js
accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
public/js/complete_setup.js
selling/doctype/opportunity/opportunity.js
selling/doctype/quotation/quotation.js
|
2013-10-16 15:09:18 -03:00 |
|
Nabin Hait
|
f146e8b7f5
|
Merge branch 'wsgi' of github.com:webnotes/erpnext into wsgi
|
2013-10-16 11:19:09 +05:30 |
|
Anand Doshi
|
a295bf5421
|
[minor] don't rollback when running all tests, fixed test cases
|
2013-10-15 19:52:29 +05:30 |
|
Nabin Hait
|
028a5202f6
|
[minor] fixed conflict
|
2013-10-15 11:53:03 +05:30 |
|
Anand Doshi
|
373680bbae
|
Merged master into wsgi
|
2013-10-10 16:04:40 +05:30 |
|
Rushabh Mehta
|
ddca90ef7b
|
[communication] [setup wizard] [minor] [fixes]
|
2013-10-09 16:08:54 +05:30 |
|
Bárbara Perretti
|
19165f8f86
|
Fix translate support_analytics.js
|
2013-10-04 15:51:17 -03:00 |
|
Bárbara Perretti
|
f889c4e59c
|
Fix translate support_ticket.js
|
2013-10-04 15:44:04 -03:00 |
|
Bárbara Perretti
|
cd85590122
|
Fix translate newsletter.js
|
2013-10-04 15:37:27 -03:00 |
|
Bárbara Perretti
|
1fcc3d9748
|
Fix translate maintenance_schedule.js
|
2013-10-04 15:32:05 -03:00 |
|
Bárbara Perretti
|
247ae8c6e5
|
Fix translate customer_issue.js
|
2013-10-04 15:24:42 -03:00 |
|
Rushabh Mehta
|
800b3aa437
|
[crm] Updated status and workflow for Lead > Opportunity > Quotation > Sales Order
|
2013-10-03 17:26:33 +05:30 |
|
Anand Doshi
|
5b004ff8a7
|
Merge branch 'master' of github.com:webnotes/erpnext into wsgi
Conflicts:
accounts/doctype/account/account.py
accounts/doctype/gl_entry/gl_entry.py
accounts/doctype/period_closing_voucher/period_closing_voucher.py
stock/doctype/delivery_note/delivery_note.py
stock/doctype/landed_cost_wizard/landed_cost_wizard.py
stock/doctype/purchase_receipt/purchase_receipt.py
stock/doctype/stock_ledger/stock_ledger.py
stock/doctype/warehouse/warehouse.py
stock/stock_ledger.py
|
2013-09-25 19:55:41 +05:30 |
|
Anand Doshi
|
de8b6aadaf
|
[minor] fixes for import conf
|
2013-09-24 17:17:39 +05:30 |
|
Nabin Hait
|
be68542bab
|
[minor] fetch debit/credit based on against JV
|
2013-09-23 18:34:13 +05:30 |
|
Pratik Vyas
|
cfed8c44b4
|
conf migration
|
2013-09-21 15:16:47 +05:30 |
|
Anand Doshi
|
7bac6adb42
|
[fix] [minor] support ticket threading
|
2013-09-19 17:51:51 +05:30 |
|
Pratik Vyas
|
ea810509d3
|
refactor newsletter for naming_series global
|
2013-09-18 18:35:47 +05:30 |
|
Pratik Vyas
|
5e16a69b35
|
mass replace sql with webnotes.conn.sql
|
2013-09-18 12:20:53 +05:30 |
|
Pratik Vyas
|
e55fbfc090
|
remove sql =
|
2013-09-18 11:10:59 +05:30 |
|
Anand Doshi
|
3966c4cc5b
|
[fix] [minor] [website]
|
2013-09-16 19:28:06 +05:30 |
|
Anand Doshi
|
fb109aded0
|
[website] [minor] moving to framework
|
2013-09-11 18:58:20 +05:30 |
|
Anand Doshi
|
0748cb7d18
|
[website] [minor] moving to framework
|
2013-09-11 15:31:58 +05:30 |
|
Anand Doshi
|
b0d996ffb1
|
[website] [minor] moving to framework
|
2013-09-10 18:29:39 +05:30 |
|
Anand Doshi
|
330dae90cb
|
[website] [minor] moving to framework
|
2013-09-10 13:46:28 +05:30 |
|
Anand Doshi
|
429fd1d3d8
|
Merge branch 'website-wip' of github.com:webnotes/erpnext into website-wip
|
2013-09-10 12:54:10 +05:30 |
|
Anand Doshi
|
9686b937bb
|
[fix] [minor] print hide communication table
|
2013-09-10 10:54:34 +05:30 |
|
Rushabh Mehta
|
c59c4e0699
|
[website] [minor] moving to framework
|
2013-09-09 12:17:45 +05:30 |
|
Anand Doshi
|
512113ae51
|
Merge branch 'customer-login'
|
2013-09-05 12:21:29 +05:30 |
|
Anand Doshi
|
7b044da0e3
|
[fix] [minor] on_communication, when checking if system user, extract email id and then check
|
2013-09-04 18:14:20 +05:30 |
|
Anand Doshi
|
53ecddd612
|
[fix] [communication] on communication send, update status
|
2013-09-04 17:52:27 +05:30 |
|
Anand Doshi
|
d01f0cb46e
|
[fix] [communication] on communication send, update status
|
2013-09-04 17:38:29 +05:30 |
|
Rushabh Mehta
|
090d410498
|
[minor] communication, webnotes/erpnext#790
|
2013-09-04 16:20:18 +05:30 |
|
Anand Doshi
|
0e23929740
|
Merge branch 'master' into customer-login
|
2013-09-03 16:42:21 +05:30 |
|
Rushabh Mehta
|
81284b73ef
|
[communication] [minor]
|
2013-09-02 18:37:28 +05:30 |
|
Rushabh Mehta
|
a2d0da8840
|
[communication] [minor]
|
2013-09-02 18:27:29 +05:30 |
|
Rushabh Mehta
|
96690ebd0f
|
[communication] [minor] cleaed model
|
2013-09-02 17:04:27 +05:30 |
|
Anand Doshi
|
6c8ef7729f
|
[customer login] [minor] commonified listing of orders, invoices, shipments, tickets and messages
|
2013-08-30 18:24:00 +05:30 |
|
Anand Doshi
|
fccbb3f331
|
[fix] [minor] made resolution details editable in support ticket
|
2013-08-28 18:30:14 +05:30 |
|
Rushabh Mehta
|
62030e05cc
|
[Serial No] Major updates, code cleanup, "In Store" is now "Available". Serial No can only be created via Stock Entry / Purchase Receipt. Serial No can be auto created using Series if mentioned in Item master
|
2013-08-14 18:39:27 +05:30 |
|
Rushabh Mehta
|
75c3171c04
|
[rename] Naming Series is now Document Numbering Series and updated translations
|
2013-08-08 16:00:40 +05:30 |
|
Anand Doshi
|
220b597b06
|
[newsletter] show send progess [issue] webnotes/erpnext#531
|
2013-08-06 17:01:28 +05:30 |
|
Rushabh Mehta
|
e67d1fbcdf
|
[license] [minor] Updated License Text in all js and py files
|
2013-08-05 14:59:54 +05:30 |
|
Anand Doshi
|
8762cdaf53
|
[fix] [minor] [issue] webnotes/erpnext#661 - remove script and style tags from communication content
|
2013-08-01 19:55:29 +05:30 |
|
Anand Doshi
|
a648f46d4e
|
[fix] [minor] show stock ledger, general ledger, fixes post changes in script manager trigger [issue] webnotes/wnframework#228
|
2013-07-30 14:43:29 +05:30 |
|
Anand Doshi
|
1fac2a98cf
|
[fix] [client script] call cur_frm.cscript.custom_ type functions in the callback of standard functions
|
2013-07-29 19:30:39 +05:30 |
|
Anand Doshi
|
52b049145b
|
[fix] [minor] call refresh_fields after cur_frm.call when doc is passed
|
2013-07-25 19:13:45 +05:30 |
|
Nabin Hait
|
ea51b41239
|
[fix] [minor] allowed territory group in all transactions
|
2013-07-25 18:01:13 +05:30 |
|