Nabin Hait
|
0930b94264
|
[target report] cleanup
|
2013-06-20 16:35:09 +05:30 |
|
Nabin Hait
|
739a7fdf74
|
Merge pull request #494 from akhileshdarjee/master
[Report] Completed Territory Target Variance & Sales Person Target Variance reports
|
2013-06-20 02:53:31 -07:00 |
|
Akhilesh Darjee
|
e6974d10c2
|
Fixed conflict merge
|
2013-06-20 15:22:04 +05:30 |
|
Nabin Hait
|
b8ebbcafa9
|
[trend analyzer] cleanup
|
2013-06-20 13:03:10 +05:30 |
|
Nabin Hait
|
616657d4a2
|
Merge pull request #495 from saurabh6790/master
[erpnext][reports][Trend Analyzer]
|
2013-06-19 22:18:44 -07:00 |
|
Akhilesh Darjee
|
92571c6929
|
[Report] Completed Budget variance Report and corrections in Territory Target Varinace & Sales Person Target Variance Report
|
2013-06-19 18:15:20 +05:30 |
|
Anand Doshi
|
c2a352711f
|
[shopping cart] show items, editable qty and show amount for that item
|
2013-06-19 17:19:20 +05:30 |
|
Akhilesh Darjee
|
4ddc2618e8
|
[Report] Completed Sales Person Target Variance (Item-Group wise)
|
2013-06-18 18:46:02 +05:30 |
|
Anand Doshi
|
ca628d9f54
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
selling/doctype/sales_order/sales_order.txt
|
2013-06-18 18:30:41 +05:30 |
|
Anand Doshi
|
3c6c3cf5ee
|
[sales order] [shipping address] allow to edit shipping address
|
2013-06-18 18:26:30 +05:30 |
|
Akhilesh Darjee
|
2967581102
|
Merge branch 'master' of https://github.com/webnotes/erpnext
|
2013-06-17 19:27:30 +05:30 |
|
Akhilesh Darjee
|
f841a7bc14
|
Completed territory_target_variance(item_group_wise) report
|
2013-06-17 19:25:48 +05:30 |
|
Anand Doshi
|
e81321219e
|
[webshop] [cart] add to cart, remove_from_cart, update qty, checkout methods
|
2013-06-17 15:42:38 +05:30 |
|
Rushabh Mehta
|
64c2764b56
|
[translations/build] deleted translation files (to be built on demand)
|
2013-06-17 11:56:41 +05:30 |
|
Anand Doshi
|
abc100302c
|
[cart] create quotation on checkout
|
2013-06-14 17:44:03 +05:30 |
|
Saurabh
|
feb8669cbd
|
[Reports][Validation changes in Purchase and Sales trends]
|
2013-06-14 17:40:48 +05:30 |
|
Saurabh
|
606d8383ff
|
Merge branch 'master' of https://github.com/webnotes/erpnext
|
2013-06-14 16:48:41 +05:30 |
|
Saurabh
|
1848b71a0a
|
[Reports][Sales and Purchase Trends][Completed]
|
2013-06-14 15:03:45 +05:30 |
|
Rushabh Mehta
|
37982a6a1f
|
[contact/address] fixed auto setting closes #475 (erpnext)
|
2013-06-14 13:29:20 +05:30 |
|
Saurabh
|
0326f5414e
|
[reports][purchase and sales trends]
|
2013-06-13 19:17:56 +05:30 |
|
Saurabh
|
f9966f44cd
|
[Report][Quotation Trend Complete]
|
2013-06-12 17:55:19 +05:30 |
|
Anand Doshi
|
060d9248d3
|
[fixes] buying/selling price lists, communication and website settings
|
2013-06-12 17:40:36 +05:30 |
|
Saurabh
|
bcbd9a4800
|
[Report][Quotation Trend]
|
2013-06-11 18:06:58 +05:30 |
|
Anand Doshi
|
3daf45fcd8
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
|
2013-06-11 17:34:18 +05:30 |
|
Anand Doshi
|
2e0cc41fc6
|
[chart of accounts/cost center] [add account/cost center] fix in permission issue
|
2013-06-11 17:33:37 +05:30 |
|
Anand Doshi
|
3b867f7377
|
[cleanup] [fix] removed amendment_date
|
2013-06-11 17:21:11 +05:30 |
|
Anand Doshi
|
b53b9dcff4
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-11 16:23:45 +05:30 |
|
Anand Doshi
|
27e6f13b5d
|
[cleanup] deprecated search criteria, amendment_date, cancel_reason
|
2013-06-11 16:23:18 +05:30 |
|
Rushabh Mehta
|
f85368ec5e
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-11 16:07:44 +05:30 |
|
Anand Doshi
|
618edee8b7
|
[search criteria] [cleanup] removed search criteria folders and files
|
2013-06-11 15:04:37 +05:30 |
|
Anand Doshi
|
5c069050d5
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
|
2013-06-11 14:34:45 +05:30 |
|
Anand Doshi
|
433047b2e2
|
[customer] [permlevel] changed fields/perms with permlevel 2 to permlevel 1
|
2013-06-11 14:28:42 +05:30 |
|
Rushabh Mehta
|
0b61c2e10f
|
[docs] added readme for selling
|
2013-06-11 14:24:25 +05:30 |
|
Rushabh Mehta
|
3c8cffb69b
|
[cleanup] removed Shipping Address, Communication Log
|
2013-06-11 14:23:59 +05:30 |
|
Akhilesh Darjee
|
85e1026325
|
Fixed selling_home.js conflicted during merge
|
2013-06-11 11:17:56 +05:30 |
|
Akhilesh Darjee
|
458bed193f
|
ERPNext Update
|
2013-06-11 10:56:22 +05:30 |
|
Akhilesh Darjee
|
f75ebb5a1b
|
Report partially completed - Territory Target Variance(Item-Group Wise)
|
2013-06-11 10:23:10 +05:30 |
|
Anand Doshi
|
097ac352d6
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
|
2013-06-10 15:38:31 +05:30 |
|
Anand Doshi
|
670199b9c6
|
[patch] [fix] event for project, oppty, lead
|
2013-06-10 15:38:01 +05:30 |
|
Anand Doshi
|
7e2010a649
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
patches/patch_list.py
projects/doctype/project/project.py
utilities/transaction_base.py
|
2013-06-10 15:25:07 +05:30 |
|
Anand Doshi
|
e53a81dcea
|
[event] [lead, opportunity, project] [fix] create events
|
2013-06-10 15:15:40 +05:30 |
|
Anand Doshi
|
b2dc1aeca9
|
[lead] [next contact] [fix] create event
|
2013-06-10 12:34:31 +05:30 |
|
Saurabh
|
66f10cd14f
|
Quotation Trend
|
2013-06-07 18:05:16 +05:30 |
|
Saurabh
|
d9bf642447
|
[Report][Changes made in Customers Not Buying Since Long Time.py]
|
2013-06-07 15:28:43 +05:30 |
|
Saurabh
|
5b1e899250
|
[Reports] [Customers Not Buying Sinse Long Time] and [Itemwise Recommended Reorder level]
|
2013-06-07 13:34:16 +05:30 |
|
Saurabh
|
1efc8b3734
|
[Reprots][No Sales Order From Customer] and [Item Reorder Level]
|
2013-06-06 19:31:14 +05:30 |
|
Anand Doshi
|
9d04924bc2
|
[selling] [cleanup] rearranged fields
|
2013-06-05 20:46:56 +05:30 |
|
Saurabh
|
7b48218b6f
|
[Reports][Reorder Level] and [No Sales Order from Customer]
|
2013-06-05 18:17:28 +05:30 |
|
Anand Doshi
|
12cea9587f
|
[terms and conditions] removed terms html and added terms and conditions to purchase invoice
|
2013-06-05 14:59:28 +05:30 |
|
Anand Doshi
|
bf3e54a45b
|
[issues #437] [fix] pulling terms and conditions
|
2013-06-05 14:11:32 +05:30 |
|
Nabin Hait
|
c6548b64c2
|
[fixes][merge conflict]
|
2013-06-05 12:53:53 +05:30 |
|
Nabin Hait
|
0feebc1a67
|
[status updater] managed by controllers and commonified for sales and purchase
|
2013-06-03 16:45:38 +05:30 |
|
Anand Doshi
|
ecc28f0311
|
[sales invoice] [update stock] allow update stock in sales invoice, without it being a pos invoice
|
2013-05-30 17:43:30 +05:30 |
|
Anand Doshi
|
200c8f7980
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
accounts/doctype/sales_invoice/sales_invoice.py
selling/doctype/sales_common/sales_common.py
|
2013-05-29 12:30:54 +05:30 |
|
Nabin Hait
|
df33532280
|
[fixes] pulling available qty on selection of item in case of pos
|
2013-05-29 11:03:11 +05:30 |
|
Anand Doshi
|
5d74c82c06
|
Merge branch 'webshop' of github.com:webnotes/erpnext into responsive
Conflicts:
selling/doctype/quotation/quotation.js
|
2013-05-28 17:46:50 +05:30 |
|
Anand Doshi
|
923d41dfd2
|
[selling/buying] [fixes] fixes in client side code, server side code, print formats
|
2013-05-28 17:23:36 +05:30 |
|
Nabin Hait
|
34d1b1415e
|
[report] filter added base on territory in sales personwise transaction summary
|
2013-05-28 12:32:21 +05:30 |
|
Nabin Hait
|
77a2ee01e2
|
[rename][fixes] do not update customer name of renaming of customer
|
2013-05-28 11:56:48 +05:30 |
|
Anand Doshi
|
fc77718a3d
|
[selling/buying] [fixes] updated js files of various doctypes related to selling/g/buying
|
2013-05-27 19:29:07 +05:30 |
|
Anand Doshi
|
3543f30046
|
[calculations] [client/server] first cut
|
2013-05-24 19:25:01 +05:30 |
|
Rushabh Mehta
|
126f2c62f2
|
[merge] merge with master
|
2013-05-24 16:09:13 +05:30 |
|
Anand Doshi
|
2168e39bf3
|
[selling/buying] set dynamic labels
|
2013-05-23 19:25:08 +05:30 |
|
Rushabh Mehta
|
b394a25904
|
[ui] fixed #83, #103, #114, #116 and other minor ui issues, upgraded to jquery 1.9
|
2013-05-23 16:03:49 +05:30 |
|
Anand Doshi
|
4543884021
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
accounts/doctype/sales_invoice_item/sales_invoice_item.txt
selling/doctype/quotation/quotation.txt
selling/doctype/quotation_item/quotation_item.txt
selling/doctype/sales_order_item/sales_order_item.txt
stock/doctype/delivery_note_item/delivery_note_item.txt
stock/doctype/item/item.txt
|
2013-05-23 15:22:47 +05:30 |
|
Anand Doshi
|
aabe11b689
|
[sales order] [validate] validate item details specifically when submitting
|
2013-05-23 12:59:12 +05:30 |
|
Nabin Hait
|
66928243c1
|
[fixes] removed communication section break from quotation
|
2013-05-22 16:55:10 +05:30 |
|
Nabin Hait
|
b7e07ac6a5
|
[fixes] updated no_copy field
|
2013-05-22 12:10:16 +05:30 |
|
Rushabh Mehta
|
4a2f0f8c36
|
[js-libs] upgraded to latest bootstrap and font-awesome
|
2013-05-22 11:57:05 +05:30 |
|
Anand Doshi
|
f309613a7d
|
[selling] [calculations] client side calculations, cleanup, patch fixes
|
2013-05-21 19:35:06 +05:30 |
|
Anand Doshi
|
1dde46aff0
|
[buying, selling] [refactor] get item details
|
2013-05-15 21:15:57 +05:30 |
|
Anand Doshi
|
aab81626ce
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
stock/doctype/item/item.txt
|
2013-05-10 18:12:24 +05:30 |
|
Anand Doshi
|
21f4ea36b2
|
[selling] [calculations] server side calculations, test cases and rounding based on currency number format
|
2013-05-10 18:08:32 +05:30 |
|
Anand Doshi
|
2186e83670
|
[lead to customer] [fix] fix for creating customer from lead when there are restrictive permissions based on company for creating customer
|
2013-05-10 00:39:15 +05:30 |
|
Anand Doshi
|
ef06a4b349
|
[autoname] [cleanup] strip blank spaces and remove autoname where naming_series: can be set in doctype
|
2013-05-09 15:13:47 +05:30 |
|
Anand Doshi
|
bddd5d9b0c
|
[rename] [fix] merge should be passed to on_rename method of controller for further processing
|
2013-05-09 12:45:18 +05:30 |
|
Rushabh Mehta
|
f514998011
|
merge
|
2013-05-09 11:42:35 +05:30 |
|
Anand Doshi
|
c414175a44
|
Merge branch 'master' of github.com:webnotes/erpnext into edge
|
2013-05-08 11:45:32 +05:30 |
|
Nabin Hait
|
620576080a
|
[fixes][currency symbol] fieldtype in report
|
2013-05-07 12:03:33 +05:30 |
|
Rushabh Mehta
|
08332ddacd
|
[form] [scripting] fixes and cleanups for new triggering system
|
2013-05-06 12:46:13 +05:30 |
|
Anand Doshi
|
4cea651a36
|
Merge branch 'master' of github.com:webnotes/erpnext into edge
|
2013-05-06 11:36:51 +05:30 |
|
Nabin Hait
|
dc992824d0
|
Merge branch 'master' into edge
|
2013-05-03 15:42:03 +05:30 |
|
Nabin Hait
|
c51c0ce3e9
|
[fixes] salary slip
|
2013-05-03 15:40:26 +05:30 |
|
Nabin Hait
|
9c7eb486ed
|
[Query Report] Item-wise Sales History
|
2013-05-03 14:50:12 +05:30 |
|
Anand Doshi
|
cba730c7bd
|
[sales common] [fix] minor fix in validation message
|
2013-05-03 14:47:59 +05:30 |
|
Nabin Hait
|
fdd919a1d3
|
[report] sales personwise transaction summary
|
2013-05-03 14:24:24 +05:30 |
|
Rushabh Mehta
|
d3e00995db
|
[conflicts] [merged]
|
2013-05-02 16:02:59 +05:30 |
|
Rushabh Mehta
|
3aeed95e0a
|
[customer/supplier] [address] extended list to 5
|
2013-05-02 11:39:46 +05:30 |
|
Rushabh Mehta
|
cc32b65b66
|
[toolbars] [design] commonified into common toolbar
|
2013-04-19 13:01:32 +05:30 |
|
Rushabh Mehta
|
d6c8235fb5
|
[style] [upgrade] moved to bootstrap 3
|
2013-04-18 17:43:21 +05:30 |
|
Rushabh Mehta
|
651ce05fcc
|
[merge master
]
|
2013-04-18 10:37:16 +05:30 |
|
Anand Doshi
|
c6aecb3f97
|
Merge branch 'master' into edge
Conflicts:
home/page/latest_updates/latest_updates.js
hr/doctype/employee/employee.txt
|
2013-04-16 21:32:06 +05:30 |
|
Rushabh Mehta
|
f61b680576
|
[style] moving to 100% bootstrap css, started form / appframe headers
|
2013-04-16 15:45:05 +05:30 |
|
Rushabh Mehta
|
ac118c8822
|
[cleanup] started responsive layouts and removed tinymce
|
2013-04-15 17:02:20 +05:30 |
|
Nabin Hait
|
69b410a2ed
|
fixes in sales personwise transaction summary report
|
2013-04-15 12:34:42 +05:30 |
|
Anand Doshi
|
3b2fd6e334
|
[sql] [fix] fixed item.py injections
|
2013-04-13 15:54:38 +05:30 |
|
Anand Doshi
|
93b638af4d
|
Merge branch 'master' into edge
Conflicts:
patches/patch_list.py
|
2013-04-10 19:47:46 +05:30 |
|
Anand Doshi
|
0b80883088
|
[lead] [permission] cleanup of permission
|
2013-04-10 15:28:23 +05:30 |
|
Rushabh Mehta
|
33075e1f69
|
[files] [patch] dropped file_list property and moved links to
|
2013-04-10 11:08:50 +05:30 |
|
Anand Doshi
|
6c5a37167a
|
Merge branch 'master' into edge
|
2013-04-04 13:59:16 +05:30 |
|
Anand Doshi
|
4db3b33dd6
|
[customer] [fix] on_trash sql syntax
|
2013-04-04 13:57:35 +05:30 |
|
Rushabh Mehta
|
d8cf1d74ba
|
Merge branch 'master' into edge
|
2013-04-03 16:39:02 +05:30 |
|
Anand Doshi
|
458fda8ca5
|
[quotation] [fix] letter head
|
2013-04-03 13:30:17 +05:30 |
|
Rushabh Mehta
|
5bbe063222
|
Merge branch 'master' into edge
|
2013-04-03 10:42:12 +05:30 |
|
Rushabh Mehta
|
ad16279efd
|
[quotation] [fix
] broken links
|
2013-04-03 09:53:24 +05:30 |
|
Nabin Hait
|
8f97d2dab0
|
[quotation][improvement] when made from lead
|
2013-04-02 18:14:31 +05:30 |
|
Nabin Hait
|
1e3fc88940
|
[quotation][improvement] when made from lead
|
2013-04-02 18:13:20 +05:30 |
|
Anand Doshi
|
19acce9fa1
|
[aii] [patches] minor fixes
|
2013-03-29 20:40:23 +05:30 |
|
Nabin Hait
|
787c02ee42
|
aii fixes
|
2013-03-29 16:42:33 +05:30 |
|
Rushabh Mehta
|
265c1947e3
|
[form] [usability] change z-index only if in form
|
2013-03-26 14:16:20 +05:30 |
|
Rushabh Mehta
|
988bca04f2
|
[selling] [usability] rearranged lead
|
2013-03-26 13:07:49 +05:30 |
|
Rushabh Mehta
|
b6c117957f
|
[fields, project] [fix] NaN bug, project gantt refresh bug
|
2013-03-26 13:02:22 +05:30 |
|
Nabin Hait
|
557d858d89
|
aii: patches and default values fetching
|
2013-03-25 18:28:16 +05:30 |
|
Nabin Hait
|
57916252d9
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-25 15:35:03 +05:30 |
|
Akhilesh Darjee
|
7e062b3352
|
barcode error in sales_invoice fixed.
|
2013-03-25 12:28:39 +05:30 |
|
Nabin Hait
|
690fefe9c1
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-25 11:07:38 +05:30 |
|
Nabin Hait
|
0fc2454384
|
aii: patches and fine tuning
|
2013-03-25 11:06:00 +05:30 |
|
Rushabh Mehta
|
3f725308e1
|
[website] [number_format] [fix] moved js function & added amount to order list
|
2013-03-22 14:56:31 +05:30 |
|
Rushabh Mehta
|
da512ba8c9
|
website: made order and ticket listing
|
2013-03-22 12:45:44 +05:30 |
|
Rushabh Mehta
|
af578d73ef
|
merge
|
2013-03-21 17:40:08 +05:30 |
|
Rushabh Mehta
|
bed19ac4d3
|
added website pages for orders, tickets and added sales invoice print format
|
2013-03-21 17:12:25 +05:30 |
|
Anand Doshi
|
080f9098c0
|
deprecated sales and purchase return tool
|
2013-03-18 17:57:59 +05:30 |
|
Anand Doshi
|
6f1dd26100
|
on deletion of lead, delete communication reference
|
2013-03-18 11:15:31 +05:30 |
|
Anand Doshi
|
4127bb14ed
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-12 12:48:10 +05:30 |
|
Nabin Hait
|
0cfbc5feb5
|
fixes in sales order test cases and set_buying_amount
|
2013-03-12 11:34:56 +05:30 |
|
Anand Doshi
|
df6ff1385f
|
fixes in warehouse validation
|
2013-03-11 19:44:52 +05:30 |
|
Nabin Hait
|
0e6ce9af17
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-07 18:50:23 +05:30 |
|
Nabin Hait
|
4f12923903
|
fixes in sales team percentage validation
|
2013-03-07 18:49:50 +05:30 |
|
Anand Doshi
|
b96fef9802
|
remove cancelled entries from grid report when fetching data based on modified
|
2013-03-07 15:35:36 +05:30 |
|
Anand Doshi
|
80f7637ae6
|
added print width in txts of istable type doctypes
|
2013-03-07 11:37:33 +05:30 |
|
Rushabh Mehta
|
ba7ed4c27c
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-05 14:20:24 +05:30 |
|
Rushabh Mehta
|
07287e8b93
|
removed colour fields from txt files
|
2013-03-05 14:19:48 +05:30 |
|
Nabin Hait
|
37731471fd
|
lead organization added in quotation classic/spartan/modern print format
|
2013-03-05 11:59:20 +05:30 |
|
Rushabh Mehta
|
ba0e1ea194
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-01 19:09:38 +05:30 |
|
Nabin Hait
|
54d209ffb0
|
sub-contracting code refactored for po
|
2013-03-01 18:51:10 +05:30 |
|
Rushabh Mehta
|
b21eb9ac09
|
added time log batch
|
2013-02-28 18:42:46 +05:30 |
|
billyfordson
|
9b352309c6
|
Adding German translation
|
2013-02-27 17:36:23 +01:00 |
|
Nabin Hait
|
6054ae2bec
|
delete gross profit based on search criteria
|
2013-02-26 10:51:24 +05:30 |
|
Rushabh Mehta
|
e4eb89b02a
|
added new language and filters in query reports
|
2013-02-25 13:00:16 +05:30 |
|
Rushabh Mehta
|
9e02949821
|
updated language and separated slickgrid files
|
2013-02-25 11:05:27 +05:30 |
|
Rushabh Mehta
|
defd0e15f2
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-02-22 17:55:22 +05:30 |
|
Rushabh Mehta
|
90098d2ebd
|
new employee_leave_balance_report
|
2013-02-22 17:54:50 +05:30 |
|
Anand Doshi
|
3e38d36580
|
fixes in sales email pulling
|
2013-02-22 13:08:14 +05:30 |
|
Anand Doshi
|
ff20067a6f
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-02-22 12:52:02 +05:30 |
|
Anand Doshi
|
5b859d84a1
|
fix in sales communication
|
2013-02-22 12:51:27 +05:30 |
|
Nabin Hait
|
8a14cdb45d
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-02-22 12:45:40 +05:30 |
|
Nabin Hait
|
87d270a5b5
|
refactored code for reserved qty with testcases
|
2013-02-22 12:44:51 +05:30 |
|
Anand Doshi
|
d2b2174ee4
|
removed last sales order update in customer
|
2013-02-22 01:44:52 +05:30 |
|
Rushabh Mehta
|
f41dd39286
|
added language
|
2013-02-21 16:57:54 +05:30 |
|
Nabin Hait
|
c924c1ebb5
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-02-21 14:53:42 +05:30 |
|
Nabin Hait
|
9082fad994
|
testcases for reserved qty
|
2013-02-21 14:49:44 +05:30 |
|
Anand Doshi
|
51fc7c0683
|
Merge branch 'master' of github.com:webnotes/erpnext into edge
|
2013-02-21 12:23:58 +05:30 |
|
Nabin Hait
|
8f7899a642
|
added stopped condition in pending to deliver/received/billed report
|
2013-02-21 11:44:08 +05:30 |
|
Anand Doshi
|
59d8a76e60
|
Merge branch 'master' of github.com:webnotes/erpnext into edge
Conflicts:
hr/doctype/leave_application/locale/_messages_py.json
hr/doctype/leave_block_list/locale/_messages_doc.json
public/js/locale/_messages_js.json
setup/doctype/email_digest/locale/_messages_doc.json
setup/doctype/global_defaults/global_defaults.txt
|
2013-02-21 11:09:43 +05:30 |
|
Nabin Hait
|
6f1a5ec209
|
Disable rounded total feature
|
2013-02-20 16:25:05 +05:30 |
|
Anand Doshi
|
7ce7d7cad4
|
Merge branch 'master' of github.com:webnotes/erpnext into edge
|
2013-02-20 16:08:43 +05:30 |
|
Nabin Hait
|
39fc5179f9
|
display customer name instead of customer id in quotation print format
|
2013-02-19 15:47:19 +05:30 |
|
Rushabh Mehta
|
5117d9c266
|
refactored defaults, bin material request wip
|
2013-02-19 15:27:31 +05:30 |
|
Rushabh Mehta
|
c53231a841
|
model_wrapper is now bean, refactoring defaults
|
2013-02-18 18:24:28 +05:30 |
|
Anand Doshi
|
236cc173ad
|
rename Purchase Request to Material Request
|
2013-02-18 13:49:15 +05:30 |
|
Anand Doshi
|
e74a1f2b85
|
fixes in outstanding amount calculation on cancellation of payment entry
|
2013-02-14 13:38:12 +05:30 |
|
Rushabh Mehta
|
51709b7eb3
|
Merge branch 'master' into edge
|
2013-02-12 19:23:48 +05:30 |
|
Rushabh Mehta
|
4b9827a5fc
|
upgraded test_runner, now can run multiple tests
|
2013-02-12 19:20:39 +05:30 |
|
Nabin Hait
|
4860754407
|
call calc_adjustment_amount function only if docstatus is zero
|
2013-02-12 18:49:55 +05:30 |
|
Rushabh Mehta
|
629c196606
|
added date in pop3 mails
|
2013-02-11 16:21:14 +05:30 |
|
Rushabh Mehta
|
e38d783aff
|
removed session timeout for getting emails
|
2013-02-11 15:55:20 +05:30 |
|
Rushabh Mehta
|
d015dfce92
|
sales communication fix for status
|
2013-02-11 15:10:53 +05:30 |
|
Rushabh Mehta
|
0e5401ccbf
|
sales communication fix for status
|
2013-02-11 15:08:24 +05:30 |
|
Rushabh Mehta
|
176829e53c
|
added status to Contact and fix bug in communication pull
|
2013-02-11 14:54:30 +05:30 |
|
Rushabh Mehta
|
af222dc6b2
|
updated language
|
2013-02-11 11:49:18 +05:30 |
|
Rushabh Mehta
|
60135df6fd
|
updated language
|
2013-02-11 11:44:12 +05:30 |
|
Nabin Hait
|
2604a99072
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-02-08 14:08:28 +05:30 |
|
Nabin Hait
|
0739e7f573
|
fixed conflict
|
2013-02-08 14:07:29 +05:30 |
|
Nabin Hait
|
a76a0687ef
|
get_query continued
|
2013-02-08 14:04:13 +05:30 |
|
Anand Doshi
|
6a5efa972b
|
added test record for purchase invoice test case
|
2013-02-08 13:57:05 +05:30 |
|
Anand Doshi
|
6209046772
|
added some test records
|
2013-02-07 19:47:34 +05:30 |
|
Rushabh Mehta
|
14464473da
|
email receive bugfix
|
2013-02-06 20:31:08 +05:30 |
|
Rushabh Mehta
|
2e8d078adf
|
adding block list, part 1
|
2013-02-05 11:31:27 +05:30 |
|
Nabin Hait
|
c06e29ddbc
|
removed sales order pending items report
|
2013-02-01 18:35:35 +05:30 |
|
Nabin Hait
|
24c4bb5d6a
|
fixes in sales invoice
|
2013-02-01 16:03:50 +05:30 |
|
Nabin Hait
|
fb3fd6e3e5
|
deprecated gl_control and some rewrites
|
2013-01-30 19:16:13 +05:30 |
|
Nabin Hait
|
c6a86535ef
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-01-30 16:45:19 +05:30 |
|
Rushabh Mehta
|
86f0bc81a9
|
fixed currency in old report
|
2013-01-30 15:21:07 +05:30 |
|
Nabin Hait
|
53595c6521
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-01-30 12:49:44 +05:30 |
|
Nabin Hait
|
bf495c9a6d
|
GL Control rewrite and many other cleanup using inheritence
|
2013-01-30 12:49:08 +05:30 |
|
Rushabh Mehta
|
08da1a0a3d
|
setting list_views
|
2013-01-29 17:53:29 +05:30 |
|
Rushabh Mehta
|
fe99c293a9
|
reset modified dates
|
2013-01-28 15:30:02 +05:30 |
|
Rushabh Mehta
|
cda5d42a65
|
updated languages
|
2013-01-28 14:21:40 +05:30 |
|
Rushabh Mehta
|
7b563f7569
|
added translation files
|
2013-01-28 11:19:03 +05:30 |
|
Nabin Hait
|
f89fb1e41a
|
Other charges in currect currency fixes for all classic/modern/spartan print g=format
|
2013-01-25 17:24:47 +05:30 |
|
Rushabh Mehta
|
8e3affbf70
|
added nl
|
2013-01-25 11:58:18 +05:30 |
|
Rushabh Mehta
|
f8b9c51e1b
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-01-25 10:20:04 +05:30 |
|
Rushabh Mehta
|
4e01011669
|
added language to pages
|
2013-01-24 19:31:55 +05:30 |
|
Nabin Hait
|
c53177a412
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-01-24 18:35:42 +05:30 |
|
Nabin Hait
|
96601597e3
|
sales analytics based on sales order/delivery note/sales invoice
|
2013-01-24 18:24:33 +05:30 |
|
Rushabh Mehta
|
317177afd2
|
updated languages
|
2013-01-24 18:18:39 +05:30 |
|
Rushabh Mehta
|
ad14943c3f
|
added arabic
|
2013-01-24 17:37:43 +05:30 |
|
Rushabh Mehta
|
4c17718b4c
|
added portuguese
|
2013-01-24 16:31:23 +05:30 |
|
Nabin Hait
|
665175e0c1
|
fixes in territory link to sales browser
|
2013-01-24 16:08:26 +05:30 |
|
Rushabh Mehta
|
877a1a9274
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-01-24 15:56:15 +05:30 |
|
Rushabh Mehta
|
908d09d058
|
added spanish
|
2013-01-24 15:55:30 +05:30 |
|
Rushabh Mehta
|
27254d9440
|
added spanish
|
2013-01-24 15:55:08 +05:30 |
|
Nabin Hait
|
195d579361
|
check customer/customer_group with same name while creating customer_group/customer
|
2013-01-24 15:07:24 +05:30 |
|
Nabin Hait
|
dd8e2b161d
|
create sales browser documents through wrapper
|
2013-01-24 14:57:43 +05:30 |
|
Nabin Hait
|
b483731c0c
|
fixes route info for sales order pending to be delivered report
|
2013-01-24 11:59:17 +05:30 |
|
Nabin Hait
|
fd23153f50
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-01-24 11:03:24 +05:30 |
|
Nabin Hait
|
8df3f125e5
|
stripped serial nos before processing
|
2013-01-24 11:02:48 +05:30 |
|
Rushabh Mehta
|
597d470e63
|
added format_currency and added options to all currency fields
|
2013-01-23 19:39:51 +05:30 |
|
Rushabh Mehta
|
6382a42dbe
|
more fixes to perms, floats and default enabled / disabled in search
|
2013-01-23 10:09:28 +05:30 |
|
Rushabh Mehta
|
efe8102351
|
merge
|
2013-01-22 15:23:58 +05:30 |
|
Rushabh Mehta
|
cd4a854a28
|
converted currency to float and removed level 1 permissions
|
2013-01-22 15:10:25 +05:30 |
|
Anand Doshi
|
2d46e1e826
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-01-22 12:33:21 +05:30 |
|
Anand Doshi
|
d0c49f331e
|
changed naming series of opportunity, removed message field from quotation
|
2013-01-22 12:31:31 +05:30 |
|
Rushabh Mehta
|
fad6746ca1
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-01-22 12:13:18 +05:30 |
|
Rushabh Mehta
|
3d55e3dd59
|
fmt_money - don't format flat types
|
2013-01-22 12:09:51 +05:30 |
|
Anand Doshi
|
70c41b6722
|
Merge branch 'edge' of github.com:webnotes/erpnext into edge
|
2013-01-22 11:58:48 +05:30 |
|
Anand Doshi
|
ef7599f550
|
fix in lead lost issue in quotation
|
2013-01-22 11:55:05 +05:30 |
|
Nabin Hait
|
ec52db8490
|
commonified in_words function and introduced selling_controller
|
2013-01-22 11:53:14 +05:30 |
|
Rushabh Mehta
|
bb9968491b
|
added report permissions to txt files
|
2013-01-21 14:22:07 +05:30 |
|
Anand Doshi
|
ef02ddfc40
|
Merge branch 'master' of github.com:webnotes/erpnext into purchase_price_list
Conflicts:
accounts/doctype/gl_control/gl_control.py
|
2013-01-17 20:31:41 +05:30 |
|
Rushabh Mehta
|
db7139a649
|
started fresh install and added country_info
|
2013-01-17 18:22:22 +05:30 |
|
Anand Doshi
|
9d9aec1ed4
|
shifted get_company_currency from transaction base to setup/utils.py
|
2013-01-17 15:44:57 +05:30 |
|
Rushabh Mehta
|
6f9915cd17
|
install from txt files, part 1
|
2013-01-16 17:48:17 +05:30 |
|
Rushabh Mehta
|
8f3916dd54
|
add job applicant, sales and jobs email settings to module help
|
2013-01-16 12:50:55 +05:30 |
|
Rushabh Mehta
|
8d3fe553e5
|
added automatic lead creation for sales email id
|
2013-01-16 12:19:28 +05:30 |
|
Rushabh Mehta
|
2e5db35856
|
added automatic lead creation for sales email id
|
2013-01-16 11:34:26 +05:30 |
|
Anand Doshi
|
6c5262abb1
|
Merge branch 'master' of github.com:webnotes/erpnext into stock_reco
Conflicts:
patches/patch_list.py
stock/report/stock_ledger/stock_ledger.txt
|
2013-01-14 13:28:31 +05:30 |
|
Anand Doshi
|
4d79bfb225
|
added back Trend Analyzer report to home pages
|
2013-01-11 19:06:57 +05:30 |
|
Rushabh Mehta
|
ae1b0cee1b
|
added help in doclistview to show match conditions
|
2013-01-11 16:13:41 +05:30 |
|
Anand Doshi
|
ad13b4a716
|
Merge branch 'master' of github.com:webnotes/erpnext into stock_reco
|
2013-01-10 14:38:08 +05:30 |
|
Rushabh Mehta
|
be0b7df27e
|
Merge branch 'master' of github.com:webnotes/erpnext into edge
|
2013-01-09 16:41:01 +05:30 |
|
Rushabh Mehta
|
ce1d5276ff
|
added moduleview
|
2013-01-09 16:39:27 +05:30 |
|
Nabin Hait
|
0f61b476a2
|
toggle display of contact info based on customer
|
2013-01-09 12:50:43 +05:30 |
|
Nabin Hait
|
dc8913e132
|
toggle display of contact info based on customer and conatct, address query based on customer
|
2013-01-09 12:35:24 +05:30 |
|
Anand Doshi
|
435fd1426b
|
Merge branch 'master' of github.com:webnotes/erpnext into stock_reco
|
2013-01-09 11:25:34 +05:30 |
|
Nabin Hait
|
9d0f636c46
|
stock reconciliation - rewrite in progress
|
2013-01-07 18:51:11 +05:30 |
|
Rushabh Mehta
|
143ea718c3
|
commified item_code query
|
2013-01-07 17:03:11 +05:30 |
|
Rushabh Mehta
|
523aec499a
|
bootstrapped language and added 'hi'
|
2013-01-07 15:39:54 +05:30 |
|
Anand Doshi
|
f9a3c8fcdc
|
added status validation
|
2012-12-28 19:42:49 +05:30 |
|
Nabin Hait
|
5d273df92e
|
changes in layout of module home page
|
2012-12-28 15:39:21 +05:30 |
|
Anand Doshi
|
44c9def74f
|
if no address, only then have address type as Office
|
2012-12-27 18:34:35 +05:30 |
|
Rushabh Mehta
|
43eb513a43
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-27 16:50:55 +05:30 |
|
Rushabh Mehta
|
1b1517155b
|
added about us page and settings
|
2012-12-27 16:50:24 +05:30 |
|
Nabin Hait
|
562de92070
|
removed project related doctype mapper
|
2012-12-27 15:14:27 +05:30 |
|
Nabin Hait
|
e05a5b6043
|
do not pull customer on selection of project
|
2012-12-27 15:05:06 +05:30 |
|
Anand Doshi
|
f04fa4664d
|
fixes in lead list
|
2012-12-27 14:05:10 +05:30 |
|
Rushabh Mehta
|
5f1d57ecb7
|
address now not in dialog, added slideshows in products and groups and removed transaction history from customer / supplier / sales partner
|
2012-12-27 14:05:02 +05:30 |
|
Anand Doshi
|
a85b2e4ee3
|
show company name in lead list
|
2012-12-27 13:52:47 +05:30 |
|
Anand Doshi
|
bde1f4f454
|
minor fix in support ticket
|
2012-12-27 13:32:11 +05:30 |
|
Anand Doshi
|
5ea807829a
|
added company in lead list
|
2012-12-27 13:07:50 +05:30 |
|
Anand Doshi
|
a0713196d2
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-24 18:08:16 +05:30 |
|
Anand Doshi
|
f5d90abe92
|
addchild will never save added doc
|
2012-12-24 17:02:38 +05:30 |
|
Rushabh Mehta
|
6f65de15ae
|
appframe fixes
|
2012-12-22 13:50:35 +05:30 |
|
Anand Doshi
|
879ec66ea3
|
Merge branch 'production' of github.com:webnotes/erpnext into production
Conflicts:
accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
buying/doctype/purchase_order_item/purchase_order_item.txt
buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
patches/patch_list.py
|
2012-12-19 22:28:00 +05:30 |
|
Rushabh Mehta
|
1ba4bd4485
|
added webclient.py and some misc fixes
|
2012-12-19 17:05:51 +05:30 |
|
Rushabh Mehta
|
40ca2c681a
|
removed next_contact in quotation, fixed regex to convert relative links to absolute
|
2012-12-19 12:46:03 +05:30 |
|
Nabin Hait
|
5f175dfd00
|
Merge branch 'master' into production
|
2012-12-18 13:49:07 +05:30 |
|
Nabin Hait
|
e93150bf26
|
sales order linked with project
|
2012-12-18 10:33:04 +05:30 |
|
Nabin Hait
|
5ca0f44890
|
bom cleanup
|
2012-12-14 19:00:42 +05:30 |
|
Nabin Hait
|
f8de5b9878
|
merged with master
|
2012-12-14 10:43:56 +05:30 |
|
Nabin Hait
|
22c3f63edd
|
small fixes: sms, quotation messages etc
|
2012-12-13 15:09:42 +05:30 |
|
Anand Doshi
|
221f03be01
|
minor fixes
|
2012-12-13 15:04:18 +05:30 |
|
Rushabh Mehta
|
291449b6fb
|
refactored javascript models
|
2012-12-13 12:53:21 +05:30 |
|
Nabin Hait
|
003b31ae06
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-12 16:27:22 +05:30 |
|
Nabin Hait
|
06cbd3427f
|
dynamic query for root in sales browser, validation for tree structure document
|
2012-12-12 16:26:39 +05:30 |
|
Rushabh Mehta
|
9e12af4b7c
|
updated recipients email in communication
|
2012-12-12 16:13:29 +05:30 |
|
Nabin Hait
|
34f89e4760
|
Update selling/page/selling_home/selling_home.html
|
2012-12-12 13:13:13 +05:30 |
|
Nabin Hait
|
33e0b5581e
|
communication list in selling module
|
2012-12-12 13:01:01 +05:30 |
|
Nabin Hait
|
be356b8692
|
Merge branch 'master' of github.com:webnotes/erpnext into production
|
2012-12-12 12:58:22 +05:30 |
|
Rushabh Mehta
|
74aebf0965
|
added Communication to Selling and refactored module pages a bit
|
2012-12-12 11:03:51 +05:30 |
|
Anand Doshi
|
c3b9a00c53
|
changed old type txt to new type txtt
|
2012-12-11 15:20:53 +05:30 |
|
Anand Doshi
|
36bf910563
|
removed Standard from default print format
|
2012-12-11 14:01:59 +05:30 |
|
Anand Doshi
|
50a19b578c
|
fix in fiscal year validation
|
2012-12-10 18:06:14 +05:30 |
|
Rushabh Mehta
|
af63b16be8
|
f
|
2012-12-10 13:41:10 +05:30 |
|
Nabin Hait
|
9b924ce695
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-07 14:43:40 +05:30 |
|
Nabin Hait
|
2ce027fc9f
|
floating point issue in percentage delivered/billed
|
2012-12-07 14:43:06 +05:30 |
|
Rushabh Mehta
|
2fd32859e7
|
added: sales_orders_pending_to_be_delivered
|
2012-12-07 10:17:22 +05:30 |
|
Rushabh Mehta
|
76c4f61ffb
|
more refactoring to renaming
|
2012-12-06 12:09:52 +05:30 |
|
Rushabh Mehta
|
bbd5ea32d1
|
added client side functions and mode_of_payment defaults
|
2012-12-04 16:31:54 +05:30 |
|
Nabin Hait
|
23aac61bbf
|
removed basic info section
|
2012-12-03 17:27:21 +05:30 |
|
Nabin Hait
|
4c70cd974a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-03 15:58:37 +05:30 |
|
Nabin Hait
|
dd4c679899
|
stock entry incoming rate fixes and batch no get_query
|
2012-12-03 15:57:50 +05:30 |
|
Anand Doshi
|
ef6a76f8aa
|
fixes in renaming account, supplier, customer; fixes in accounts browser; fixes in customer address contact fetching in opportunity
|
2012-12-03 15:45:03 +05:30 |
|
Rushabh Mehta
|
7dd13a45f6
|
chart of account fixes, added delete, rename
|
2012-12-03 14:11:24 +05:30 |
|
Rushabh Mehta
|
833f070991
|
added allow_rename and also fix in autonotification
|
2012-12-03 11:33:08 +05:30 |
|
Anand Doshi
|
eaed03d010
|
replaced convert_to_lists
|
2012-11-30 17:24:54 +05:30 |
|
Anand Doshi
|
ea61d8cf99
|
replaced set
|
2012-11-30 17:18:45 +05:30 |
|
Anand Doshi
|
535fbb1b00
|
replaced get_value
|
2012-11-30 17:16:03 +05:30 |
|
Anand Doshi
|
a2c6349342
|
added get_value
|
2012-11-30 17:08:00 +05:30 |
|
Anand Doshi
|
0fd99e7536
|
removed unnecessary imports
|
2012-11-30 16:38:04 +05:30 |
|
Nabin Hait
|
3e0612db83
|
fixed conflict
|
2012-11-30 15:02:20 +05:30 |
|
Nabin Hait
|
faf251a53e
|
Production cleanup with linking with sales order
|
2012-11-30 14:36:01 +05:30 |
|
Rushabh Mehta
|
35c017a78f
|
cleanup of notification control: now in boot
|
2012-11-30 10:57:28 +05:30 |
|
Rushabh Mehta
|
b12d5363bc
|
merge
|
2012-11-29 16:30:57 +05:30 |
|
Rushabh Mehta
|
d7fe2bfe1b
|
webnotes.model.doctype (new version)
|
2012-11-29 11:49:56 +05:30 |
|
Anand Doshi
|
342e3c4616
|
mark expected delivery date mandatory for Sales Order of type Sales
|
2012-11-28 18:28:23 +05:30 |
|
Anand Doshi
|
88d522aa51
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-11-28 17:14:23 +05:30 |
|
Anand Doshi
|
01bf10b8b6
|
changed default to Monthly in new grid reports
|
2012-11-28 17:12:18 +05:30 |
|
Nabin Hait
|
c62fe40e85
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-11-28 16:49:53 +05:30 |
|
Nabin Hait
|
c4fb30dc8d
|
Removed basic info section
|
2012-11-28 16:49:18 +05:30 |
|
Rushabh Mehta
|
57774c032c
|
contact.js: set customer, supplier
|
2012-11-28 16:01:58 +05:30 |
|
Nabin Hait
|
ef71940d58
|
Update delivered qty and billed amt in SO, if POS against Sales Order
|
2012-11-28 12:15:45 +05:30 |
|
Rushabh Mehta
|
fe9707a08a
|
refactored communication and added to Lead / Contact
|
2012-11-27 18:43:19 +05:30 |
|
Rushabh Mehta
|
80127bfb6a
|
refactored communication and added to Lead / Contact
|
2012-11-27 18:41:35 +05:30 |
|
Anand Doshi
|
726963c153
|
minor fixes in overflow percent of sales common
|
2012-11-27 16:38:43 +05:30 |
|
Anand Doshi
|
58babf93c6
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-11-26 18:48:11 +05:30 |
|
Anand Doshi
|
ca868e42ae
|
added module icons in grid reports
|
2012-11-26 18:47:54 +05:30 |
|
Rushabh Mehta
|
c4e7b6800a
|
separated communication view
|
2012-11-26 18:18:10 +05:30 |
|
Rushabh Mehta
|
de91a21946
|
commonified naming_series
|
2012-11-26 11:58:22 +05:30 |
|
Rushabh Mehta
|
bf09c672cd
|
support ticket response deprecated, moved to communication
|
2012-11-24 15:26:48 +05:30 |
|
Rushabh Mehta
|
bc54dadd44
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-11-23 17:54:19 +05:30 |
|
Rushabh Mehta
|
78d4b49e62
|
introducing model 3.0, refactored import module
|
2012-11-23 17:53:43 +05:30 |
|
Anand Doshi
|
f471aa65cd
|
get charges, if specified as default through customize form
|
2012-11-23 16:48:10 +05:30 |
|
Anand Doshi
|
93a35cab19
|
added customer get_query to allow search based on customer name. also don't show name again if id naming is based on customer name and not series
|
2012-11-21 18:02:22 +05:30 |
|
Anand Doshi
|
b45cbda7fa
|
fixed order by for common queries, should be ordered based on startswith match and then alphabetical order for fuzzy match
|
2012-11-21 18:00:22 +05:30 |
|
Anand Doshi
|
452e6869b1
|
lead get query to search by lead name or lead's company name
|
2012-11-19 18:08:55 +05:30 |
|
Anand Doshi
|
e33b755946
|
shipping address changed back to link field
|
2012-11-19 16:03:05 +05:30 |
|
Anand Doshi
|
e65e621145
|
get_query for profile based link fields to enable searching by name
|
2012-11-19 15:43:18 +05:30 |
|
Rushabh Mehta
|
2d231514e6
|
lead list name bugfix
|
2012-11-16 18:40:29 +05:30 |
|
Rushabh Mehta
|
ce4ed265d2
|
fixes to rename_tool, added serial no for rename
|
2012-11-16 14:25:03 +05:30 |
|
Rushabh Mehta
|
188185f3a3
|
help link fixes in lead, opportunity; delete cancelled sles for item
|
2012-11-16 12:39:05 +05:30 |
|
Rushabh Mehta
|
14c8223985
|
updated data import template and removed upload feature in price list
|
2012-11-15 12:44:41 +05:30 |
|
Rushabh Mehta
|
3684155f28
|
deprecated breadcrumbs, titles are now selectable
|
2012-11-13 16:44:27 +05:30 |
|
Rushabh Mehta
|
fe7b444903
|
reportview, grid_report part of build and separate default dates
|
2012-11-12 15:39:47 +05:30 |
|
Nabin Hait
|
b444ba73e9
|
removed overwriting delivery date code on so_item
|
2012-11-07 11:52:38 +05:30 |
|
Nabin Hait
|
ed81573545
|
gross profit report fix
|
2012-11-06 15:28:15 +05:30 |
|
Nabin Hait
|
84d8d0538f
|
gross profit report fix
|
2012-11-06 15:21:55 +05:30 |
|
Nabin Hait
|
e75b558b3e
|
gross profit report fix
|
2012-11-06 14:56:40 +05:30 |
|
Nabin Hait
|
0c33b0e9d4
|
gross profit overloaded query
|
2012-11-06 14:37:03 +05:30 |
|
Nabin Hait
|
03d957027c
|
reorder level fixes
|
2012-10-30 12:43:04 +05:30 |
|
Anand Doshi
|
548eb7b1c3
|
change project get_query to include projects with status other than Completed and Cancelled
|
2012-10-29 14:26:38 +05:30 |
|
Nabin Hait
|
981d48339a
|
Warehouse merging feature and update_bin cleanup
|
2012-10-26 14:42:48 +05:30 |
|
Anand Doshi
|
57e947ddcf
|
removed set_fetch from opportunity.js
|
2012-10-17 15:26:19 +05:30 |
|
Anand Doshi
|
1aace542c9
|
removed import error bypass and added missing py files for each doctype
|
2012-10-10 14:26:23 +05:30 |
|
Nabin Hait
|
760955fc68
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-10-04 18:35:47 +05:30 |
|
Nabin Hait
|
3e32040ae0
|
customer addresses and contacts report (query)
|
2012-10-04 18:35:17 +05:30 |
|
Anand Doshi
|
cdba51c5a9
|
added page permissions, modified report listing links
|
2012-10-04 18:11:29 +05:30 |
|
Anand Doshi
|
278f93c941
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-10-04 13:54:17 +05:30 |
|
Anand Doshi
|
037ce25f37
|
fixes in data import tool - restrict import upto 500 rows, commit only if import is successful, else rollback
|
2012-10-04 11:51:30 +05:30 |
|
Rushabh Mehta
|
e7ccc317de
|
dynamic loading for reports
|
2012-10-04 09:57:01 +05:30 |
|
Rushabh Mehta
|
92207be0bd
|
lead, support show modified avatar
|
2012-10-03 18:44:32 +05:30 |
|
Rushabh Mehta
|
3009c46ba5
|
moved to bootstrap 2.1 and some ui fixes in todo and messages
|
2012-10-03 11:56:38 +05:30 |
|
Anand Doshi
|
05aaae33ae
|
Merge branch 'master' of github.com:webnotes/erpnext into 1209
Conflicts:
accounts/doctype/account/account.py
erpnext/accounts/doctype/journal_voucher/journal_voucher.py
patches/patch_list.py
startup/event_handlers.py
|
2012-10-02 14:35:20 +05:30 |
|
Anand Doshi
|
3245a15cb7
|
added future imports
|
2012-10-01 11:35:49 +05:30 |
|
Anand Doshi
|
b83307823b
|
Merge branch '1209' of github.com:webnotes/erpnext into 1209
|
2012-09-28 12:39:37 +05:30 |
|
Anand Doshi
|
8bde7cb8db
|
Merge branch 'master' of github.com:webnotes/erpnext into 1209
|
2012-09-28 12:36:22 +05:30 |
|
Rushabh Mehta
|
534a7a92fe
|
updated shortcuts
|
2012-09-28 12:33:42 +05:30 |
|
Rushabh Mehta
|
224714c248
|
no role access for financial analytics
|
2012-09-28 10:23:27 +05:30 |
|
Rushabh Mehta
|
901af83f48
|
lead.js, bugfix
|
2012-09-27 17:17:23 +05:30 |
|
Anand Doshi
|
3c4238fc9c
|
Merge branch 'master' of github.com:webnotes/erpnext into 1209
Conflicts:
public/js/all-app.js
public/js/all-web.js
|
2012-09-26 12:24:28 +05:30 |
|
Rushabh Mehta
|
7c454b3039
|
dont save duplicate files
|
2012-09-25 18:20:36 +05:30 |
|
Rushabh Mehta
|
0152b12e75
|
__session_cache removed and introducted memcache for caching
|
2012-09-25 14:22:23 +05:30 |
|
Rushabh Mehta
|
707932da0c
|
updated paths
|
2012-09-25 10:42:00 +05:30 |
|
Rushabh Mehta
|
2fa2f7178d
|
moved directory structure
|
2012-09-24 19:13:42 +05:30 |
|
Rushabh Mehta
|
66ac2b018a
|
first cut for lazy loading framework
|
2011-09-05 18:43:09 +05:30 |
|
Brahma K
|
e7eec96485
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-09-01 16:09:16 +05:30 |
|
Nabin Hait
|
630f433741
|
if source qty/amt zero, do not check for over delivery/bill
|
2011-08-31 17:23:23 +05:30 |
|
Brahma K
|
cc236198f7
|
Feature Setup merge with upstream
|
2011-08-30 09:32:41 +05:30 |
|
Brahma K
|
6ae1219956
|
Added new Feature List option to control front end based on companies broad requirements
|
2011-08-29 19:24:54 +05:30 |
|
Nabin Hait
|
2c03015537
|
same from and to flds deleted from mapper
|
2011-08-25 19:41:24 +05:30 |
|
Brahma K
|
29d5549bde
|
Features Setting
1. Features Setting DocType
2. Startup.js will be added with a function which binds with refresh of doc
3. Startup.js contains the Features dictionary
|
2011-08-25 16:20:16 +05:30 |
|
Brahma K
|
28a7b2800f
|
Delivery Note changes 1.Net Wt, Gross Wt at packing slip level
|
2011-08-22 12:23:53 +05:30 |
|
Rushabh Mehta
|
89717292b7
|
fixed get_server_values to make them utf-8 friendly
|
2011-08-12 10:55:43 +05:30 |
|
Nabin Hait
|
e35618bb21
|
fixed bug of reserved_qty if sales bom exists for the item
|
2011-08-11 15:52:21 +05:30 |
|
Nabin Hait
|
76980b0e55
|
update billed_amt, per billed and billing status based on amount
|
2011-08-10 16:35:25 +05:30 |
|
Nabin Hait
|
8a80d61cc4
|
billiing status based on amount
|
2011-08-10 16:29:20 +05:30 |
|
Nabin Hait
|
b24ba8ef52
|
indentation replaced by tab
|
2011-08-05 11:15:07 +05:30 |
|
Nabin Hait
|
d8b7f8eb77
|
fn reordered in sales common
|
2011-08-05 11:13:27 +05:30 |
|
nabinhait
|
23760e755d
|
export_to_files function removed from index_patch, it was only for local
|
2011-07-20 10:46:21 +05:30 |
|
nabinhait
|
1458af0691
|
Index patch released and doctype updated based on index
|
2011-07-20 10:31:19 +05:30 |
|
Ravi Dey
|
6c174a6e35
|
company default currency fix
|
2011-07-11 16:40:49 +05:30 |
|
nabinhait
|
1bd56b1c08
|
removed get_tips() from js file
|
2011-07-05 14:41:36 +05:30 |
|
nabinhait
|
c297df5b16
|
Removed Tips Common from each js file
|
2011-07-05 10:54:05 +05:30 |
|
nabinhait
|
68c6e00b52
|
removed check_approving_authority fn and Approval Structure dt bcoz it was not using anywhere
|
2011-07-04 13:18:15 +05:30 |
|
nabinhait
|
a56fc00ea3
|
resoved conflict in patch, company and renaming tools
|
2011-07-01 16:32:03 +05:30 |
|
nabinhait
|
963f36b969
|
all txt files updated due to module renaming/merging
|
2011-07-01 15:47:42 +05:30 |
|
nabinhait
|
ec097975d0
|
restructured erpnext and deleted unwanted
|
2011-07-01 13:34:41 +05:30 |
|