Rushabh Mehta
|
8941841a9c
|
[setup wizard] added more steps [minor] [wip]
|
2013-10-07 18:22:29 +05:30 |
|
Nabin Hait
|
a1d1c980bc
|
[minor] fixes in stock balance report, bin uom and sle is_cancelled
|
2013-10-02 16:29:45 +05:30 |
|
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
|
10dce341c8
|
[pos] pos view fixed for all purchase & sales cycle
|
2013-09-25 11:09:33 +05:30 |
|
Nabin Hait
|
11f41955c9
|
[minor] fixed conflict while merging perpetual branch into master
|
2013-09-24 14:36:55 +05:30 |
|
Akhilesh Darjee
|
e318c93405
|
[fix] patch merge conflict fixed
|
2013-09-23 12:34:22 +05:30 |
|
Akhilesh Darjee
|
f624ffa40a
|
[pos] refresh() to be called at minimum
|
2013-09-23 12:27:16 +05:30 |
|
Akhilesh Darjee
|
f83576bf9c
|
[pos] pos.js included in all selling & purchase cycle
|
2013-09-18 18:35:12 +05:30 |
|
Akhilesh Darjee
|
a550e7443f
|
[pos] moved pos realted code from sales_invoice.js to transaction.js
|
2013-09-17 18:52:00 +05:30 |
|
Anand Doshi
|
83de391efc
|
Merge branch 'akhileshdarjee-master' into website-wip
|
2013-09-17 16:09:15 +05:30 |
|
Akhilesh Darjee
|
6773bc2512
|
[pos] [minor] added pos in sales order for testing
|
2013-09-17 11:56:17 +05:30 |
|
Nabin Hait
|
5cd1d54347
|
[minor] merged with master branch
|
2013-09-17 10:30:24 +05:30 |
|
Anand Doshi
|
3966c4cc5b
|
[fix] [minor] [website]
|
2013-09-16 19:28:06 +05:30 |
|
Akhilesh Darjee
|
4a0cae8b41
|
[fix] removed client side validation for conversion rate
|
2013-09-16 12:25:00 +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 |
|
Akhilesh Darjee
|
db59ffb76d
|
[usability] item price moved to price list
|
2013-09-11 13:05:24 +05:30 |
|
Rushabh Mehta
|
c59c4e0699
|
[website] [minor] moving to framework
|
2013-09-09 12:17:45 +05:30 |
|
Anand Doshi
|
c7fa9cc4f5
|
[fix] [minor] show live chat link if commercial_support = 1 in conf.py
|
2013-09-05 17:50:40 +05:30 |
|
Anand Doshi
|
179e3772c0
|
[fix] [minor] item wise taxes
|
2013-09-05 16:53:57 +05:30 |
|
Anand Doshi
|
a9c0f5de7d
|
[feature] [customer login] send links in email for portal access of Sales Order, Sales Invoice, Delivery Note and Suppor Ticket
|
2013-09-05 12:19:00 +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
|
0e23929740
|
Merge branch 'master' into customer-login
|
2013-09-03 16:42:21 +05:30 |
|
Anand Doshi
|
36b63a44b9
|
[fix] [minor] profile query
|
2013-09-03 15:33:56 +05:30 |
|
Nabin Hait
|
3f5e59eeeb
|
[minor] [cleanup] Landed cost wizard
|
2013-09-02 18:44:55 +05:30 |
|
Rushabh Mehta
|
04c4e2aea3
|
[minor] removed erpnext namespaces/branding
|
2013-09-02 15:33:37 +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
|
c8e39b0965
|
[fix] [minor] use prop instead of attr to disable a field
|
2013-08-30 18:22:58 +05:30 |
|
Nabin Hait
|
d85d63bb81
|
[minor] renamed perpetual accounting to make_accounting_entry_for_every_stock_entry
|
2013-08-28 19:24:52 +05:30 |
|
Nabin Hait
|
92b0e777e8
|
[fix] [minor] merged with master
|
2013-08-26 16:55:42 +05:30 |
|
Anand Doshi
|
a91c95f0fe
|
[fix] [minor] recalculate on removing row
|
2013-08-23 13:00:47 +05:30 |
|
Anand Doshi
|
1e4fb689fc
|
[fix] [minor] trigger grid_fieldname_remove function on removing grid row
|
2013-08-23 12:56:33 +05:30 |
|
Nabin Hait
|
f68d563a68
|
[minor] fixed conflict while merging with master
|
2013-08-21 17:49:26 +05:30 |
|
Anand Doshi
|
f83cf5890e
|
[fix] [minor] setup serial no editor if serial no field exists
|
2013-08-20 15:36:10 +05:30 |
|
Nabin Hait
|
05652874fc
|
[merge] [minor] merged with master for serial_no updatess
|
2013-08-20 11:28:38 +05:30 |
|
Nabin Hait
|
44da6f2efe
|
[fix] [minor] fixed conflict while merging with master
|
2013-08-19 11:06:06 +05:30 |
|
Rushabh Mehta
|
3423a73009
|
[serial no] Allow creation only of Warehouse is not set, [translation] Italian
|
2013-08-16 13:03:34 +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 |
|
Anand Doshi
|
5476318030
|
[fix] [minor] round off currency values in grid reports
|
2013-08-12 17:32:47 +05:30 |
|
Nabin Hait
|
4af2dbf84d
|
[perpetual accounting] [minor] patch for intial setup
|
2013-08-12 12:24:08 +05:30 |
|
Anand Doshi
|
e42a0222d5
|
[minor] [fix] precision for float fields on server-side
|
2013-08-12 11:58:02 +05:30 |
|
Rushabh Mehta
|
813b1cba65
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-08-09 18:12:15 +05:30 |
|
Rushabh Mehta
|
4a404e9299
|
[price list] Separated Default Price List for Selling and Buying and changed fieldnames
|
2013-08-09 18:11:35 +05:30 |
|
Anand Doshi
|
43b38dfd71
|
[cleanup] [minor] wn.ui.toolbar.show_banner
|
2013-08-09 16:57:53 +05:30 |
|
Anand Doshi
|
79251492fe
|
[fix] [minor] call set_dynamic_labels after onload_post_render
|
2013-08-09 00:20:34 +05:30 |
|
Anand Doshi
|
b0dab89626
|
[docs] [minor] updated install instructions
|
2013-08-07 16:32:12 +05:30 |
|
Nabin Hait
|
8daa702a90
|
Merge branch 'master' into perpetual
|
2013-08-07 12:46:50 +05:30 |
|
Rushabh Mehta
|
3ae2542bb8
|
[about] [minor] Cleaup
|
2013-08-07 11:45:39 +05:30 |
|
Anand Doshi
|
5e4e5d78df
|
[minor] [fix] bring back onload_post_render in transaction.js - ref: a9b1c09166
|
2013-08-06 17:23:44 +05:30 |
|
Nabin Hait
|
cc0e2d1740
|
[minor] merged with master
|
2013-08-06 16:19:18 +05:30 |
|
Nabin Hait
|
43eba26dcf
|
[perpetual accounting] make gl entries relevant for different transactions
|
2013-08-06 16:00:50 +05:30 |
|
Anand Doshi
|
af4888f11a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-08-05 18:08:59 +05:30 |
|
Anand Doshi
|
a9b1c09166
|
[minor] [fixes] removed onload_post_render from transaction.js, since it is already called after mapping on server side
|
2013-08-05 18:07:45 +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
|
aa71b5b6ea
|
[fix] [minor] show item-wise taxes
|
2013-08-05 13:00:53 +05:30 |
|
Anand Doshi
|
5013dcb12c
|
[fix] [minor] change_grid_labels
|
2013-08-05 12:16:04 +05:30 |
|
Anand Doshi
|
7baa7fd129
|
[fix] [minor] [issue] webnotes/erpnext#658 - adjust expiry warning banner
|
2013-08-01 19:10:34 +05:30 |
|
Anand Doshi
|
5edd570b49
|
[fix] [minor] features setup - hide company currency fields if export is disabled
|
2013-08-01 17:21:53 +05:30 |
|
Anand Doshi
|
17350b899f
|
[fix] [mapper] from delivery note to sales invoice, only map unbilled items
|
2013-08-01 15:45:23 +05:30 |
|
Anand Doshi
|
74458a93bb
|
[minor] [issue] webnotes/erpnext#405 - removed chat link for self-hosted instances
|
2013-08-01 12:10:09 +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
|
f314051e30
|
Merge branch 'master' of github.com:webnotes/erpnext into custom_script_defer
|
2013-07-30 10:44:07 +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 |
|
Nabin Hait
|
1f996c3121
|
[minor] currency trigger should not be called in refresh
|
2013-07-29 19:02:09 +05:30 |
|
Anand Doshi
|
d5d39ac5ec
|
[fix] [minor] sales and purchase get_queries
|
2013-07-29 13:28:37 +05:30 |
|
Anand Doshi
|
af1df68c13
|
[cleanup] [minor] added icons in toolbar menu [issue] webnotes/erpnext#655
|
2013-07-26 15:11:55 +05:30 |
|
Anand Doshi
|
5491332772
|
[fix] [minor] use wn.defaults.get_default instead of sys_defaults
|
2013-07-26 13:02:18 +05:30 |
|
Anand Doshi
|
60403b2d8f
|
[fix] [minor] [grid] set_colum_disp should force refresh the whole grid
|
2013-07-25 18:53:22 +05:30 |
|
Nabin Hait
|
48a0bd3eda
|
[minor] [fix] price list currency read only and SO-MR mapping
|
2013-07-23 15:31:39 +05:30 |
|
Anand Doshi
|
28d59a046a
|
[minor] [fix] [navbar] replace overflow with ellipsis
|
2013-07-19 17:50:25 +05:30 |
|
Anand Doshi
|
535d833523
|
[minor] [fix] call company trigger in onload for a new selling/buying transaction
|
2013-07-19 13:51:07 +05:30 |
|
Anand Doshi
|
3af8f8a136
|
[minor] [erpnext logo] load it as object instead of image
|
2013-07-18 19:52:06 +05:30 |
|
Anand Doshi
|
674765a641
|
[minor] [erpnext logo] load it as object instead of image
|
2013-07-18 19:28:46 +05:30 |
|
Anand Doshi
|
04750d9fe2
|
Merge branch 'slow' of github.com:webnotes/erpnext
|
2013-07-18 18:17:06 +05:30 |
|
Anand Doshi
|
c8b2c0f091
|
[minor] [fix] net_total_export printing and hover effect for brand in navbar
|
2013-07-18 18:15:56 +05:30 |
|
Nabin Hait
|
3f0b31442f
|
[fix] [minor] features setup
|
2013-07-18 15:11:29 +05:30 |
|
Nabin Hait
|
d89a733506
|
[fix] [minor] features setup
|
2013-07-18 15:04:29 +05:30 |
|
Anand Doshi
|
61cad5076b
|
[minor] [fix] opportunity form, queries, stock uom replace utility
|
2013-07-18 13:26:27 +05:30 |
|
Anand Doshi
|
64f316bd2f
|
[minor] [fix] in get item wise tax html, show empty cell if not tax for an account head for a particular item
|
2013-07-17 15:12:22 +05:30 |
|
Anand Doshi
|
cc04a17030
|
[minor] show brand html in toolbar
|
2013-07-17 14:15:26 +05:30 |
|
Anand Doshi
|
9c2bb0e1db
|
[minor] [fix] autoset abbreviation if company name is set in complete setup
|
2013-07-16 16:56:28 +05:30 |
|
Anand Doshi
|
c8f4bda9a2
|
[minor] [fix] close button in appframe
|
2013-07-16 16:51:55 +05:30 |
|
Anand Doshi
|
1d5fa40ff2
|
[minor] [fix] close button in appframe
|
2013-07-16 16:47:38 +05:30 |
|
Anand Doshi
|
1ffc5b576c
|
[minor] [for territory] auto add default For Territory in a new Tax Master, Shipping Rule and Price List
|
2013-07-15 18:09:43 +05:30 |
|
Rushabh Mehta
|
0e31093bdc
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-11 12:17:35 +05:30 |
|
Rushabh Mehta
|
03be82f41a
|
[minor] [css] #574
|
2013-07-11 10:22:07 +05:30 |
|
Anand Doshi
|
63d844b2d2
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
Conflicts:
selling/doctype/quotation/quotation.py
utilities/transaction_base.py
|
2013-07-10 20:55:15 +05:30 |
|
Anand Doshi
|
2ac0a83bd8
|
[webshop] Place Order - submits Quotation, creates Customer if required, creates and submits Sales Order
|
2013-07-10 20:49:44 +05:30 |
|
Rushabh Mehta
|
e41bceb3df
|
[feature] [website] Create Default Home Page
|
2013-07-10 20:42:44 +05:30 |
|
Rushabh Mehta
|
982ad35fd2
|
[cleanup] Removed Warehouse Type
|
2013-07-10 18:39:06 +05:30 |
|
Anand Doshi
|
afad0efca3
|
[minor] [fix] trigger startup after page route in app.js so that dialogs created in startup do not auto-close
|
2013-07-10 12:00:26 +05:30 |
|
Rushabh Mehta
|
30d3dcb258
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-09 14:37:28 +05:30 |
|
Rushabh Mehta
|
3ed351df8e
|
[feature] generate latest updates page from git commit log
|
2013-07-09 14:36:41 +05:30 |
|
Anand Doshi
|
c120776931
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
Conflicts:
buying/doctype/purchase_order_item/purchase_order_item.txt
|
2013-07-09 13:10:15 +05:30 |
|
Anand Doshi
|
bdee6e074a
|
[cleanup] moved company to top section, hide company if only one exists, changed field labels
|
2013-07-09 13:03:39 +05:30 |
|
Rushabh Mehta
|
5758f7e3b7
|
[stock-entry] show gl if auto inventory accounting #561
|
2013-07-09 12:05:33 +05:30 |
|
Anand Doshi
|
f4d8d23241
|
[setup] [fix] creation of fiscal year if start date is 1st Jan
|
2013-07-04 18:29:55 +05:30 |
|
Anand Doshi
|
99100a4135
|
[webshop] shopping cart settings, update price list, taxes and shipping rule on change of address, apply defaults on creation of fresh quotation
|
2013-07-04 17:13:53 +05:30 |
|
Anand Doshi
|
2023012b0e
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
Conflicts:
utilities/doctype/address/address.txt
|
2013-07-02 11:43:54 +05:30 |
|
Anand Doshi
|
edbf3e1e19
|
[webshop] [addresses] address selector, my addresses list
|
2013-07-02 11:40:16 +05:30 |
|