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 |
|
Akhilesh Darjee
|
6773bc2512
|
[pos] [minor] added pos in sales order for testing
|
2013-09-17 11:56:17 +05:30 |
|
Anand Doshi
|
ad0b05060a
|
Merge branch 'master' of github.com:webnotes/erpnext into website-wip
|
2013-09-17 11:00:24 +05:30 |
|