Rushabh Mehta
|
7d8b189c8f
|
[cleanup] UI Fixes
|
2013-11-08 16:27:18 +05:30 |
|
Nabin Hait
|
ca8ad210d2
|
Merge branch 'i18n' of git://github.com/bperretti/erpnext into bperretti-i18n
|
2013-10-24 11:40:32 +05:30 |
|
Akhilesh Darjee
|
2d82f26976
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-10-18 15:28:15 +05:30 |
|
Akhilesh Darjee
|
fcd70d04f3
|
[item price] item price made as an individual master and removed from price list
|
2013-10-18 14:24:21 +05:30 |
|
Nabin Hait
|
8f72d9f679
|
Merge pull request #974 from akhileshdarjee/master
[fix] [minor] conversion rate related fixes
|
2013-10-17 00:56:00 -07:00 |
|
Akhilesh Darjee
|
04638a5f77
|
[fix] [minor] onload post render also check for supplier
|
2013-10-17 13:19:46 +05:30 |
|
Akhilesh Darjee
|
acf65a7225
|
[fix] [minor] conversion rate related fixes
|
2013-10-17 13:04:26 +05:30 |
|
Rushabh Mehta
|
be7e8556b0
|
Merge pull request #972 from akhileshdarjee/master
[fix] [minor] conversion rater
|
2013-10-16 23:03:41 -07:00 |
|
Akhilesh Darjee
|
3add576b1e
|
[fix] [minor] conversion rate fix
|
2013-10-17 11:32:44 +05:30 |
|
Akhilesh Darjee
|
564c621c3e
|
[fix] [minor] conversion rate fix
|
2013-10-17 11:31:11 +05:30 |
|
Bárbara Perretti
|
4b41e5f7f7
|
Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n
Conflicts:
accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js
accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
public/js/complete_setup.js
selling/doctype/opportunity/opportunity.js
selling/doctype/quotation/quotation.js
|
2013-10-16 15:09:18 -03:00 |
|
Nabin Hait
|
a012ffedd1
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-10-16 11:48:39 +05:30 |
|
Akhilesh Darjee
|
61b5c59e70
|
[fix] fixed conversion rate for mapping any documents
|
2013-10-15 20:24:34 +05:30 |
|
Nabin Hait
|
b338b6ed24
|
[fix] [minor] validate converion rate
|
2013-10-15 16:55:24 +05:30 |
|
Akhilesh Darjee
|
7837827e30
|
[fix] [minor] conversion arte related fixes
|
2013-10-11 19:06:30 +05:30 |
|
Akhilesh Darjee
|
1797cfef63
|
[fix] removed validation of conversion rate equals 1 from all transaction
|
2013-10-11 13:34:10 +05:30 |
|
Bárbara Perretti
|
534af0bcca
|
Fix translate transaction.js
|
2013-10-08 15:00:07 -03:00 |
|
Akhilesh Darjee
|
10dce341c8
|
[pos] pos view fixed for all purchase & sales cycle
|
2013-09-25 11:09:33 +05:30 |
|
Akhilesh Darjee
|
f624ffa40a
|
[pos] refresh() to be called at minimum
|
2013-09-23 12:27:16 +05:30 |
|
Akhilesh Darjee
|
f83576bf9c
|
[pos] pos.js included in all selling & purchase cycle
|
2013-09-18 18:35:12 +05:30 |
|
Akhilesh Darjee
|
a550e7443f
|
[pos] moved pos realted code from sales_invoice.js to transaction.js
|
2013-09-17 18:52:00 +05:30 |
|
Akhilesh Darjee
|
6773bc2512
|
[pos] [minor] added pos in sales order for testing
|
2013-09-17 11:56:17 +05:30 |
|
Akhilesh Darjee
|
4a0cae8b41
|
[fix] removed client side validation for conversion rate
|
2013-09-16 12:25:00 +05:30 |
|
Akhilesh Darjee
|
db59ffb76d
|
[usability] item price moved to price list
|
2013-09-11 13:05:24 +05:30 |
|
Anand Doshi
|
179e3772c0
|
[fix] [minor] item wise taxes
|
2013-09-05 16:53:57 +05:30 |
|
Anand Doshi
|
a91c95f0fe
|
[fix] [minor] recalculate on removing row
|
2013-08-23 13:00:47 +05:30 |
|
Anand Doshi
|
1e4fb689fc
|
[fix] [minor] trigger grid_fieldname_remove function on removing grid row
|
2013-08-23 12:56:33 +05:30 |
|
Anand Doshi
|
e42a0222d5
|
[minor] [fix] precision for float fields on server-side
|
2013-08-12 11:58:02 +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 |
|
Anand Doshi
|
79251492fe
|
[fix] [minor] call set_dynamic_labels after onload_post_render
|
2013-08-09 00:20:34 +05:30 |
|
Anand Doshi
|
5e4e5d78df
|
[minor] [fix] bring back onload_post_render in transaction.js - ref: a9b1c09166
|
2013-08-06 17:23:44 +05:30 |
|
Anand Doshi
|
af4888f11a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-08-05 18:08:59 +05:30 |
|
Anand Doshi
|
a9b1c09166
|
[minor] [fixes] removed onload_post_render from transaction.js, since it is already called after mapping on server side
|
2013-08-05 18:07:45 +05:30 |
|
Rushabh Mehta
|
e67d1fbcdf
|
[license] [minor] Updated License Text in all js and py files
|
2013-08-05 14:59:54 +05:30 |
|
Anand Doshi
|
aa71b5b6ea
|
[fix] [minor] show item-wise taxes
|
2013-08-05 13:00:53 +05:30 |
|
Anand Doshi
|
5013dcb12c
|
[fix] [minor] change_grid_labels
|
2013-08-05 12:16:04 +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
|
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 |
|
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
|
1f996c3121
|
[minor] currency trigger should not be called in refresh
|
2013-07-29 19:02:09 +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
|
535d833523
|
[minor] [fix] call company trigger in onload for a new selling/buying transaction
|
2013-07-19 13:51:07 +05:30 |
|
Anand Doshi
|
64f316bd2f
|
[minor] [fix] in get item wise tax html, show empty cell if not tax for an account head for a particular item
|
2013-07-17 15:12:22 +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
|
13f2e4d8d7
|
[fix][transaction.js] syntax error
|
2013-06-25 10:56:39 +05:30 |
|
Anand Doshi
|
61a2f68bc6
|
[webshop] territories in price list, taxes, updates in shopping cart settings
|
2013-06-21 17:55:31 +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 |
|
Anand Doshi
|
060d9248d3
|
[fixes] buying/selling price lists, communication and website settings
|
2013-06-12 17:40:36 +05:30 |
|
Anand Doshi
|
bf3e54a45b
|
[issues #437] [fix] pulling terms and conditions
|
2013-06-05 14:11:32 +05:30 |
|