Nabin Hait
|
eb883ee7a3
|
[mapper] purchase cycle
|
2013-07-05 15:23:47 +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 |
|
Nabin Hait
|
71c3f95098
|
Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive
|
2013-07-01 18:28:26 +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 |
|
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 |
|
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
|
4cd977a2a9
|
[fixes] pull previous doc details
|
2013-06-24 12:20:35 +05:30 |
|
Nabin Hait
|
65f038c926
|
[fixes] pull previous doc details
|
2013-06-24 11:59:37 +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 |
|
Nabin Hait
|
b8ebbcafa9
|
[trend analyzer] cleanup
|
2013-06-20 13:03:10 +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 |
|
Rushabh Mehta
|
37982a6a1f
|
[contact/address] fixed auto setting closes #475 (erpnext)
|
2013-06-14 13:29:20 +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 |
|