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 |
|
Bárbara Perretti
|
2fec756fde
|
Fix translate payment_made_with_ageing.js
|
2013-09-30 18:19:03 -03:00 |
|
Bárbara Perretti
|
e696cd0b6c
|
Fix translate payment_collection_with_ageing.js
|
2013-09-30 18:17:35 -03:00 |
|
Bárbara Perretti
|
aa83cd0394
|
Fix translate item_wise_sales_register.js
|
2013-09-30 18:14:43 -03:00 |
|
Bárbara Perretti
|
40c98fb795
|
Fix translate item_wise_purchase_register.js
|
2013-09-30 18:13:24 -03:00 |
|
Bárbara Perretti
|
c685da0061
|
Fix translate gross_profit.js
|
2013-09-30 18:11:48 -03:00 |
|
Bárbara Perretti
|
2d3041e8ae
|
Fix translate budget_variance_report.js
|
2013-09-30 18:10:04 -03:00 |
|
Bárbara Perretti
|
2d393e36a5
|
Fix translate bank_reconciliation_statement.js
|
2013-09-30 18:08:50 -03:00 |
|
Bárbara Perretti
|
0a857b21d3
|
Fix translate bank_clearance_summary.js
|
2013-09-30 18:07:42 -03:00 |
|
Bárbara Perretti
|
4a7b199c4d
|
Fix translate accounts_receivable.js
|
2013-09-30 18:06:29 -03:00 |
|
Bárbara Perretti
|
8bb82aeac3
|
Fix translate accounts_payable.js
|
2013-09-30 17:57:17 -03:00 |
|
Bárbara Perretti
|
e6063695d1
|
Fix translate voucher_import_tool.js
|
2013-09-30 17:46:10 -03:00 |
|
Bárbara Perretti
|
f2ae1bee20
|
Fix translate trial_balance.js
|
2013-09-30 17:40:19 -03:00 |
|
Bárbara Perretti
|
26b13a8a45
|
Fix translate general_ledger.js
|
2013-09-30 17:26:51 -03:00 |
|
Bárbara Perretti
|
5d19387756
|
Fix translate financial_statements.js
|
2013-09-30 17:07:59 -03:00 |
|
Bárbara Perretti
|
9963d5bda3
|
Fix translate financial_analytics.js
|
2013-09-30 16:57:52 -03:00 |
|
Bárbara Perretti
|
ad6679f8f1
|
Fix translate accounts_home.js
|
2013-09-30 16:42:27 -03:00 |
|
Bárbara Perretti
|
54edf12900
|
fix translate accounts_browser.js
|
2013-09-30 16:38:30 -03:00 |
|
Bárbara Perretti
|
dda4e83469
|
Fix translate sales_taxes_and_charges_master.js
|
2013-09-30 15:43:01 -03:00 |
|
Bárbara Perretti
|
cc0ef52abd
|
Fix translate sales_invoice.js
|
2013-09-30 15:38:40 -03:00 |
|
Bárbara Perretti
|
1a920c7ce8
|
Fix translate purchase_taxes_and_charges_master.js
|
2013-09-30 15:35:08 -03:00 |
|
Bárbara Perretti
|
46d2b9a895
|
Fix translate purchase_invoice.js
|
2013-09-30 15:19:16 -03:00 |
|
Bárbara Perretti
|
568ce8653e
|
Fix translate payment_to_invoice_matching_tool.js
|
2013-09-30 15:13:24 -03:00 |
|
Bárbara Perretti
|
dc6cab63dc
|
Fix translate journal_voucher.js
|
2013-09-30 15:03:17 -03:00 |
|
Bárbara Perretti
|
676e081ed3
|
Fix translate Cost_center.js
|
2013-09-30 14:36:00 -03:00 |
|
Bárbara Perretti
|
9fc8e88503
|
Fix translate Fiscal_year.js
|
2013-09-30 14:33:13 -03:00 |
|
Bárbara Perretti
|
14aedc92fb
|
Fix translate Cost_center.js
|
2013-09-30 13:56:28 -03:00 |
|
Akhilesh Darjee
|
4233ae2258
|
[pos] pos related fixes
|
2013-09-30 18:18:19 +05:30 |
|
Nabin Hait
|
300ae0cdf4
|
[fix] [minor] dont call is_pos trigger in onload of pos invoice
|
2013-09-30 17:57:22 +05:30 |
|
Bárbara Perretti
|
d25c46a4ed
|
Fix translate account.js
|
2013-09-27 17:51:05 -03:00 |
|
Nabin Hait
|
a3d12bde9d
|
[fix] [minor] gross profit report
|
2013-09-27 16:33:22 +05:30 |
|
Nabin Hait
|
164d39d12f
|
Merge pull request #883 from akhileshdarjee/master
[feature] pos view added in all sales & purchase cycle
|
2013-09-27 00:05:15 -07:00 |
|
Akhilesh Darjee
|
2428e8d1b7
|
[pos] [minor] fix for cur_frm
|
2013-09-27 12:32:26 +05:30 |
|
Nabin Hait
|
1ec5109a1a
|
Reduce ordered qty in Purchase Receipt based on PO warehouse
|
2013-09-25 19:58:32 +05:30 |
|
Anand Doshi
|
5b004ff8a7
|
Merge branch 'master' of github.com:webnotes/erpnext into wsgi
Conflicts:
accounts/doctype/account/account.py
accounts/doctype/gl_entry/gl_entry.py
accounts/doctype/period_closing_voucher/period_closing_voucher.py
stock/doctype/delivery_note/delivery_note.py
stock/doctype/landed_cost_wizard/landed_cost_wizard.py
stock/doctype/purchase_receipt/purchase_receipt.py
stock/doctype/stock_ledger/stock_ledger.py
stock/doctype/warehouse/warehouse.py
stock/stock_ledger.py
|
2013-09-25 19:55:41 +05:30 |
|
Akhilesh Darjee
|
10dce341c8
|
[pos] pos view fixed for all purchase & sales cycle
|
2013-09-25 11:09:33 +05:30 |
|
Nabin Hait
|
625da79e9f
|
item-wise price list rate, editable report
|
2013-09-25 10:32:51 +05:30 |
|
Nabin Hait
|
04a3feecf6
|
[minor] perpetual inventory fix
|
2013-09-24 15:16:01 +05:30 |
|
Nabin Hait
|
11f41955c9
|
[minor] fixed conflict while merging perpetual branch into master
|
2013-09-24 14:36:55 +05:30 |
|
Nabin Hait
|
66adb3c0cf
|
[minor] Frozen Accounts Modifier fixes
|
2013-09-24 12:10:37 +05:30 |
|
Nabin Hait
|
7031ea72ca
|
Frozen Accounts Modifier setting in Accounts Settings
|
2013-09-24 12:04:07 +05:30 |
|
Nabin Hait
|
6c66096fa5
|
[minor] allowed role to edit entries against frozen accounts
|
2013-09-24 00:10:10 +05:30 |
|
Nabin Hait
|
be68542bab
|
[minor] fetch debit/credit based on against JV
|
2013-09-23 18:34:13 +05:30 |
|
Nabin Hait
|
1e15fe1ade
|
[fix] [minor] toggle display warehouse column based on update_stock
|
2013-09-23 16:07:42 +05:30 |
|
Akhilesh Darjee
|
e318c93405
|
[fix] patch merge conflict fixed
|
2013-09-23 12:34:22 +05:30 |
|
Akhilesh Darjee
|
f624ffa40a
|
[pos] refresh() to be called at minimum
|
2013-09-23 12:27:16 +05:30 |
|
Akhilesh Darjee
|
e947081552
|
[pos] pos view in all sales & purchase cycle finished
|
2013-09-19 19:09:15 +05:30 |
|
Anand Doshi
|
7c2617446e
|
[fix] [minor]
|
2013-09-19 18:31:52 +05:30 |
|
Anand Doshi
|
12144f339e
|
Merge branch 'website-wip'
|
2013-09-19 12:27:11 +05:30 |
|
Nabin Hait
|
6911bb244e
|
[fix] [minor] fixes in voucher import tool
|
2013-09-19 11:57:05 +05:30 |
|
Akhilesh Darjee
|
f83576bf9c
|
[pos] pos.js included in all selling & purchase cycle
|
2013-09-18 18:35:12 +05:30 |
|
Pratik Vyas
|
5e16a69b35
|
mass replace sql with webnotes.conn.sql
|
2013-09-18 12:20:53 +05:30 |
|
Pratik Vyas
|
e55fbfc090
|
remove sql =
|
2013-09-18 11:10:59 +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 |
|
Anand Doshi
|
83de391efc
|
Merge branch 'akhileshdarjee-master' into website-wip
|
2013-09-17 16:09:15 +05:30 |
|
Anand Doshi
|
2840620070
|
[fix] [minor] [website]
|
2013-09-17 15:28:58 +05:30 |
|
Nabin Hait
|
142007a226
|
[fix] [minor] perpetual inventory: account for each warehouse
|
2013-09-17 15:15:16 +05:30 |
|