Anand Doshi
|
573b423a6c
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-07-18 13:26:53 +05:30 |
|
Anand Doshi
|
61cad5076b
|
[minor] [fix] opportunity form, queries, stock uom replace utility
|
2013-07-18 13:26:27 +05:30 |
|
Nabin Hait
|
55b5dd2f10
|
[fix] [mapper]
|
2013-07-18 13:05:14 +05:30 |
|
Nabin Hait
|
5b43b3dca5
|
merged with slow branch
|
2013-07-18 12:28:09 +05:30 |
|
Rushabh Mehta
|
2861e25fb8
|
Merge branch 'master' of github.com:webnotes/erpnext into slow
Conflicts:
stock/doctype/purchase_receipt/purchase_receipt.js
|
2013-07-15 20:57:26 +02:00 |
|
Nabin Hait
|
da46a3782f
|
[fix] [minor] get query
|
2013-07-15 17:52:10 +05:30 |
|
Nabin Hait
|
40cb8fb193
|
[fix] [minor] Installation Note: pulling from DN and code cleanup
|
2013-07-15 17:23:49 +05:30 |
|
Nabin Hait
|
a9a914ce97
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-15 16:33:46 +05:30 |
|
Nabin Hait
|
a9ec49e0bf
|
[fix] [mapper] add rows only table is blank, allow multiple time pull and validation if same item pulled twice
|
2013-07-15 16:33:24 +05:30 |
|
Anand Doshi
|
4563ef3aea
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-15 14:49:42 +05:30 |
|
Anand Doshi
|
ce36204129
|
[minor] [item] on adding image, add description html if it is empty
|
2013-07-15 14:49:03 +05:30 |
|
Nabin Hait
|
a279d78496
|
[minor] [fix]
|
2013-07-15 13:04:33 +05:30 |
|
Nabin Hait
|
87bed52818
|
[minor] [fix] get_query for cost center
|
2013-07-12 16:55:03 +05:30 |
|
Nabin Hait
|
cfecd2bc16
|
[fix] [cleanup] fixes while testing and code cleanup
|
2013-07-11 17:49:18 +05:30 |
|
Nabin Hait
|
c0816d7efe
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-11 11:58:43 +05:30 |
|
Nabin Hait
|
789976f272
|
[fix] [stock] batch no query in stock entry
|
2013-07-11 11:58:20 +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 |
|
Nabin Hait
|
eddd4a1674
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-10 19:12:14 +05:30 |
|
Nabin Hait
|
a4f0240bfc
|
[conflict] merged for get_query
|
2013-07-10 19:05:57 +05:30 |
|
Rushabh Mehta
|
69c1858c24
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-10 19:00:30 +05:30 |
|
Rushabh Mehta
|
ad71473f35
|
[cleanup] Default Warehouses created on Company creation. Warehouse names have Company abbreviation as suffix
|
2013-07-10 18:59:55 +05:30 |
|
Rushabh Mehta
|
982ad35fd2
|
[cleanup] Removed Warehouse Type
|
2013-07-10 18:39:06 +05:30 |
|
Saurabh
|
ee85cfd476
|
get_query to server side
|
2013-07-10 17:35:14 +05:30 |
|
Nabin Hait
|
10b112807c
|
[fix] related to mapping
|
2013-07-10 16:48:29 +05:30 |
|
Rushabh Mehta
|
3429b609a7
|
[feature] [grid] Allow Grid viewable columns to be selected via 'In List View'
|
2013-07-10 15:03:37 +05:30 |
|
Rushabh Mehta
|
f9404ba89f
|
[feature] Added Section Breaks to Grids for better visual hierarchy
|
2013-07-10 12:07:45 +05:30 |
|
Saurabh
|
2e3c06e66d
|
[get_query]to server side
|
2013-07-09 18:20:49 +05:30 |
|
Saurabh
|
38683718e1
|
[get_query] to server side
|
2013-07-09 16:34:50 +05:30 |
|
Saurabh
|
ab462d2000
|
[get_query]to server side
|
2013-07-09 16:18:52 +05:30 |
|
Anand Doshi
|
1357c0b2df
|
[cleanup] #402 changed fieldname company_name to company in Cost Center
|
2013-07-09 15:45:38 +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 |
|
Nabin Hait
|
3b999225ba
|
[validation] over billing against DN/PR
|
2013-07-09 12:35:52 +05:30 |
|
Rushabh Mehta
|
5758f7e3b7
|
[stock-entry] show gl if auto inventory accounting #561
|
2013-07-09 12:05:33 +05:30 |
|
Rushabh Mehta
|
f0e4f9e0c3
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-09 11:38:37 +05:30 |
|
Rushabh Mehta
|
cfb54ceb43
|
[material request/purchase order] [bug] required date automatically set #433
|
2013-07-09 11:38:08 +05:30 |
|
Nabin Hait
|
253de859b4
|
[fixes] for testcases
|
2013-07-09 11:36:00 +05:30 |
|
Anand Doshi
|
6172b6ffb8
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-08 19:47:55 +05:30 |
|
Anand Doshi
|
3c6d440f09
|
[bean] [mandatory] fixes in test cases
|
2013-07-08 19:47:37 +05:30 |
|
Nabin Hait
|
a131c0aa5e
|
[fixed conflict]
|
2013-07-08 19:01:41 +05:30 |
|
Nabin Hait
|
2bd37771ca
|
validate with prevdoc
|
2013-07-08 19:00:29 +05:30 |
|
Anand Doshi
|
615701d3ae
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
Conflicts:
stock/doctype/material_request/material_request.txt
|
2013-07-08 18:54:00 +05:30 |
|
Anand Doshi
|
4ee647e84c
|
[bean] [mandatory] fixes in test cases
|
2013-07-08 18:50:45 +05:30 |
|
Rushabh Mehta
|
d9e7070f2d
|
[mapper-pull] for sales / purchae
|
2013-07-08 18:01:46 +05:30 |
|
Rushabh Mehta
|
304a4a66b4
|
[production order] [delivery note] fixes, pull
|
2013-07-08 17:01:32 +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 |
|