Nabin Hait
|
1d35c444b6
|
[fix] [minor] check print hide property to show net total and grand total in purchase cycle standard print format
|
2013-11-20 16:24:11 +05:30 |
|
Nabin Hait
|
458b30b5d3
|
Merge branch '1310' of github.com:webnotes/erpnext into 1310
|
2013-11-20 13:51:16 +05:30 |
|
Akhilesh Darjee
|
20f93546eb
|
[fix] [minor] all variance related reports fixed
|
2013-11-20 13:25:04 +05:30 |
|
Nabin Hait
|
ca471f41a1
|
[fix] Rename and merge rewrite
|
2013-11-20 13:14:12 +05:30 |
|
Rushabh Mehta
|
ad45e31356
|
[copyright] added Contributors
|
2013-11-20 13:00:28 +05:30 |
|
Rushabh Mehta
|
ebdddf3fb6
|
[website] [sitemap] cleanup
|
2013-11-19 14:20:52 +05:30 |
|
Anand Doshi
|
0c26f8116d
|
Merge branch '1310' of github.com:webnotes/erpnext
Conflicts:
accounts/doctype/account/account.py
controllers/accounts_controller.py
patches/patch_list.py
selling/doctype/sales_common/sales_common.py
stock/doctype/purchase_receipt/purchase_receipt.py
|
2013-11-15 19:12:09 +05:30 |
|
Rushabh Mehta
|
e34090aa2f
|
[pos] [minor] button back on toolbar and css, fixes webnotes/erpnext#1052
|
2013-11-15 11:30:23 +05:30 |
|
Nabin Hait
|
7373a83043
|
Merge branch '1310' of github.com:webnotes/erpnext into 1310
|
2013-11-14 18:50:23 +05:30 |
|
Nabin Hait
|
e83069cb32
|
[fix] update future gl entries for stock
|
2013-11-14 18:40:08 +05:30 |
|
Nabin Hait
|
155232e04e
|
[fix] credit limit validation
|
2013-11-14 18:37:33 +05:30 |
|
Akhilesh Darjee
|
d2d210dc68
|
[fix] [minor] variance reports fixes
|
2013-11-13 17:27:35 +05:30 |
|
Rushabh Mehta
|
4f642e7670
|
[cleanup] Fixed title bars, toolbars in all pages, added default background
|
2013-11-13 16:58:18 +05:30 |
|
Akhilesh Darjee
|
bfe264be8c
|
[fix] [minor] all types of variance reports fixed
|
2013-11-13 16:45:11 +05:30 |
|
Nabin Hait
|
49f2bafa0f
|
[fix] [minor] budget variance report logic + loading time
|
2013-11-13 15:32:12 +05:30 |
|
Nabin Hait
|
06da1a6147
|
Merge pull request #1029 from akhileshdarjee/1310
[fix] [minor] budget variance report fixed
|
2013-11-11 21:57:22 -08:00 |
|
Akhilesh Darjee
|
fbfefd3dcd
|
[fix] [minor] budget variance report fixed
|
2013-11-12 11:24:56 +05:30 |
|
Nabin Hait
|
e587bc3024
|
Update accounts_payable.py
|
2013-11-11 18:42:22 +05:30 |
|
Nabin Hait
|
113b4c1a21
|
[fix] [minor] accounts payable ageing data
|
2013-11-11 18:25:12 +05:30 |
|
Anand Doshi
|
c89b49c322
|
Merge remote-tracking branch 'origin/1310'
|
2013-11-11 13:45:19 +05:30 |
|
Akhilesh Darjee
|
7344353ac5
|
[report] [fix] accounts payable fixed for get_ageing_date()
|
2013-11-11 12:47:49 +05:30 |
|
Rushabh Mehta
|
515636f24c
|
Merge branch 'master' of github.com:webnotes/erpnext into cleanup
|
2013-11-08 16:28:12 +05:30 |
|
Anand Doshi
|
0516fc6161
|
Merge branches '1310' and 'master' of github.com:webnotes/erpnext
|
2013-11-07 21:10:38 +05:30 |
|
Anand Doshi
|
ce7ed98e31
|
[minor] [refactor] Accounts Receivable
|
2013-11-07 21:09:44 +05:30 |
|
Anand Doshi
|
aacbe7a277
|
Merge branches '1310' and 'master' of github.com:webnotes/erpnext
|
2013-11-07 21:04:36 +05:30 |
|
Anand Doshi
|
3990104e9b
|
[minor] [refactor] Accounts Receivable
|
2013-11-07 21:04:01 +05:30 |
|
Anand Doshi
|
ed1679a1c5
|
Merge branch '1310' of github.com:webnotes/erpnext
|
2013-11-07 20:49:13 +05:30 |
|
Anand Doshi
|
9ff22fd508
|
[minor] [refactor] Accounts Receivable
|
2013-11-07 20:44:30 +05:30 |
|
Rushabh Mehta
|
a063b4d50e
|
[cleanup] UI Fixes, minor
|
2013-11-06 11:29:47 +05:30 |
|
Anand Doshi
|
8bc3c16497
|
[minor] fix in general ledger after translation merge
|
2013-11-05 20:05:39 +05:30 |
|
Anand Doshi
|
2ced381976
|
[minor] fixes in test cases and demo
|
2013-11-04 14:37:29 +05:30 |
|
Anand Doshi
|
daaa14c079
|
Merge branch '1310' of github.com:webnotes/erpnext
Conflicts:
setup/doctype/setup_control/setup_control.py
stock/doctype/stock_entry/stock_entry.py
utilities/demo/demo_docs/Price_List.csv
|
2013-11-04 13:14:39 +05:30 |
|
Anand Doshi
|
06757a19ef
|
[minor] [query] expense and income account queries should exclude customer and supplier accounts
|
2013-11-04 12:55:24 +05:30 |
|
Rushabh Mehta
|
f7b203de2d
|
[cleanup] UI Fixes
|
2013-11-03 20:37:49 +05:30 |
|
Rushabh Mehta
|
ef5845589d
|
[cleanup] [minor] finishing styles, labels, descriptions
|
2013-11-02 14:47:11 +05:30 |
|
Nabin Hait
|
4144b1c841
|
[fix] [minor] itemwise sales/purchase register
|
2013-11-01 18:08:55 +05:30 |
|
Akhilesh Darjee
|
e158cea77a
|
[cleanup] [minor] replaced for territory to applicable territory
|
2013-10-31 19:50:51 +05:30 |
|
Rushabh Mehta
|
bed14d7fa4
|
Merge branch 'master' of github.com:webnotes/erpnext into cleanup
|
2013-10-31 15:16:05 +05:30 |
|
Nabin Hait
|
93ba6f7e0e
|
[fix] [minor] update outstanding amount
|
2013-10-31 11:47:45 +05:30 |
|
Anand Doshi
|
fec52b5a8f
|
[minor] fixed stock entry and demo
|
2013-10-28 19:59:45 +05:30 |
|
Nabin Hait
|
494a216193
|
[fix] [minor] Cost center is mandatory if tax is include din valuation and perpetual inventory enabled
|
2013-10-28 19:59:45 +05:30 |
|
Rushabh Mehta
|
069672e197
|
[minor] cleanup start
|
2013-10-28 18:21:07 +05:30 |
|
Nabin Hait
|
9304396e17
|
[fix] [minor] Cost center is mandatory if tax is include din valuation and perpetual inventory enabled
|
2013-10-28 15:33:36 +05:30 |
|
Nabin Hait
|
d43c6bfdfb
|
[fix] [merge conflict]
|
2013-10-24 11:57:02 +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 |
|
Nabin Hait
|
3eb901f47d
|
[merge] merged with master
|
2013-10-24 11:21:11 +05:30 |
|
Nabin Hait
|
88f3cd5bf3
|
[fix] [minor] gl entry negative debit/credit
|
2013-10-23 16:29:19 +05:30 |
|
Nabin Hait
|
213da21332
|
[fix] [minor] naming for amendment
|
2013-10-21 18:32:56 +05:30 |
|
Nabin Hait
|
5566bcaa0e
|
[cleanup] purchase common
|
2013-10-18 17:01:56 +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
|
d1fd1e2d89
|
[Cleanup] Sales Common deprecated
|
2013-10-18 12:50:28 +05:30 |
|
Nabin Hait
|
096d363087
|
[fix] fixed merge conflict
|
2013-10-18 12:50:28 +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
|
acf65a7225
|
[fix] [minor] conversion rate related fixes
|
2013-10-17 13:04:26 +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
|
185991d547
|
[fix] [minor] rounding error in purchase invoice gl entry
|
2013-10-16 13:08:53 +05:30 |
|
Nabin Hait
|
a012ffedd1
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-10-16 11:48:39 +05:30 |
|
Nabin Hait
|
fc75d96abd
|
[fix] [minor] Purchase Invoice - Amount for Stock received but not billed
|
2013-10-16 11:48:15 +05:30 |
|
Nabin Hait
|
f146e8b7f5
|
Merge branch 'wsgi' of github.com:webnotes/erpnext into wsgi
|
2013-10-16 11:19:09 +05:30 |
|
Bárbara Perretti
|
32af5cd62e
|
Fix translate accounts/page/general_ledger/general_ledger.js
|
2013-10-15 15:52:57 -03:00 |
|
Bárbara Perretti
|
ac0e261eee
|
Fix translate accounts/page/financial_statements/financial_statements.js
|
2013-10-15 15:33:54 -03:00 |
|
Bárbara Perretti
|
1e7685e8ae
|
Fix translate accounts/page/financial_analytics/financial_analytics.js
|
2013-10-15 15:32:13 -03:00 |
|
Bárbara Perretti
|
8bf1374abf
|
Fix translate accounts/page/accounts_home/accounts_home.js
|
2013-10-15 15:22:20 -03:00 |
|
Akhilesh Darjee
|
61b5c59e70
|
[fix] fixed conversion rate for mapping any documents
|
2013-10-15 20:24:34 +05:30 |
|
Anand Doshi
|
a295bf5421
|
[minor] don't rollback when running all tests, fixed test cases
|
2013-10-15 19:52:29 +05:30 |
|
Nabin Hait
|
b6f37b8195
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-10-15 16:55:54 +05:30 |
|
Nabin Hait
|
b338b6ed24
|
[fix] [minor] validate converion rate
|
2013-10-15 16:55:24 +05:30 |
|
Akhilesh Darjee
|
8f90e1c8f4
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-10-15 16:26:38 +05:30 |
|
Akhilesh Darjee
|
dd6ebc1a4d
|
[cleanup] comminified copy_account_in_all_row and removed conversion rate from pos setting
|
2013-10-15 15:54:31 +05:30 |
|
Akhilesh Darjee
|
1dfcc7557a
|
[fix] fetch difference account and cost center on selecting item in stock entry
|
2013-10-15 13:54:39 +05:30 |
|
Nabin Hait
|
1c62cbe1fc
|
Merge branch 'wsgi' of github.com:webnotes/erpnext into wsgi
|
2013-10-15 12:53:46 +05:30 |
|
Nabin Hait
|
3ceba11208
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-10-15 12:19:47 +05:30 |
|
Nabin Hait
|
f8924bcf6f
|
[fix] [minor] update serial no in sle while creating auto serial no
|
2013-10-15 12:19:25 +05:30 |
|
Anand Doshi
|
7e9048570e
|
Merge branch 'master' of github.com:webnotes/erpnext into wsgi
Conflicts:
accounts/doctype/sales_invoice/sales_invoice.txt
controllers/selling_controller.py
patches/patch_list.py
selling/doctype/lead/lead.py
selling/doctype/opportunity/opportunity.py
selling/doctype/quotation/quotation.py
selling/doctype/quotation/quotation.txt
selling/doctype/sales_order/sales_order.txt
stock/doctype/purchase_receipt/purchase_receipt.py
stock/doctype/serial_no/serial_no.py
stock/doctype/stock_entry/stock_entry.py
stock/doctype/stock_ledger_entry/stock_ledger_entry.py
|
2013-10-15 12:18:46 +05:30 |
|
Nabin Hait
|
028a5202f6
|
[minor] fixed conflict
|
2013-10-15 11:53:03 +05:30 |
|
Akhilesh Darjee
|
bfeae2da70
|
[cleanup] [minor] removed conversion rate from pos setting
|
2013-10-15 11:16:38 +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 |
|
Anand Doshi
|
9106221ea4
|
[minor] fixes after merge with master
|
2013-10-10 18:44:26 +05:30 |
|
Rushabh Mehta
|
f56d73c9bc
|
[minor] removed get_rate
|
2013-10-10 17:07:53 +05:30 |
|
Anand Doshi
|
373680bbae
|
Merged master into wsgi
|
2013-10-10 16:04:40 +05:30 |
|
Nabin Hait
|
3235e787c4
|
[fix] [minor] Pick cost_center from tax table for expense included in valuation
|
2013-10-09 12:04:41 +05:30 |
|
Nabin Hait
|
6ec7d9d3f9
|
[fix] [minor] item-wose tax in item-wise sales register
|
2013-10-09 11:46:50 +05:30 |
|
Nabin Hait
|
77f37e6b7c
|
Update Serial No details through serial_no controller
|
2013-10-08 17:11:33 +05:30 |
|
Nabin Hait
|
0352f9b827
|
[fix] [minor] gl entry cancellation
|
2013-10-05 15:38:43 +05:30 |
|
Anand Doshi
|
d1809e30e9
|
[minor] [fix] due date in sales invoice
|
2013-10-03 18:58:11 +05:30 |
|
Rushabh Mehta
|
f1b6f67a98
|
[Delivery Note] Moved prevdoc to Sales Order and Sales Invoice so links will work webnotes/erpnext#868
|
2013-10-03 12:22:52 +05:30 |
|
Anand Doshi
|
fa228e9c9b
|
Merge branch 'master' of github.com:webnotes/erpnext into wsgi
Conflicts:
accounts/doctype/purchase_invoice/purchase_invoice.py
accounts/doctype/sales_invoice/sales_invoice.txt
selling/doctype/lead/lead.txt
selling/doctype/opportunity/opportunity.txt
stock/doctype/warehouse/warehouse.py
|
2013-10-02 16:52:52 +05:30 |
|
Rushabh Mehta
|
8c2e4e1e1f
|
[wsgi] [minor] fixed webnotes.local.form_dict
|
2013-10-02 14:34:25 +05:30 |
|
Rushabh Mehta
|
24ca7e4e2e
|
Added Transactions for Import webnotes/erpnext#911
|
2013-10-02 14:25:36 +05:30 |
|
Bárbara Perretti
|
9b4a233126
|
Fix translate financial_statements.js
|
2013-10-01 15:23:50 -03:00 |
|
Nabin Hait
|
cf3011839f
|
[fix] [minor] bind onclick function based on docstatus in pos
|
2013-10-01 18:14:16 +05:30 |
|
Nabin Hait
|
a3e9d0a83d
|
Merge pull request #921 from akhileshdarjee/master
[fix] [minor] new grid to hide delete button on new row & added description
|
2013-09-30 22:30:15 -07:00 |
|
Bárbara Perretti
|
d4279c7fe5
|
Fix translate voucher_import_tool.js
|
2013-09-30 19:05:32 -03:00 |
|
Bárbara Perretti
|
e99c558152
|
Fix trasnlate trial_balance.js
|
2013-09-30 19:04:16 -03:00 |
|
Bárbara Perretti
|
c52cbef184
|
Fix translate general_ledger.js
|
2013-09-30 19:02:50 -03:00 |
|
Bárbara Perretti
|
e37cc01d16
|
Fix translate voucher_import_tool.js
|
2013-09-30 18:39:43 -03:00 |
|
Bárbara Perretti
|
48dbeb63b8
|
Fix translate sales_register.js
|
2013-09-30 18:21:02 -03:00 |
|
Bárbara Perretti
|
35fe5faba5
|
Fix translate purchase_register.js
|
2013-09-30 18:19:58 -03:00 |
|