Commit Graph

947 Commits

Author SHA1 Message Date
Nabin Hait
a7a919d721 [fix] [minor] set warranty expiry date on serial no from delivery note 2013-08-20 16:13:23 +05:30
Nabin Hait
9653f60e89 [fix] [minor] insert cancelled sl entry for serialized inventory and at the end delete 2013-08-20 15:37:33 +05:30
Rushabh Mehta
20a109452a [buying] [manufacturing] Added new Reports and fixes for demo 2013-08-20 15:18:42 +05:30
Nabin Hait
c13c193bbc [fix] [minor] update reserved qty 2013-08-20 12:28:44 +05:30
Nabin Hait
4ae729bfd2 [cleanup] [minor] deprecated cancelled stock ledger entry 2013-08-20 12:04:46 +05:30
Nabin Hait
05652874fc [merge] [minor] merged with master for serial_no updatess 2013-08-20 11:28:38 +05:30
Rushabh Mehta
d8982d4af4 [serial no] [minor] fix - set Available status after insert on creation 2013-08-19 22:00:25 +05:30
Anand Doshi
b02fba9c77 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-19 20:03:51 +05:30
Anand Doshi
2e31e097fa [fix] [minor] _round function - implement round halfs to nearest even number 2013-08-19 19:58:23 +05:30
Nabin Hait
76273ebfbc [merge] [minor] Fixed conflict while merging serial_no branch with master 2013-08-19 16:26:13 +05:30
Nabin Hait
74c281cc55 [cleanup] [minor] On cancellation of transation, do not post cancelled sl entries, delete allexisting sl entries against that transaction 2013-08-19 16:17:18 +05:30
Nabin Hait
44da6f2efe [fix] [minor] fixed conflict while merging with master 2013-08-19 11:06:06 +05:30
Nabin Hait
c46d044efe [fix] [minor] [stock entry] call get_items even if item exists and on saved document 2013-08-17 12:38:23 +05:30
Rushabh Mehta
3423a73009 [serial no] Allow creation only of Warehouse is not set, [translation] Italian 2013-08-16 13:03:34 +05:30
Rushabh Mehta
6e252d64aa Merge branch 'master' of github.com:webnotes/erpnext 2013-08-16 10:04:45 +05:30
Anand Doshi
3cb7cf497b [fix] [minor] project query for purchase receipt 2013-08-14 18:55:50 +05:30
Rushabh Mehta
170be3b717 [minor] merge master 2013-08-14 18:41:42 +05:30
Rushabh Mehta
62030e05cc [Serial No] Major updates, code cleanup, "In Store" is now "Available". Serial No can only be created via Stock Entry / Purchase Receipt. Serial No can be auto created using Series if mentioned in Item master 2013-08-14 18:39:27 +05:30
Anand Doshi
9618cb8ef1 [fix] [minor] downsample data to 1000 points before plotting using flot.downsample plugin 2013-08-14 14:22:47 +05:30
Anand Doshi
47e14a9de4 [fix] [minor] rate calculation on server side, only if blank/0 (honour client side calculation sequence), shopping cart settings 2013-08-13 13:01:12 +05:30
Anand Doshi
3eb8c38efb Merge branch 'master' of github.com:webnotes/erpnext 2013-08-12 17:33:23 +05:30
Anand Doshi
5476318030 [fix] [minor] round off currency values in grid reports 2013-08-12 17:32:47 +05:30
Nabin Hait
bf5d44c804 [fix] [minor] reorder level bug through scheduler 2013-08-12 16:30:48 +05:30
Rushabh Mehta
4c17f9420e [manufacturing] Added New Reports 2013-08-12 14:18:09 +05:30
Rushabh Mehta
813b1cba65 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-09 18:12:15 +05:30
Rushabh Mehta
4a404e9299 [price list] Separated Default Price List for Selling and Buying and changed fieldnames 2013-08-09 18:11:35 +05:30
Rushabh Mehta
0b9954059c [cleanup] [minor] price list field rename (wip), set default supplier from item, make demo - purchase cycle (wip) 2013-08-09 15:30:11 +05:30
Rushabh Mehta
be64070ed9 [report] material requests for which supplier quotations are not created 2013-08-09 15:26:47 +05:30
Nabin Hait
f71f5f55e5 [minor] [fix] update serial no details on cancelling of purchase receipt 2013-08-09 14:46:16 +05:30
Rushabh Mehta
75c3171c04 [rename] Naming Series is now Document Numbering Series and updated translations 2013-08-08 16:00:40 +05:30
Nabin Hait
3dfc9303ca [minor] [fix] validation in stock reconciliation 2013-08-08 11:29:08 +05:30
Nabin Hait
95c748eb67 [perpetual accounting] validate expense account in stock reconciliation 2013-08-08 10:51:59 +05:30
Anand Doshi
5a8a63058e Merge branch 'master' of github.com:webnotes/erpnext 2013-08-07 20:19:26 +05:30
Anand Doshi
1c77745d05 [fix] [minor] [print formats] use format_currency in place of fmt_money 2013-08-07 20:15:37 +05:30
Anand Doshi
5dd6b1d082 [optimization] [minor] pass filtered stock ledger entries to get_buying_amount 2013-08-07 19:27:30 +05:30
Nabin Hait
cf5c9a1f59 [minor] [fix] uom conversion factor should be mapped from PO to PR to PI 2013-08-07 17:31:47 +05:30
Nabin Hait
815a49e027 [perpetual accounting] fixes in testcases 2013-08-07 17:00:01 +05:30
Nabin Hait
cdd1d4bedb [perpetual accounting] fixes in testcases 2013-08-07 15:16:42 +05:30
Rushabh Mehta
7c2a2e24a2 [demo] [minor] simulate quotation 2013-08-07 15:08:11 +05:30
Rushabh Mehta
0983cb75d5 [cleanup] [minor] removed default value 0.00 2013-08-07 15:06:51 +05:30
Nabin Hait
aa34201dde [perpetual accounting] fixes in testcases 2013-08-07 14:21:04 +05:30
Nabin Hait
469ee71615 [perpetual accounting] [minor] fixes for test cases 2013-08-07 12:33:37 +05:30
Nabin Hait
cc0e2d1740 [minor] merged with master 2013-08-06 16:19:18 +05:30
Nabin Hait
c1541526d6 [fix] [minor] validate reserved warehouse 2013-08-06 16:10:30 +05:30
Nabin Hait
43eba26dcf [perpetual accounting] make gl entries relevant for different transactions 2013-08-06 16:00:50 +05:30
Nabin Hait
69f350a4d0 [perpetual accounting] get_query for account in warehouse 2013-08-06 15:59:25 +05:30
Nabin Hait
47dc3181ec [perpetual accounting] get warehouse-item-wise stock balance 2013-08-06 15:58:16 +05:30
Anand Doshi
41006c545e [fix] [minor] warehouse-wise stock balance filter [issue] webnotes/erpnext#724 2013-08-06 14:45:22 +05:30
Anand Doshi
801ea1d5a0 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-05 18:43:27 +05:30
Anand Doshi
cc186da938 [fix] [minor] [test cases] 2013-08-05 18:43:01 +05:30
Rushabh Mehta
63f9b07935 [minor] [item] Removed Sales Rate #613 2013-08-05 18:24:49 +05:30
Rushabh Mehta
0dae9f316a [bom] [stock entry] Bug Fix for direct BOM entries 2013-08-05 15:29:35 +05:30
Rushabh Mehta
e67d1fbcdf [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
Nabin Hait
7895d34d41 [fix] [minor] SO/DN required validation and get_single_value deprecated 2013-08-05 12:44:10 +05:30
Nabin Hait
73d04b155c [minor] [fix] test cases fix for perpetual accounting 2013-08-05 12:19:38 +05:30
Nabin Hait
a36adbd1e0 [minor] [fix] make sl entry 2013-08-02 14:50:12 +05:30
Anand Doshi
6affb78e1f [minor] moved delivered items to be billed to accounts module 2013-08-02 12:50:40 +05:30
Nabin Hait
bbe1448fca Merge branch 'master' into perpetual 2013-08-02 11:53:00 +05:30
Nabin Hait
0dd7be14fa [perpetual accounting] get stock balance on any date 2013-08-02 11:45:43 +05:30
Nabin Hait
1e2f20a3da [cleanup] code commonified of making sl entry 2013-08-02 11:42:11 +05:30
Anand Doshi
17350b899f [fix] [mapper] from delivery note to sales invoice, only map unbilled items 2013-08-01 15:45:23 +05:30
Anand Doshi
97fd522788 [fix] material request - no_copy=0 for schedule_date so that it could be mapped to purchase order 2013-08-01 12:25:23 +05:30
Nabin Hait
2d57e51112 [fix] [minor] null issue 2013-07-31 17:31:23 +05:30
Anand Doshi
f006916518 [fix] [minor] [report] 2013-07-31 11:47:54 +05:30
Anand Doshi
5c76f014a7 [report] [accounts] Delivered Items To Be Billed, Received Items To Be Billed 2013-07-30 18:42:16 +05:30
Anand Doshi
18b1e202d5 [fix] [issue] webnotes/erpnext#674 - hide Make Invoice button when invoicing of delivery/receipt is complete 2013-07-30 16:10:37 +05:30
Anand Doshi
d2cb598b6b Merge branch 'master' of github.com:webnotes/erpnext 2013-07-30 14:51:08 +05:30
Anand Doshi
a648f46d4e [fix] [minor] show stock ledger, general ledger, fixes post changes in script manager trigger [issue] webnotes/wnframework#228 2013-07-30 14:43:29 +05:30
Nabin Hait
9764e32d0a [fix] [minor] syntax error in stock entry 2013-07-30 12:38:19 +05:30
Anand Doshi
f314051e30 Merge branch 'master' of github.com:webnotes/erpnext into custom_script_defer 2013-07-30 10:44:07 +05:30
Anand Doshi
1fac2a98cf [fix] [client script] call cur_frm.cscript.custom_ type functions in the callback of standard functions 2013-07-29 19:30:39 +05:30
Nabin Hait
dce9fdfe26 [minor] [fix] 2013-07-29 16:16:03 +05:30
Nabin Hait
90d74d4bfa [minor] sales invoice to delivery note mapping and prevdoc validation 2013-07-29 13:27:18 +05:30
Nabin Hait
173e874610 [fix] maintain same rate throughout purchase cycle optional 2013-07-29 11:24:11 +05:30
Nabin Hait
834a4db596 [feature] pull from material request based on supplier 2013-07-26 19:45:22 +05:30
Anand Doshi
720a01a6f6 [selling] changed fieldtype of Price List to link 2013-07-26 11:32:02 +05:30
Anand Doshi
742b55f700 Merge branch 'master' of github.com:webnotes/erpnext 2013-07-25 18:53:50 +05:30
Anand Doshi
60403b2d8f [fix] [minor] [grid] set_colum_disp should force refresh the whole grid 2013-07-25 18:53:22 +05:30
Rushabh Mehta
c97fe01837 Merge branch 'master' of github.com:webnotes/erpnext 2013-07-25 18:14:18 +05:30
Nabin Hait
ea51b41239 [fix] [minor] allowed territory group in all transactions 2013-07-25 18:01:13 +05:30
Rushabh Mehta
4dca40195e [feature] Ability to set UOM as Integer-only and related validations. 2013-07-25 17:45:59 +05:30
Nabin Hait
54caa86437 Merge branch 'master' of github.com:webnotes/erpnext 2013-07-25 16:06:39 +05:30
Nabin Hait
88e3b92242 [fix] [minor] serial no should be mapper in installation note from delivery note 2013-07-25 16:06:22 +05:30
Rushabh Mehta
dd05d5eca0 Merge branch 'master' of github.com:webnotes/erpnext 2013-07-25 16:05:22 +05:30
Rushabh Mehta
1875fd177a [minor] [fix] missing icons in reports #589 2013-07-25 16:05:02 +05:30
Anand Doshi
85fa3d2bb9 [fix] [minor] upload callback arguments changed 2013-07-25 16:02:15 +05:30
Nabin Hait
48a0bd3eda [minor] [fix] price list currency read only and SO-MR mapping 2013-07-23 15:31:39 +05:30
Anand Doshi
648a5c7e33 [fix] added required permissions for fiscal year, brand, company, country, currency, item group, price list, uom and warehouse 2013-07-23 12:07:55 +05:30
Anand Doshi
54c78a9cf5 [minor] [fix] [permissions] Item 2013-07-23 11:56:00 +05:30
Anand Doshi
5c76492fbe [minor] [fix] clear value and run trigger of attach_files: field on removing attachment, if that attachment is being used by a given field 2013-07-23 11:48:25 +05:30
Nabin Hait
9481e037d2 [minor] [fix] pull uom conversion factor in purchase cycle 2013-07-22 17:28:11 +05:30
Rushabh Mehta
b54cd9967e Merge branch 'master' of github.com:webnotes/erpnext 2013-07-22 15:59:48 +05:30
Rushabh Mehta
c9bcfd1070 [cleanup] [minor] removed 'System Manager' permission for new setups 2013-07-22 15:33:10 +05:30
Anand Doshi
21503f8fb9 [minor] [fix] on row add processing, [cleanup] shifted validate link and fetch to script_manager 2013-07-22 13:38:28 +05:30
Anand Doshi
6f6e91c0fa [minor] [fix] in check_mandatory, ignore naming_series, since it is checked during doc's save 2013-07-22 11:28:34 +05:30
Nabin Hait
461b417871 [minor] [fix] trigger in supplier address and contact person field 2013-07-20 18:29:45 +05:30
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
Nabin Hait
cf1829d21c Merge branch 'master' of github.com:webnotes/erpnext into responsive 2013-07-16 14:39:39 +05:30
Nabin Hait
aea0af02aa Merge branch 'master' into slow 2013-07-16 14:28:03 +05:30
Nabin Hait
e724fd45d1 [report] [minor] added warehouse and brand columns in purchase ordered items to be received 2013-07-16 13:23:40 +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
1ac928ed5c Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-11 16:07:53 +05:30
Rushabh Mehta
df92a553cb [style] Added Icons to Pages 2013-07-11 14:50:43 +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
8f61991235 [minor] 2013-07-10 19:02:07 +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
0f3d2df8e8 Merge branch 'master' of github.com:webnotes/erpnext into responsive 2013-07-09 12:44:17 +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
Akhilesh Darjee
d3c74c1a1b [Cleanup][Report] Added company in Warehouse-wise Stock Balance & removed filters from both reports 2013-07-09 11:51:24 +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