Anand Doshi
|
4ee647e84c
|
[bean] [mandatory] fixes in test cases
|
2013-07-08 18:50:45 +05:30 |
|
Saurabh
|
028755941e
|
get_query to server side
|
2013-07-08 18:45:55 +05:30 |
|
Rushabh Mehta
|
d9e7070f2d
|
[mapper-pull] for sales / purchae
|
2013-07-08 18:01:46 +05:30 |
|
Rushabh Mehta
|
862a02b8d2
|
[pull-mappers] no fields via custom button, started with quotation, material request, purchase order
|
2013-07-08 15:52:24 +05:30 |
|
Rushabh Mehta
|
436467a5c9
|
[purchase order] tests pass
|
2013-07-08 12:37:59 +05:30 |
|
Rushabh Mehta
|
886c9ef5d1
|
[material requests] [tests]
|
2013-07-08 12:08:06 +05:30 |
|
Rushabh Mehta
|
a2a1ec765b
|
[mappers] cleanup, remove dt_map, map_doclist and other such functions
|
2013-07-08 11:08:27 +05:30 |
|
Nabin Hait
|
a5be5c41cc
|
[mapper]
|
2013-07-07 11:28:17 +05:30 |
|
Nabin Hait
|
126aedda08
|
[mapper]
|
2013-07-05 18:30:16 +05:30 |
|
Nabin Hait
|
1bec8012d2
|
[conflict] fixed
|
2013-07-05 15:25:58 +05:30 |
|
Nabin Hait
|
eb883ee7a3
|
[mapper] purchase cycle
|
2013-07-05 15:23:47 +05:30 |
|
Rushabh Mehta
|
3a3c2710d1
|
[icon] added in doctype
|
2013-07-05 15:13:31 +05:30 |
|
Nabin Hait
|
44935e4608
|
[fixed conflict]
|
2013-07-05 10:26:29 +05:30 |
|
Nabin Hait
|
2de1cfc1c1
|
[mapper] material request - PO/supp quote/stock entry
|
2013-07-05 10:23:00 +05:30 |
|
Anand Doshi
|
8aaccf7269
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
Conflicts:
selling/doctype/lead/lead.txt
|
2013-07-04 17:18:45 +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 |
|
Rushabh Mehta
|
8aded138c7
|
[buying] started cleanup, [mapper] started rewrite
|
2013-07-04 12:50:52 +05:30 |
|
Rushabh Mehta
|
9a04b19160
|
[form] [legacy-js] removed old Dialog, PageHeader etc., cleanup Opportunity and Quotation
|
2013-07-03 13:27:39 +05:30 |
|
Rushabh Mehta
|
78979dca9b
|
[form] added icon in section break
|
2013-07-03 10:32:33 +05:30 |
|
Anand Doshi
|
15db6c4659
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
accounts/doctype/sales_invoice/sales_invoice.py
accounts/doctype/sales_invoice_item/sales_invoice_item.txt
buying/doctype/supplier_quotation/supplier_quotation.js
patches/patch_list.py
|
2013-07-02 11:50:32 +05:30 |
|
Rushabh Mehta
|
d420401ba3
|
[moduleview] added top bar
|
2013-07-01 17:15:23 +05:30 |
|
Rushabh Mehta
|
1bcc19e019
|
[item] default warehouse is selected with item
|
2013-07-01 11:46:07 +05:30 |
|
Saurabh
|
d6cc5cd08f
|
[Trends Teports] cleanup
|
2013-06-28 10:09:46 +05:30 |
|
Rushabh Mehta
|
65d12926fd
|
[setup] bug fixes
|
2013-06-26 22:31:22 +05:30 |
|
Akhilesh Darjee
|
89bd216a0c
|
[Fix] SMS Center
|
2013-06-26 18:28:54 +05:30 |
|
Rushabh Mehta
|
9132de5e4c
|
[global defaults] breakup added buying settings and selling settings
|
2013-06-25 11:54:37 +05:30 |
|
Rushabh Mehta
|
d242a8babd
|
[patch] breakup global defaults
|
2013-06-25 11:46:07 +05:30 |
|
Rushabh Mehta
|
7a93d5de30
|
[bug fixes] [global defaults] [cleanup]
|
2013-06-24 18:18:46 +05:30 |
|
Rushabh Mehta
|
7925bd7079
|
[merge]
|
2013-06-24 15:47:02 +05:30 |
|
Nabin Hait
|
82366d3bb8
|
[report] deleted old reports based on search_criteria
|
2013-06-24 14:31:56 +05:30 |
|
Anand Doshi
|
61a2f68bc6
|
[webshop] territories in price list, taxes, updates in shopping cart settings
|
2013-06-21 17:55:31 +05:30 |
|
Nabin Hait
|
b0f69cdd88
|
[report][deleted] itemwise last purchase rate
|
2013-06-21 16:57:53 +05:30 |
|
Nabin Hait
|
8086125705
|
Merge pull request #513 from saurabh6790/master
Trends Analyzer's Cleanup Complete
|
2013-06-21 03:37:59 -07:00 |
|
Anand Doshi
|
d52b03a8cc
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
accounts/search_criteria/trend_analyzer/trend_analyzer.py
buying/doctype/purchase_common/purchase_common.js
|
2013-06-21 12:22:52 +05:30 |
|
Anand Doshi
|
2ef637b346
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-06-21 12:06:04 +05:30 |
|
Anand Doshi
|
8df49ca772
|
[buying] [fix] on change of currency, set conversion rate = 1 if currency=company currency
|
2013-06-21 12:05:35 +05:30 |
|
Saurabh
|
f8f68c54d9
|
[trends analyzer] cleanup completed
|
2013-06-20 18:52:31 +05:30 |
|
Nabin Hait
|
616657d4a2
|
Merge pull request #495 from saurabh6790/master
[erpnext][reports][Trend Analyzer]
|
2013-06-19 22:18:44 -07:00 |
|
Saurabh
|
24208f5c4a
|
[Report][Item-Wise Purchase Receipt]
|
2013-06-18 15:45:08 +05:30 |
|
Anand Doshi
|
aa0ccf8223
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-17 13:46:55 +05:30 |
|
Anand Doshi
|
1e820f352e
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
buying/doctype/purchase_common/purchase_common.py
|
2013-06-17 12:02:04 +05:30 |
|
Anand Doshi
|
ad6180ef6d
|
[material request on re-order level] [fixes] if error occurs, send email to the System Manager
|
2013-06-17 11:57:04 +05:30 |
|
Rushabh Mehta
|
64c2764b56
|
[translations/build] deleted translation files (to be built on demand)
|
2013-06-17 11:56:41 +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
|
466298b6e7
|
[fix] fixes in purchase common
|
2013-06-14 14:27:53 +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 |
|
Anand Doshi
|
060d9248d3
|
[fixes] buying/selling price lists, communication and website settings
|
2013-06-12 17:40:36 +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
|
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
|
95e46bc930
|
[docs] for home, buying modules
|
2013-06-11 15:12:51 +05:30 |
|
Anand Doshi
|
618edee8b7
|
[search criteria] [cleanup] removed search criteria folders and files
|
2013-06-11 15:04:37 +05:30 |
|
Rushabh Mehta
|
0ab1bdf94e
|
[cleanup] old Workflow Engine, State, Sales Browser Control, Naming Series Options
|
2013-06-11 12:35:46 +05:30 |
|
Anand Doshi
|
27a981677e
|
[buying] [cleanup] deprecated load_default_taxes and get_purchase_tax_details
|
2013-06-10 16:32:55 +05:30 |
|
Anand Doshi
|
ed5f876349
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
|
2013-06-10 16:28:03 +05:30 |
|
Anand Doshi
|
0175fbd470
|
[buying] [purchase taxes] get cost center from taxes master
|
2013-06-10 16:27:29 +05:30 |
|
Anand Doshi
|
b392878f15
|
[buying] [fix] store item tax amount only if field exists
|
2013-06-05 17:46:20 +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 |
|
Rushabh Mehta
|
8fefeaf1bd
|
[ui] removed links to old search_criteria and Report2 is now Report
|
2013-06-04 11:23:42 +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
|
e961af40fc
|
[transaction] [fix] fix in purchase transactions
|
2013-05-31 14:30:46 +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 |
|
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 |
|
Rushabh Mehta
|
e05135c8c4
|
[fixes to wnf #127
|
2013-05-27 18:32:20 +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 |
|
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 |
|
Nabin Hait
|
b7e07ac6a5
|
[fixes] updated no_copy field
|
2013-05-22 12:10:16 +05:30 |
|
Anand Doshi
|
f309613a7d
|
[selling] [calculations] client side calculations, cleanup, patch fixes
|
2013-05-21 19:35:06 +05:30 |
|
Anand Doshi
|
0eef6e9e42
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
patches/patch_list.py
|
2013-05-15 21:18:27 +05:30 |
|
Anand Doshi
|
1dde46aff0
|
[buying, selling] [refactor] get item details
|
2013-05-15 21:15:57 +05:30 |
|
Nabin Hait
|
da369d8eee
|
[report] requested qty to be ordered
|
2013-05-13 16:29:28 +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 |
|
Nabin Hait
|
620576080a
|
[fixes][currency symbol] fieldtype in report
|
2013-05-07 12:03:33 +05:30 |
|
Nabin Hait
|
52f7b6daf8
|
[report] purchase in transit in new style
|
2013-05-06 12:24:27 +05:30 |
|
Nabin Hait
|
c51c0ce3e9
|
[fixes] salary slip
|
2013-05-03 15:40:26 +05:30 |
|
Nabin Hait
|
317f0273e7
|
[query report] item-wise purchase history
|
2013-05-03 15:08:12 +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
|
ecb36f2cb0
|
[purchase] [validation] validate warehouse belongs to company if set
|
2013-05-02 11:34:37 +05:30 |
|
Rushabh Mehta
|
cc32b65b66
|
[toolbars] [design] commonified into common toolbar
|
2013-04-19 13:01:32 +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
|
e60f4560d1
|
[supplier] [fix] on_trash sql syntax fix
|
2013-04-04 14:00:56 +05:30 |
|
Nabin Hait
|
82be7dc301
|
fixed conflict
|
2013-03-25 18:30:15 +05:30 |
|
Rushabh Mehta
|
74506e96d3
|
[profile/email] [feature] added option not to send print as email body. fix in profile delete
|
2013-03-25 17:52:14 +05:30 |
|
Nabin Hait
|
0fc2454384
|
aii: patches and fine tuning
|
2013-03-25 11:06:00 +05:30 |
|
Anand Doshi
|
080f9098c0
|
deprecated sales and purchase return tool
|
2013-03-18 17:57:59 +05:30 |
|
Anand Doshi
|
df6ff1385f
|
fixes in warehouse validation
|
2013-03-11 19:44:52 +05:30 |
|
Anand Doshi
|
88ac485541
|
minor fixes in utils, purchase common and task
|
2013-03-11 14:57:45 +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 |
|