Nabin Hait
|
a5be5c41cc
|
[mapper]
|
2013-07-07 11:28:17 +05:30 |
|
Nabin Hait
|
2d2d800f0f
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-05 18:34:10 +05:30 |
|
Nabin Hait
|
126aedda08
|
[mapper]
|
2013-07-05 18:30:16 +05:30 |
|
Rushabh Mehta
|
22bf5f4dbd
|
[icons] added icons to forms, toolbars, moduleview, doclistview, reportview
|
2013-07-05 16:33:54 +05:30 |
|
Rushabh Mehta
|
e6af313bfa
|
[icons] added icons to forms, toolbars, moduleview, doclistview, reportview
|
2013-07-05 16:25:17 +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
|
11d688a536
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-05 15:14:15 +05:30 |
|
Rushabh Mehta
|
3a3c2710d1
|
[icon] added in doctype
|
2013-07-05 15:13:31 +05:30 |
|
Anand Doshi
|
cba2913ddd
|
[stock ledger entry] [minor] removed print
|
2013-07-05 12:58:30 +05:30 |
|
Anand Doshi
|
ef8d3bcb77
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-05 12:57:41 +05:30 |
|
Anand Doshi
|
901773a139
|
[fresh install] [fix] replace allow roles with explicit has_permission checks for doctype py files
|
2013-07-05 12:57:03 +05:30 |
|
Rushabh Mehta
|
8005362c6c
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-05 10:51:51 +05:30 |
|
Rushabh Mehta
|
e953f0bb97
|
[form cleanup] journal voucher, purchase invoice, sales invoice, delivery note, item, purchase receipt
|
2013-07-05 10:48:35 +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
|
a749996747
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-04 18:30:44 +05:30 |
|
Nabin Hait
|
bc9cf1549f
|
Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive
|
2013-07-04 17:56:51 +05:30 |
|
Rushabh Mehta
|
be2016ba41
|
[mapper] sales order-sales invoice added condition
|
2013-07-04 17:52:03 +05:30 |
|
Nabin Hait
|
df1fca9f65
|
[mapper] material request to purchase order
|
2013-07-04 17:50:06 +05:30 |
|
Rushabh Mehta
|
8fe97fcbe1
|
[mapper] sales order-sales invoice
|
2013-07-04 17:31:06 +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 |
|
Nabin Hait
|
3ccfb028fe
|
Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive
|
2013-07-04 17:04:48 +05:30 |
|
Rushabh Mehta
|
37805ca415
|
[mapper] sales order-delivery note, added postprocess function in each doc for mapper.py
|
2013-07-04 17:03:02 +05:30 |
|
Nabin Hait
|
9010f92eab
|
Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive
|
2013-07-04 16:03:24 +05:30 |
|
Rushabh Mehta
|
8aded138c7
|
[buying] started cleanup, [mapper] started rewrite
|
2013-07-04 12:50:52 +05:30 |
|
Rushabh Mehta
|
bcff7dce8e
|
[cleanup] [stock entry] [sales order]
|
2013-07-03 18:32:29 +05:30 |
|
Nabin Hait
|
72abfa6b4b
|
Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive
|
2013-07-03 11:48:10 +05:30 |
|
Anand Doshi
|
b66891a49d
|
[serial nos] allow rename
|
2013-07-02 12:07:58 +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 |
|
Nabin Hait
|
71c3f95098
|
Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive
|
2013-07-01 18:28:26 +05:30 |
|
Rushabh Mehta
|
d420401ba3
|
[moduleview] added top bar
|
2013-07-01 17:15:23 +05:30 |
|
Rushabh Mehta
|
4cd0a07290
|
[grid-reports] [page] bug fix for double 'show' call, fixed ledger reports links
|
2013-07-01 15:17:36 +05:30 |
|
Rushabh Mehta
|
36af6a02ad
|
[grid reports] now show by wn.route_options
|
2013-07-01 14:35:57 +05:30 |
|
Nabin Hait
|
fdbfe1c274
|
Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive
|
2013-07-01 12:20:19 +05:30 |
|
Nabin Hait
|
b5e58ffa26
|
[rename with merge] updated on_rename function for item, warehouse, al tree type documents
|
2013-07-01 12:20:00 +05:30 |
|
Rushabh Mehta
|
1bcc19e019
|
[item] default warehouse is selected with item
|
2013-07-01 11:46:07 +05:30 |
|
Rushabh Mehta
|
b3f947aca6
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-01 09:36:39 +05:30 |
|
Rushabh Mehta
|
8706ca9445
|
[journal voucher] [added opening entry] [cleanups]
|
2013-07-01 09:36:03 +05:30 |
|
Anand Doshi
|
971f30a12b
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-28 19:19:04 +05:30 |
|
Rushabh Mehta
|
03e9a4ea11
|
[company] [setup] added on_doctype_update to add indexes, renamed make_obj to make_controller
|
2013-06-28 12:49:28 +05:30 |
|
Saurabh
|
d6cc5cd08f
|
[Trends Teports] cleanup
|
2013-06-28 10:09:46 +05:30 |
|
Anand Doshi
|
b8ea244b9f
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-27 12:17:59 +05:30 |
|
Anand Doshi
|
77cd10b10a
|
[selling] added shipping rule link besides taxes master link field
|
2013-06-27 12:17:34 +05:30 |
|
Rushabh Mehta
|
e6d986adea
|
[import] fixes
|
2013-06-27 10:54:49 +05:30 |
|
Rushabh Mehta
|
65d12926fd
|
[setup] bug fixes
|
2013-06-26 22:31:22 +05:30 |
|
Anand Doshi
|
70902da4da
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
patches/december_2012/deprecate_tds.py
patches/june_2012/reports_list_permission.py
selling/doctype/sales_bom/locale/_messages_doc.json
selling/doctype/sales_bom/locale/ar-doc.json
selling/doctype/sales_bom/locale/de-doc.json
selling/doctype/sales_bom/locale/es-doc.json
selling/doctype/sales_bom/locale/fr-doc.json
selling/doctype/sales_bom/locale/hi-doc.json
selling/doctype/sales_bom/locale/hr-doc.json
selling/doctype/sales_bom/locale/nl-doc.json
selling/doctype/sales_bom/locale/pt-BR-doc.json
selling/doctype/sales_bom/locale/pt-doc.json
selling/doctype/sales_bom/locale/sr-doc.json
selling/doctype/sales_bom/locale/ta-doc.json
selling/doctype/sales_bom/locale/th-doc.json
selling/doctype/sales_bom_item/locale/_messages_doc.json
selling/doctype/sales_bom_item/locale/ar-doc.json
selling/doctype/sales_bom_item/locale/de-doc.json
selling/doctype/sales_bom_item/locale/es-doc.json
selling/doctype/sales_bom_item/locale/fr-doc.json
selling/doctype/sales_bom_item/locale/hi-doc.json
selling/doctype/sales_bom_item/locale/hr-doc.json
selling/doctype/sales_bom_item/locale/nl-doc.json
selling/doctype/sales_bom_item/locale/pt-BR-doc.json
selling/doctype/sales_bom_item/locale/pt-doc.json
selling/doctype/sales_bom_item/locale/sr-doc.json
selling/doctype/sales_bom_item/locale/ta-doc.json
selling/doctype/sales_bom_item/locale/th-doc.json
|
2013-06-26 14:07:29 +05:30 |
|
Anand Doshi
|
b802050cd4
|
[grid report] round currency values
|
2013-06-26 12:05:37 +05:30 |
|
Rushabh Mehta
|
d242a8babd
|
[patch] breakup global defaults
|
2013-06-25 11:46:07 +05:30 |
|
Akhilesh Darjee
|
78e622ef5c
|
Deleted search criteria
|
2013-06-25 11:08:19 +05:30 |
|
Akhilesh Darjee
|
a19014a846
|
Moved Sales BOM & Sales BOM Item to Selling module, completed 'Available Stock for packing Items' report
|
2013-06-24 19:05:16 +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 |
|
Rushabh Mehta
|
847cfe2b07
|
[docs] [setup] cleanup
|
2013-06-24 15:43:18 +05:30 |
|
Nabin Hait
|
a292b44df3
|
[fixes] pull previous doc details
|
2013-06-24 12:24:01 +05:30 |
|
Nabin Hait
|
4cd977a2a9
|
[fixes] pull previous doc details
|
2013-06-24 12:20:35 +05:30 |
|
Nabin Hait
|
e927a14aac
|
[fixes] pull previous doc details
|
2013-06-24 12:02:22 +05:30 |
|
Nabin Hait
|
65f038c926
|
[fixes] pull previous doc details
|
2013-06-24 11:59:37 +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 |
|
Akhilesh Darjee
|
64c8e28423
|
[Fixed] Merge conflict fixed
|
2013-06-21 13:09:18 +05:30 |
|
Akhilesh Darjee
|
1ded5c618e
|
[Report]Cleanup of territory target variance, sales person target variance & budget variance reports
|
2013-06-21 12:47:51 +05:30 |
|
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 |
|
Saurabh
|
f8f68c54d9
|
[trends analyzer] cleanup completed
|
2013-06-20 18:52:31 +05:30 |
|
Nabin Hait
|
71253bea0f
|
[fix][report] in item prices
|
2013-06-20 17:32:00 +05:30 |
|
Nabin Hait
|
b7784eac36
|
[fix][report] in item prices
|
2013-06-20 17:19:51 +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 |
|
Nabin Hait
|
21f7623d2e
|
[fix][report] in item prices
|
2013-06-19 14:13:01 +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 |
|
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 |
|
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
|
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 |
|
Anand Doshi
|
060d9248d3
|
[fixes] buying/selling price lists, communication and website settings
|
2013-06-12 17:40:36 +05:30 |
|
Anand Doshi
|
d826b08b7e
|
[stock entry] [test] fixes
|
2013-06-11 18:17:52 +05:30 |
|
Anand Doshi
|
3b867f7377
|
[cleanup] [fix] removed amendment_date
|
2013-06-11 17:21:11 +05:30 |
|
Anand Doshi
|
27e6f13b5d
|
[cleanup] deprecated search criteria, amendment_date, cancel_reason
|
2013-06-11 16:23:18 +05:30 |
|
Rushabh Mehta
|
0ab1bdf94e
|
[cleanup] old Workflow Engine, State, Sales Browser Control, Naming Series Options
|
2013-06-11 12:35:46 +05:30 |
|
Rushabh Mehta
|
cd4bfa6b9a
|
[docs] added for stock module
|
2013-06-11 12:04:01 +05:30 |
|
Rushabh Mehta
|
c382eb58d5
|
[cleanup] removed Featured Item, Website Product Category, Valuation Control
|
2013-06-11 12:03:37 +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
|
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 |
|
Saurabh
|
5ee811d842
|
[removed merge conflict]
|
2013-06-07 15:23:56 +05:30 |
|
Saurabh
|
5b1e899250
|
[Reports] [Customers Not Buying Sinse Long Time] and [Itemwise Recommended Reorder level]
|
2013-06-07 13:34:16 +05:30 |
|
Akhilesh Darjee
|
426b57e1b4
|
Deleted item_prices.js
|
2013-06-07 11:52:15 +05:30 |
|
Saurabh
|
1efc8b3734
|
[Reprots][No Sales Order From Customer] and [Item Reorder Level]
|
2013-06-06 19:31:14 +05:30 |
|
Akhilesh Darjee
|
657f8a6677
|
Completed 'Item Prices' Report
|
2013-06-06 18:33:26 +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 |
|
Anand Doshi
|
8f81623240
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
|
2013-06-05 13:14:11 +05:30 |
|
Nabin Hait
|
c6548b64c2
|
[fixes][merge conflict]
|
2013-06-05 12:53:53 +05:30 |
|
Nabin Hait
|
90202aec2b
|
[merge conflict]
|
2013-06-05 12:37:10 +05:30 |
|
Akhilesh Darjee
|
6653a95767
|
Completed Warehouse-Wise Stock Balance
|
2013-06-05 11:36:24 +05:30 |
|
Akhilesh Darjee
|
1725315d10
|
Finalized batch-wise balance history
|
2013-06-04 19:35:28 +05:30 |
|
Nabin Hait
|
ad600cce22
|
bom exploded items grouped by items
|
2013-06-04 16:56:56 +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
|
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 |
|
Anand Doshi
|
d0b007235d
|
[buying/selling] fixes after responsive merge
|
2013-05-28 18:54:48 +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
|
eca0531068
|
[report] purchase order/ received items to be billed
|
2013-05-28 16:07:03 +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
|
149b461e62
|
Merge branch 'master' of github.com:webnotes/erpnext into webshop
|
2013-05-24 19:28:36 +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 |
|
Nabin Hait
|
f4591ecc24
|
[stock ledger][fix] message for negative qty error
|
2013-05-23 19:07:10 +05:30 |
|
Nabin Hait
|
b56412c646
|
[fixes][aii] cancelled gl entry for delivery note and patch
|
2013-05-23 17:41:52 +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
|
62d0629d61
|
[feature] reorder level checking through scheduler
|
2013-05-22 16:19:10 +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
|
48787e944e
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
patches/april_2013/p05_update_file_data.py
|
2013-05-17 15:10:57 +05:30 |
|
Nabin Hait
|
1fd546f424
|
[fixes] prosting date for gl entry
|
2013-05-16 11:02:07 +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 |
|
Nabin Hait
|
ece3298159
|
[report] requested qty to be transferred
|
2013-05-13 16:29:50 +05:30 |
|
Nabin Hait
|
da369d8eee
|
[report] requested qty to be ordered
|
2013-05-13 16:29:28 +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 |
|
Nabin Hait
|
f377402592
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-05-09 14:16:14 +05:30 |
|
Nabin Hait
|
5dc5bf9972
|
[stock entry] total amount field added
|
2013-05-09 14:15:24 +05:30 |
|
Anand Doshi
|
21b854b7cc
|
[rename] [fix] merge related fixes
|
2013-05-09 13:21:13 +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
|
4f8a81ca97
|
[item] [usability] change image view on change of image
|
2013-05-08 17:40:35 +05:30 |
|
Anand Doshi
|
75eeb01052
|
[attachments] [fix] on adding and removing attachments, update the select fields with options attach_files:
|
2013-05-08 12:35:33 +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
|
04f888fa52
|
[fixes] item_code non-mandatory in item if naming_series
|
2013-05-07 16:03:10 +05:30 |
|
Nabin Hait
|
f2d4df975e
|
[fixes] floating point issue in buying rate
|
2013-05-07 13:12:02 +05:30 |
|
Nabin Hait
|
620576080a
|
[fixes][currency symbol] fieldtype in report
|
2013-05-07 12:03:33 +05:30 |
|
Nabin Hait
|
c1b9619321
|
[fixes] company for auto-material request
|
2013-05-07 11:16:20 +05:30 |
|
Nabin Hait
|
52f7b6daf8
|
[report] purchase in transit in new style
|
2013-05-06 12:24:27 +05:30 |
|
Anand Doshi
|
3f9366bb6c
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
stock/doctype/item/item.txt
|
2013-05-06 12:07:30 +05:30 |
|
Anand Doshi
|
0f5f584651
|
[stock entry] [test] fixes in test cases
|
2013-05-03 14:34:12 +05:30 |
|
Anand Doshi
|
9d504e4706
|
Merge branch 'price_list_country'
Conflicts:
home/page/latest_updates/latest_updates.js
setup/doctype/price_list/price_list.txt
|
2013-05-02 16:25:46 +05:30 |
|
Rushabh Mehta
|
d3e00995db
|
[conflicts] [merged]
|
2013-05-02 16:02:59 +05:30 |
|
Rushabh Mehta
|
f5f478ee78
|
[item] [naming] by series or code / [naming series] optionally set number of digits
|
2013-05-02 15:36:33 +05:30 |
|
Rushabh Mehta
|
88f6acdbe4
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-05-02 14:47:10 +05:30 |
|
Rushabh Mehta
|
3487e0a0f3
|
[price list] added currency property, validates currency, duplication in Item Price
|
2013-05-02 14:46:12 +05:30 |
|
Rushabh Mehta
|
c711598940
|
[doclist] new pattern / [item] pricelist must be unique / [formatter] show null floats as empty string
|
2013-05-02 14:22:40 +05:30 |
|
Nabin Hait
|
f2edbbd5cb
|
[serial no][validation] status delivered -> in store, allowed for material receipt
|
2013-05-02 11:49:02 +05:30 |
|
Nabin Hait
|
02bc8bfe7e
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-05-02 11:39:43 +05:30 |
|
Rushabh Mehta
|
ecb36f2cb0
|
[purchase] [validation] validate warehouse belongs to company if set
|
2013-05-02 11:34:37 +05:30 |
|
Nabin Hait
|
81bbfba0cc
|
[hr] allowed rename in earning and deduction type
|
2013-05-02 11:27:25 +05:30 |
|
Anand Doshi
|
447008b045
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
patches/april_2013/p05_update_file_data.py
|
2013-05-01 14:48:16 +05:30 |
|
Anand Doshi
|
91e4c14470
|
[fixes] [__islocal] use doc.fields.get('__islocal') instead of doc.__islocal
|
2013-05-01 12:00:44 +05:30 |
|
Anand Doshi
|
d7ad13a8a7
|
[price list] [country] specify country for a price list
|
2013-04-29 19:38:34 +05:30 |
|
Nabin Hait
|
7ee7eae3ae
|
[item][validation] some validation only after saving
|
2013-04-29 15:10:39 +05:30 |
|
Nabin Hait
|
7597330cb6
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-04-29 11:46:42 +05:30 |
|
Nabin Hait
|
e81b0e2d66
|
[stock ageing][fixes] for serialized items
|
2013-04-29 11:45:22 +05:30 |
|
Anand Doshi
|
c9897ff533
|
Merge branch 'edge'
Conflicts:
home/page/latest_updates/latest_updates.js
|
2013-04-29 10:42:21 +05:30 |
|
Nabin Hait
|
04c1f94b4e
|
[DN][usability] copy cost center in each row
|
2013-04-26 16:27:51 +05:30 |
|
Anand Doshi
|
d54a4741a9
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
accounts/doctype/sales_invoice/sales_invoice.txt
stock/doctype/item/item.txt
|
2013-04-24 12:02:54 +05:30 |
|
Anand Doshi
|
a5d19955d1
|
Merge branch 'master' of github.com:webnotes/erpnext into webshop
Conflicts:
accounts/doctype/sales_invoice/sales_invoice.txt
stock/doctype/item/item.txt
|
2013-04-24 11:48:28 +05:30 |
|
Rushabh Mehta
|
3f0b205054
|
[grid] [permissions] added
|
2013-04-24 10:51:03 +05:30 |
|
Rushabh Mehta
|
333d438c32
|
[merge]
|
2013-04-24 10:08:39 +05:30 |
|
Rushabh Mehta
|
f1cfbeaa5c
|
[merge] fix
|
2013-04-24 10:03:56 +05:30 |
|
Anand Doshi
|
a536eef393
|
Merge branch 'master' into edge
|
2013-04-23 13:10:55 +05:30 |
|
Nabin Hait
|
0a480f4efd
|
fixes in item: organized code
|
2013-04-23 12:54:07 +05:30 |
|
Anand Doshi
|
dc0f2d2422
|
Merge branch 'master' into edge
Conflicts:
accounts/doctype/sales_invoice/sales_invoice.txt
stock/doctype/item/item.txt
|
2013-04-23 12:42:18 +05:30 |
|
Nabin Hait
|
81c6a3beef
|
stock uom mandatory for item
|
2013-04-23 11:39:54 +05:30 |
|
Rushabh Mehta
|
4c3419bee0
|
Merge branch 'master' into edge
|
2013-04-22 14:03:31 +05:30 |
|
Rushabh Mehta
|
cc32b65b66
|
[toolbars] [design] commonified into common toolbar
|
2013-04-19 13:01:32 +05:30 |
|
Anand Doshi
|
90dad5c5b5
|
Merge branch 'master' into edge
|
2013-04-19 11:43:16 +05:30 |
|
Rushabh Mehta
|
651ce05fcc
|
[merge master
]
|
2013-04-18 10:37:16 +05:30 |
|
Anand Doshi
|
90c9ae713c
|
Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
stock/doctype/delivery_note_item/delivery_note_item.txt
|
2013-04-17 18:04:08 +05:30 |
|
Anand Doshi
|
5717fe3aba
|
[cost center] [default value] default cost center for each company, auto set default cost center for various transactions during creation
|
2013-04-17 18:02:52 +05:30 |
|
Nabin Hait
|
47ef15b04b
|
removed errprint
|
2013-04-17 17:35:14 +05:30 |
|
Nabin Hait
|
bd7c8d89f2
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-04-17 17:22:23 +05:30 |
|
Nabin Hait
|
9a2dff6675
|
packing slip refactored
|
2013-04-17 17:21:31 +05:30 |
|
Anand Doshi
|
2b349d38d9
|
Merge branch 'master' into edge
|
2013-04-17 15:10:47 +05:30 |
|
Anand Doshi
|
96dae29144
|
[item] [fixes] don't validate for active boms for new items
|
2013-04-17 13:39:55 +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 |
|
Nabin Hait
|
1ef27296f4
|
fixes in packing slip
|
2013-04-16 12:29:27 +05:30 |
|
Anand Doshi
|
3b2fd6e334
|
[sql] [fix] fixed item.py injections
|
2013-04-13 15:54:38 +05:30 |
|
Nabin Hait
|
1bcd551db2
|
fixes in item
|
2013-04-12 16:51:07 +05:30 |
|
Anand Doshi
|
36ecbbd9e8
|
Merge branch 'master' of github.com:webnotes/erpnext into edge
|
2013-04-12 15:41:31 +05:30 |
|
Nabin Hait
|
bab018b759
|
fixes in item
|
2013-04-11 16:36:26 +05:30 |
|
Nabin Hait
|
d246de8417
|
[fixes][account][packing slip]
|
2013-04-11 15:31:41 +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
|
cad5c3414f
|
[serial no] [fix] removed transaction date passed for creating stock ledger entry
|
2013-04-10 15:28:42 +05:30 |
|
Rushabh Mehta
|
0c1611219e
|
[files] [cleanup/redesign] removed the old file_list structure and also added file listing in setup
|
2013-04-10 13:54:13 +05:30 |
|
Rushabh Mehta
|
33075e1f69
|
[files] [patch] dropped file_list property and moved links to
|
2013-04-10 11:08:50 +05:30 |
|
Nabin Hait
|
2b61f6142a
|
fixed conflict
|
2013-04-08 12:44:57 +05:30 |
|
Nabin Hait
|
a477d41843
|
[aii] some fixes
|
2013-04-08 12:39:11 +05:30 |
|
Nabin Hait
|
b72af39331
|
fixes in packing slip
|
2013-04-06 08:20:35 +05:30 |
|
Nabin Hait
|
5d4758b3e6
|
[validation] fixes in item
|
2013-04-06 08:20:21 +05:30 |
|
Nabin Hait
|
38e6326677
|
[Item][Validation] if sle exists, soem fields can not be changed
|
2013-04-05 14:47:42 +05:30 |
|
Nabin Hait
|
1a738f72f4
|
match condition added in daily time log summary report
|
2013-04-04 16:34:51 +05:30 |
|
Nabin Hait
|
a8d8abc670
|
small fixes in item
|
2013-04-04 15:31:03 +05:30 |
|