Anand Doshi
|
fa228e9c9b
|
Merge branch 'master' of github.com:webnotes/erpnext into wsgi
Conflicts:
accounts/doctype/purchase_invoice/purchase_invoice.py
accounts/doctype/sales_invoice/sales_invoice.txt
selling/doctype/lead/lead.txt
selling/doctype/opportunity/opportunity.txt
stock/doctype/warehouse/warehouse.py
|
2013-10-02 16:52:52 +05:30 |
|
Rushabh Mehta
|
24ca7e4e2e
|
Added Transactions for Import webnotes/erpnext#911
|
2013-10-02 14:25:36 +05:30 |
|
Bárbara Perretti
|
7339ca50f4
|
Fix translate territory_target_variance_item_group_wise.js
|
2013-09-30 17:53:05 -03:00 |
|
Bárbara Perretti
|
633e3729f4
|
fix translate sales_person_wise_transaction_summary.js
|
2013-09-30 17:51:14 -03:00 |
|
Bárbara Perretti
|
af9f4ed7fb
|
Fix translate sales_person_target_variance_item_group_wise.js
|
2013-09-30 17:48:51 -03:00 |
|
Bárbara Perretti
|
c5fe86c773
|
Fix Translate Sales_Analytics.js
|
2013-09-27 17:21:47 -03:00 |
|
Bárbara Perretti
|
4098c2675f
|
Fix translate Sales_Common.js
|
2013-09-27 17:05:17 -03:00 |
|
Bárbara Perretti
|
97bf1f79db
|
Fix translate Sales_bom.js
|
2013-09-27 15:28:53 -03:00 |
|
Bárbara Perretti
|
49ad416843
|
Fix translate Quotation.js
|
2013-09-27 15:01:14 -03:00 |
|
Bárbara Perretti
|
55fbeb9e93
|
Fix translate Lead.js
|
2013-09-27 14:40:54 -03:00 |
|
Bárbara Perretti
|
8e14a9cb93
|
Fix translate Sales_Order.js
|
2013-09-27 14:33:18 -03:00 |
|
Nabin Hait
|
164d39d12f
|
Merge pull request #883 from akhileshdarjee/master
[feature] pos view added in all sales & purchase cycle
|
2013-09-27 00:05:15 -07:00 |
|
Akhilesh Darjee
|
2428e8d1b7
|
[pos] [minor] fix for cur_frm
|
2013-09-27 12:32:26 +05:30 |
|
Nabin Hait
|
f6dd28c157
|
Merge pull request #905 from MaxMorais/patch-1
Fix Translation in Sales Order.js
|
2013-09-26 23:02:45 -07:00 |
|
Bárbara Perretti
|
dc3ab5c8de
|
Fixin translation in Opportunity.js
|
2013-09-26 19:12:31 -03:00 |
|
Bárbara Perretti
|
629a032a74
|
Fix translate Customer.js
|
2013-09-26 18:41:42 -03:00 |
|
Bárbara Perretti
|
dcec039da5
|
Fixin translation in selling/page/sales_browser/sales_browser.js
|
2013-09-26 18:24:15 -03:00 |
|
Bárbara Perretti
|
bc32535668
|
Fixin translation in selling/page/selling_home/selling_home.js
|
2013-09-26 18:18:22 -03:00 |
|
Maxwell
|
18762925bc
|
Fix translation in Customer.js
I'll be fixing some points that I miss translation.
|
2013-09-26 17:54:46 -03:00 |
|
Maxwell
|
6111b1edb6
|
Fix Translation in Sales Order.js
I'll be fixing some points that I miss translation.
|
2013-09-26 17:49:53 -03:00 |
|
Nabin Hait
|
a1f7f2abfd
|
[minor] update lead status as Opportunity Made when opportunity submitted
|
2013-09-26 16:59:32 +05:30 |
|
Nabin Hait
|
6ec4b0c52a
|
[fix] [minor] display product image in shopping cart
|
2013-09-26 15:45:44 +05:30 |
|
Nabin Hait
|
16ec981bfd
|
[cleanup] [minor] fetch lead details in opportunity
|
2013-09-25 20:00:22 +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 |
|
Akhilesh Darjee
|
10dce341c8
|
[pos] pos view fixed for all purchase & sales cycle
|
2013-09-25 11:09:33 +05:30 |
|
Anand Doshi
|
de8b6aadaf
|
[minor] fixes for import conf
|
2013-09-24 17:17:39 +05:30 |
|
Nabin Hait
|
11f41955c9
|
[minor] fixed conflict while merging perpetual branch into master
|
2013-09-24 14:36:55 +05:30 |
|
Nabin Hait
|
ac030a57c2
|
[minor] [cleanup] removed banner from lead
|
2013-09-23 16:27:18 +05:30 |
|
Akhilesh Darjee
|
e318c93405
|
[fix] patch merge conflict fixed
|
2013-09-23 12:34:22 +05:30 |
|
Anand Doshi
|
12144f339e
|
Merge branch 'website-wip'
|
2013-09-19 12:27:11 +05:30 |
|
Nabin Hait
|
aa67e7ed29
|
[minor] field reordered in lead
|
2013-09-19 10:39:59 +05:30 |
|
Akhilesh Darjee
|
f83576bf9c
|
[pos] pos.js included in all selling & purchase cycle
|
2013-09-18 18:35:12 +05:30 |
|
Anand Doshi
|
e122121dc4
|
[fix] [minor] stock uom and price list currency in webshop
|
2013-09-18 17:28:06 +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
|
83de391efc
|
Merge branch 'akhileshdarjee-master' into website-wip
|
2013-09-17 16:09:15 +05:30 |
|
Anand Doshi
|
8c002491d0
|
[fix] [minor] show missing currency message in shopping cart settings
|
2013-09-17 15:57:17 +05:30 |
|
Akhilesh Darjee
|
6773bc2512
|
[pos] [minor] added pos in sales order for testing
|
2013-09-17 11:56:17 +05:30 |
|
Anand Doshi
|
ad0b05060a
|
Merge branch 'master' of github.com:webnotes/erpnext into website-wip
|
2013-09-17 11:00:24 +05:30 |
|
Nabin Hait
|
5cd1d54347
|
[minor] merged with master branch
|
2013-09-17 10:30:24 +05:30 |
|
Nabin Hait
|
7a75e10a61
|
[fix] [minor] perpetual inventory: account for each warehouse
|
2013-09-17 10:21:20 +05:30 |
|
Akhilesh Darjee
|
c96c13af4e
|
[fix] make demo for price list
|
2013-09-12 19:19:46 +05:30 |
|
Anand Doshi
|
3a6f4f882a
|
[fix] [minor] communication related cleanup
|
2013-09-12 19:10:05 +05:30 |
|
Anand Doshi
|
1be5bb7e6a
|
[portal] [minor] show status for order and invoice
|
2013-09-12 15:25:47 +05:30 |
|
Anand Doshi
|
fb109aded0
|
[website] [minor] moving to framework
|
2013-09-11 18:58:20 +05:30 |
|
Akhilesh Darjee
|
fb6d410e60
|
[fix] test cases fix for price list
|
2013-09-11 16:18:10 +05:30 |
|
Akhilesh Darjee
|
c3ec72c991
|
[fix] [minor] merge conflict fixed
|
2013-09-11 14:49:38 +05:30 |
|
Akhilesh Darjee
|
db59ffb76d
|
[usability] item price moved to price list
|
2013-09-11 13:05:24 +05:30 |
|
Anand Doshi
|
b0d996ffb1
|
[website] [minor] moving to framework
|
2013-09-10 18:29:39 +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 |
|
Rushabh Mehta
|
7c2312a74c
|
[website] [minor] moving to framework
|
2013-09-10 12:51:52 +05:30 |
|
Anand Doshi
|
9686b937bb
|
[fix] [minor] print hide communication table
|
2013-09-10 10:54:34 +05:30 |
|
Anand Doshi
|
1b2d84db0d
|
[fix] [minor] print hide communication table
|
2013-09-10 10:46:56 +05:30 |
|
Rushabh Mehta
|
c59c4e0699
|
[website] [minor] moving to framework
|
2013-09-09 12:17:45 +05:30 |
|
Nabin Hait
|
ce4be997ab
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-09-05 17:38:52 +05:30 |
|
Nabin Hait
|
63b5ef7ecf
|
[fix] [minor] is_pos zero when mapping
|
2013-09-05 17:38:24 +05:30 |
|
Anand Doshi
|
d983aca567
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-09-05 13:31:46 +05:30 |
|
Anand Doshi
|
c28f84298f
|
[fix] [minor] opportunity to quotation - load price list values
|
2013-09-05 13:31:20 +05:30 |
|
Akhilesh Darjee
|
a7b7d2559e
|
[fix] merge conflict
|
2013-09-05 13:18:22 +05:30 |
|
Akhilesh Darjee
|
38e8f989fa
|
[fix] [patch] fixed paid_amount & patch for default pos view check in features setup
|
2013-09-05 12:59:33 +05:30 |
|
Anand Doshi
|
512113ae51
|
Merge branch 'customer-login'
|
2013-09-05 12:21:29 +05:30 |
|
Nabin Hait
|
a653cd3608
|
[minor] fixed conflict while merging with master
|
2013-09-05 10:56:44 +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 |
|
Nabin Hait
|
bf4d27ecf1
|
[minor] repost future gl entries only for current voucher items
|
2013-09-04 17:55:45 +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
|
d5c18d46d0
|
[minor] [customer login] renamed order template to sale and use it for order, invoice and delivery note
|
2013-09-04 15:07:00 +05:30 |
|
Anand Doshi
|
0e23929740
|
Merge branch 'master' into customer-login
|
2013-09-03 16:42:21 +05:30 |
|
Anand Doshi
|
4263344cd2
|
[fix] [minor] customer-wise discount
|
2013-09-03 16:21:21 +05:30 |
|
Anand Doshi
|
3139973662
|
[fix] [minor] quotation to sales order, if not able to create customer, show message
|
2013-09-03 15:41:31 +05:30 |
|
Anand Doshi
|
627c42bdb6
|
[fix] [minor] quotation to sales order, if not able to create customer, show message
|
2013-09-03 15:34:24 +05:30 |
|
Anand Doshi
|
36b63a44b9
|
[fix] [minor] profile query
|
2013-09-03 15:33:56 +05:30 |
|
Nabin Hait
|
20a6f93612
|
Merge branch 'master' into perpetual
|
2013-09-03 11:26:02 +05:30 |
|
Rushabh Mehta
|
98429afe91
|
[communication] [minor]
|
2013-09-02 18:52:27 +05:30 |
|
Rushabh Mehta
|
0f2b684a45
|
[communication] [minor]
|
2013-09-02 18:47:34 +05:30 |
|
Rushabh Mehta
|
57e47cd93d
|
[communication] [minor]
|
2013-09-02 18:45:11 +05:30 |
|
Nabin Hait
|
3f5e59eeeb
|
[minor] [cleanup] Landed cost wizard
|
2013-09-02 18:44:55 +05:30 |
|
Rushabh Mehta
|
a2d0da8840
|
[communication] [minor]
|
2013-09-02 18:27:29 +05:30 |
|
Rushabh Mehta
|
8f04d119bb
|
[communication] [minor
|
2013-09-02 17:39:59 +05:30 |
|
Rushabh Mehta
|
96690ebd0f
|
[communication] [minor] cleaed model
|
2013-09-02 17:04:27 +05:30 |
|
Nabin Hait
|
da3110fc12
|
[merge] [minor] merged with master
|
2013-09-02 13:07:49 +05:30 |
|
Anand Doshi
|
f7e5648365
|
[minor] customer login start
|
2013-08-29 17:46:40 +05:30 |
|
Anand Doshi
|
4b29c89692
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-08-29 13:59:23 +05:30 |
|
Anand Doshi
|
1c8ec406ae
|
[fix] [minor] lead validate
|
2013-08-29 13:58:47 +05:30 |
|
Rushabh Mehta
|
46ec268e9b
|
[communications] [minor] Code cleanup so it can be extended by custom script
|
2013-08-29 13:53:36 +05:30 |
|
Anand Doshi
|
252d14a85e
|
[fix] [minor] validate warehouse user for sales order
|
2013-08-27 11:52:17 +05:30 |
|
Nabin Hait
|
d608042de4
|
[fix] [minor] batch no get query
|
2013-08-27 10:51:41 +05:30 |
|
Nabin Hait
|
23b3610fe8
|
[fix] [minor] batch no get query
|
2013-08-27 10:43:08 +05:30 |
|
Rushabh Mehta
|
a65253b5d5
|
[stock] [minor] Added Warehouse User check in Sales Order
|
2013-08-27 10:32:56 +05:30 |
|
Nabin Hait
|
92b0e777e8
|
[fix] [minor] merged with master
|
2013-08-26 16:55:42 +05:30 |
|
Anand Doshi
|
53cd86b0d8
|
[fix] [minor] added item_name field in sales bom item query
|
2013-08-23 16:38:25 +05:30 |
|
Nabin Hait
|
d5b01a1ddc
|
[fix] [minor] removed reserved warehouse from no_copy in sales order item
|
2013-08-22 15:43:18 +05:30 |
|
Nabin Hait
|
4c60041707
|
[fix] [minor] removed reserved warehouse from no_copy in sales order item
|
2013-08-22 15:22:53 +05:30 |
|
Nabin Hait
|
11bd44e447
|
[minor] fixed conflict while merging with master
|
2013-08-21 17:51:46 +05:30 |
|
Rushabh Mehta
|
cce21d11fa
|
[major] upgrade to bootstrap 3
|
2013-08-21 17:48:08 +05:30 |
|
Nabin Hait
|
9b09c95d83
|
[cleanup] [accounts] delete gl entries on cancellation of accounting transactions
|
2013-08-21 17:47:11 +05:30 |
|
Nabin Hait
|
4ae729bfd2
|
[cleanup] [minor] deprecated cancelled stock ledger entry
|
2013-08-20 12:04:46 +05:30 |
|
Nabin Hait
|
05652874fc
|
[merge] [minor] merged with master for serial_no updatess
|
2013-08-20 11:28:38 +05:30 |
|
Nabin Hait
|
74c281cc55
|
[cleanup] [minor] On cancellation of transation, do not post cancelled sl entries, delete allexisting sl entries against that transaction
|
2013-08-19 16:17:18 +05:30 |
|