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 |
|
Rushabh Mehta
|
d8cf1d74ba
|
Merge branch 'master' into edge
|
2013-04-03 16:39:02 +05:30 |
|
Anand Doshi
|
0b9ec8cbc1
|
[auto inventory accounting] [fix] if non stock item, dont create gl entry in delivery note and pos sales invoice
|
2013-04-03 13:45:28 +05:30 |
|
Rushabh Mehta
|
5bbe063222
|
Merge branch 'master' into edge
|
2013-04-03 10:42:12 +05:30 |
|
Nabin Hait
|
ff3106c7d4
|
[stock reco] improved validation message
|
2013-04-02 17:44:50 +05:30 |
|
Rushabh Mehta
|
5c12765313
|
[merge]
|
2013-04-02 10:51:11 +05:30 |
|
Rushabh Mehta
|
9db1a68d89
|
[website] [cleanup] moved website generic utils to framework
|
2013-04-02 10:41:37 +05:30 |
|
Anand Doshi
|
4b6052b57b
|
[stock] [fix] serial nos scrub method
|
2013-04-01 18:52:47 +05:30 |
|
Nabin Hait
|
94d1622691
|
[patch][serial no] for striped serial nos
|
2013-04-01 17:25:28 +05:30 |
|
Nabin Hait
|
2f20a7ac96
|
[patch][serial no] for striped serial nos
|
2013-04-01 17:23:43 +05:30 |
|
Nabin Hait
|
d270559fa9
|
minor fixes in stock entry
|
2013-03-30 17:48:37 +05:30 |
|
Nabin Hait
|
dc35137e20
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-30 17:47:56 +05:30 |
|
Anand Doshi
|
19acce9fa1
|
[aii] [patches] minor fixes
|
2013-03-29 20:40:23 +05:30 |
|
Anand Doshi
|
96a5f1dda0
|
Merge branch 'aii_release' of github.com:webnotes/erpnext into aii_release
|
2013-03-29 19:44:52 +05:30 |
|
Nabin Hait
|
86f1ca2d00
|
aii: fixes in stock reconciliation
|
2013-03-29 18:20:10 +05:30 |
|
Anand Doshi
|
82433e81c6
|
Merge branch 'aii_release' of github.com:webnotes/erpnext into aii_release
|
2013-03-29 16:47:56 +05:30 |
|
Nabin Hait
|
787c02ee42
|
aii fixes
|
2013-03-29 16:42:33 +05:30 |
|
Nabin Hait
|
acecb94a0f
|
patch: update item tax rate in json format
|
2013-03-29 10:48:41 +05:30 |
|
Anand Doshi
|
7bfa40fdd3
|
sales return validate before save/submit
|
2013-03-28 18:48:04 +05:30 |
|
Anand Doshi
|
24e0a3bb34
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-28 16:41:02 +05:30 |
|
Anand Doshi
|
8c45420f19
|
fixes in gross profit report
|
2013-03-28 16:40:30 +05:30 |
|
Rushabh Mehta
|
2fe802c81e
|
[website] [cleanup] selectable images will now be relative urls (files/..) or full urls (http:..)
|
2013-03-28 16:26:11 +05:30 |
|
Nabin Hait
|
41fe3567bb
|
fixed conflict and aii check in global defaults
|
2013-03-28 15:54:11 +05:30 |
|
Anand Doshi
|
96b189c118
|
fixes in test cases and buying amount function
|
2013-03-26 18:43:10 +05:30 |
|
Nabin Hait
|
495db08104
|
copy expense account to all row if entered in one
|
2013-03-26 15:24:56 +05:30 |
|
Anand Doshi
|
ea4b05bb2c
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-26 14:49:48 +05:30 |
|
Anand Doshi
|
40dc9e83a5
|
fixes in test cases and added fiscal year field to stock reco
|
2013-03-26 14:49:25 +05:30 |
|
Nabin Hait
|
86f5e2e564
|
aii: gl entries for serial no
|
2013-03-26 14:27:20 +05:30 |
|
Rushabh Mehta
|
06e3ef055b
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-26 12:47:51 +05:30 |
|
Rushabh Mehta
|
4731fb999c
|
[feature] [fix] utilities/rename tool upgraded to upload multiple items
|
2013-03-26 12:47:19 +05:30 |
|
Anand Doshi
|
acec0227c5
|
fixes in stock entry
|
2013-03-26 12:33:43 +05:30 |
|
Anand Doshi
|
fc33ef6bfb
|
fixes in purchase invoice
|
2013-03-26 12:13:14 +05:30 |
|
Nabin Hait
|
82be7dc301
|
fixed conflict
|
2013-03-25 18:30:15 +05:30 |
|
Nabin Hait
|
557d858d89
|
aii: patches and default values fetching
|
2013-03-25 18:28:16 +05:30 |
|
Rushabh Mehta
|
06d186ba98
|
[stock] [feature] added project to stock ledger entry and updated stock balance report
|
2013-03-25 17:03:52 +05:30 |
|
Rushabh Mehta
|
c5570c6341
|
added warehouse company validation, if warehouse is added to company
|
2013-03-25 15:21:24 +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 |
|
Anand Doshi
|
ceba917e86
|
Merge branch 'master' into edge
|
2013-03-22 14:16:53 +05:30 |
|
Anand Doshi
|
a47ac1bed0
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-22 13:32:11 +05:30 |
|
Nabin Hait
|
9d3f0405b7
|
fixes in packing slip
|
2013-03-22 12:02:48 +05:30 |
|
Anand Doshi
|
8c5844e3fb
|
show sales invoice data in gross profit report
|
2013-03-21 20:24:10 +05:30 |
|
Anand Doshi
|
6d8d3b4cee
|
fixes in gross profit report
|
2013-03-21 18:45:02 +05:30 |
|
Nabin Hait
|
4c56220089
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-21 18:37:48 +05:30 |
|
Nabin Hait
|
a0e7c1539b
|
aii: book expense in delivery note instead of sales invoice
|
2013-03-21 18:37:06 +05:30 |
|
Rushabh Mehta
|
af578d73ef
|
merge
|
2013-03-21 17:40:08 +05:30 |
|
Anand Doshi
|
162a081a9f
|
unchecked Not In Create in item customer detail and item price
|
2013-03-21 17:30:22 +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 |
|
Nabin Hait
|
364f08a171
|
fixed conflict
|
2013-03-19 18:29:05 +05:30 |
|
Nabin Hait
|
80abad2ee0
|
aii: default account from company
|
2013-03-19 18:18:52 +05:30 |
|
Anand Doshi
|
a2b3eb17e3
|
fix in depends on of stock entry
|
2013-03-19 17:48:50 +05:30 |
|
Anand Doshi
|
9a20cc5cd8
|
Merge branch 'sales_purchase_return'
|
2013-03-19 16:23:11 +05:30 |
|
Anand Doshi
|
3e967ab9b6
|
hide Reference section break when using Sales or Purchase Return
|
2013-03-19 16:22:22 +05:30 |
|
Anand Doshi
|
73091ecac3
|
shifted return reference fields in stock entry to the main section
|
2013-03-19 15:15:12 +05:30 |
|
Anand Doshi
|
f6b06a6b30
|
fixes in sales purchase return
|
2013-03-19 15:01:07 +05:30 |
|
Anand Doshi
|
af6f1ba82e
|
fixes in sales purchase return for stock entry
|
2013-03-19 13:43:49 +05:30 |
|
Anand Doshi
|
f9e51bbab3
|
removed complications from sales purchase return
|
2013-03-19 13:33:51 +05:30 |
|
Nabin Hait
|
e68103be30
|
fixes in reorder level and company
|
2013-03-19 12:34:47 +05:30 |
|
Nabin Hait
|
928355ad9a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-19 12:02:13 +05:30 |
|
Nabin Hait
|
89a94d8135
|
aii: stock reconciliation with test case
|
2013-03-19 12:01:46 +05:30 |
|
Nabin Hait
|
c3afb256b4
|
aii: stock entry
|
2013-03-19 12:01:24 +05:30 |
|
Nabin Hait
|
35e037651c
|
fixes in packing slip
|
2013-03-19 11:58:57 +05:30 |
|
Anand Doshi
|
839fee3e71
|
restrict material_request_type in Material Request form
|
2013-03-18 18:20:09 +05:30 |
|
Anand Doshi
|
080f9098c0
|
deprecated sales and purchase return tool
|
2013-03-18 17:57:59 +05:30 |
|
Anand Doshi
|
f11e2f8f6f
|
Merge branch 'master' of github.com:webnotes/erpnext into sales_purchase_return
Conflicts:
patches/patch_list.py
|
2013-03-18 17:42:08 +05:30 |
|
Anand Doshi
|
ab7b7c2974
|
completed sales purchase return as part of stock entry
|
2013-03-18 17:37:31 +05:30 |
|
Anand Doshi
|
6230aa9292
|
make return jv for sales return
|
2013-03-16 19:05:11 +05:30 |
|
Anand Doshi
|
1524c2a5b6
|
create return jv
|
2013-03-15 17:42:45 +05:30 |
|
Anand Doshi
|
87052b366b
|
validate over-return of stock for sales purchase return
|
2013-03-15 11:32:40 +05:30 |
|
Rushabh Mehta
|
ebee1c7033
|
website module: minor updates
|
2013-03-14 14:33:31 +05:30 |
|
Anand Doshi
|
47428c2d92
|
more test cases for stock entry
|
2013-03-13 15:30:05 +05:30 |
|
Anand Doshi
|
23d742693a
|
Merge branch 'master' into sales_purchase_return
|
2013-03-13 14:01:34 +05:30 |
|
Anand Doshi
|
71bed3116f
|
working on merging sales purchase return into stock entry
|
2013-03-13 12:57:04 +05:30 |
|
Nabin Hait
|
4ceb1b5164
|
aii: gl entries for stock entry and testcases
|
2013-03-13 11:40:30 +05:30 |
|
Nabin Hait
|
06ae34b015
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-12 15:47:55 +05:30 |
|
Nabin Hait
|
4f856f1250
|
fixes in buying_amount_calculation
|
2013-03-12 15:44:38 +05:30 |
|
Anand Doshi
|
6dc6e7c84a
|
minor fixes in stock entry js
|
2013-03-12 12:51:53 +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
|
c9d229ec9e
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-12 11:06:06 +05:30 |
|
Nabin Hait
|
f7df8b28d2
|
-m
|
2013-03-12 10:58:11 +05:30 |
|
Anand Doshi
|
df6ff1385f
|
fixes in warehouse validation
|
2013-03-11 19:44:52 +05:30 |
|
Nabin Hait
|
8c7234f270
|
aii: gl_entries for sales invoice
|
2013-03-11 16:32:33 +05:30 |
|
Anand Doshi
|
d5aeb21dd9
|
fix in get_value_diff of stock grid report: case for serialized items
|
2013-03-08 12:46:48 +05:30 |
|
Nabin Hait
|
0e6ce9af17
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-07 18:50:23 +05:30 |
|
Anand Doshi
|
f1e274c8b4
|
when cancelling stock ledger entry, change modified and modified by
|
2013-03-07 16:34:59 +05:30 |
|
Nabin Hait
|
ad7266e48d
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-07 11:42:47 +05:30 |
|
Nabin Hait
|
58b2a101ae
|
aii: testcases for sales invoice gl entries
|
2013-03-07 11:42:14 +05:30 |
|
Anand Doshi
|
80f7637ae6
|
added print width in txts of istable type doctypes
|
2013-03-07 11:37:33 +05:30 |
|
Nabin Hait
|
a72c5127a6
|
aii: gl entries for delivery note
|
2013-03-06 18:50:53 +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 |
|
Anand Doshi
|
9e69dc5ad8
|
fix in material request test case
|
2013-03-05 13:39:28 +05:30 |
|
Anand Doshi
|
1f3a5c3798
|
use validate value method to validate valuation rate should be greater than 0 in stock entry
|
2013-03-05 12:25:15 +05:30 |
|
Nabin Hait
|
4c5af2f33d
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-04 15:36:27 +05:30 |
|
Nabin Hait
|
0d20d6fdd2
|
fixes for purchase price list
|
2013-03-04 15:35:45 +05:30 |
|
Anand Doshi
|
91484391ce
|
invalidate cache if 'show in website' is unchecked for item and item group
|
2013-03-04 14:28:38 +05:30 |
|