Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,703 Commits 3 Branches 0 Tags 1 GiB
5a1a22e907
Commit Graph

1204 Commits

Author SHA1 Message Date
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
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
Nabin Hait
5cd1d54347 [minor] merged with master branch 2013-09-17 10:30:24 +05:30
Nabin Hait
7a75e10a61 [fix] [minor] perpetual inventory: account for each warehouse 2013-09-17 10:21:20 +05:30
Akhilesh Darjee
cb45b8f631 Merge branch 'master' of github.com:webnotes/erpnext 2013-09-16 11:06:46 +05:30
Anand Doshi
7255313e84 [fix] [minor] pos invoice print format 2013-09-13 17:41:36 +05:30
Akhilesh Darjee
2e1f94f222 [fix] [pos] hide custom buttons in pos view 2013-09-13 17:37:23 +05:30
Anand Doshi
1be5bb7e6a [portal] [minor] show status for order and invoice 2013-09-12 15:25:47 +05:30
Akhilesh Darjee
a7a06a77dd [fix] journal voucher to fetch company currency 2013-09-12 13:59:06 +05:30
Anand Doshi
8a4b21ab8e Merge branch 'master' of github.com:webnotes/erpnext into website-wip 2013-09-11 19:38:38 +05:30
Anand Doshi
fb109aded0 [website] [minor] moving to framework 2013-09-11 18:58:20 +05:30
Akhilesh Darjee
c3ec72c991 [fix] [minor] merge conflict fixed 2013-09-11 14:49:38 +05:30
Akhilesh Darjee
db59ffb76d [usability] item price moved to price list 2013-09-11 13:05:24 +05:30
Anand Doshi
b0d996ffb1 [website] [minor] moving to framework 2013-09-10 18:29:39 +05:30
Nabin Hait
563662916a [fix] [minor] pos setting link validation 2013-09-10 17:15:01 +05:30
Nabin Hait
ee93ee3cb5 [minor] allow import for journal voucher 2013-09-10 14:59:58 +05:30
Anand Doshi
a3f6fda0df [fix] Hide Make Delivery Note button, if Sales Invoice is made from Delivery Note. Hide Make Invoice Button, if Delivery Note is made from Sales Invoice 2013-09-06 13:37:52 +05:30
Nabin Hait
87eb4b99a8 [fix] [minor] gl entries for purchase invoice 2013-09-05 17:03:31 +05:30
Nabin Hait
272410bb87 [fix] [minor] fixes in payment reconciiation 2013-09-05 15:43:05 +05:30
Nabin Hait
335cdeaf7d [fix] [minor] fixes in test cases for is_pos 2013-09-05 14:00:57 +05:30
Nabin Hait
eec9371de7 [fix] [minor] gl entries for purchase invoice 2013-09-05 13:42:54 +05:30
Akhilesh Darjee
a7b7d2559e [fix] merge conflict 2013-09-05 13:18:22 +05:30
Akhilesh Darjee
38e8f989fa [fix] [patch] fixed paid_amount & patch for default pos view check in features setup 2013-09-05 12:59:33 +05:30
Anand Doshi
ea55734df5 [fix] [minor] delivered items to be billed 2013-09-05 12:41:16 +05:30
Anand Doshi
8543469fba Merge branch 'master' of github.com:webnotes/erpnext 2013-09-05 12:22:14 +05:30
Nabin Hait
a653cd3608 [minor] fixed conflict while merging with master 2013-09-05 10:56:44 +05:30
Nabin Hait
2162fee396 Merge pull request #792 from akhileshdarjee/master 
[pos][fix] fixed pos view in sales_invoice.js
 2013-09-04 22:03:42 -07:00
Akhilesh Darjee
734b2aab5c [fix] pos setting link fields validate to specific company 2013-09-04 18:48:08 +05:30
Nabin Hait
bf4d27ecf1 [minor] repost future gl entries only for current voucher items 2013-09-04 17:55:45 +05:30
Anand Doshi
0e23929740 Merge branch 'master' into customer-login 2013-09-03 16:42:21 +05:30
Anand Doshi
1dadf35fc7 [fix] [minor] [query] sales invoice from delivery note 2013-09-03 16:21:01 +05:30
Anand Doshi
36b63a44b9 [fix] [minor] profile query 2013-09-03 15:33:56 +05:30
Akhilesh Darjee
45af0a18b6 [pos] [minor] pos setting fix 2013-09-02 19:05:55 +05:30
Akhilesh Darjee
7a274e4d2f [pos] [minor] pos print format & pos setting cancel function allowed 2013-09-02 18:53:09 +05:30
Akhilesh Darjee
12425ce85e [pos] [minor] pos completed 2013-09-02 18:48:39 +05:30
Nabin Hait
da3110fc12 [merge] [minor] merged with master 2013-09-02 13:07:49 +05:30
Anand Doshi
ddb7c8048e Merge branch 'master' of github.com:webnotes/erpnext into customer-login 2013-09-02 11:13:32 +05:30
Nabin Hait
0ddcc6f7cf [fix] [minor] set invoice due date based on credit days 2013-08-31 10:19:56 +05:30
Nabin Hait
5836c58a4b [docs] [minor] accounting for stock 2013-08-31 10:17:27 +05:30
Nabin Hait
94c90bdbf9 [fix] [minor] buying amount for sales bom item 2013-08-30 22:48:19 +05:30
Anand Doshi
c8e39b0965 [fix] [minor] use prop instead of attr to disable a field 2013-08-30 18:22:58 +05:30
Nabin Hait
da1e503f3d [fix] [minor] removed sample item field from item 2013-08-30 16:24:44 +05:30
Akhilesh Darjee
cf0b6d579f [pos] POS Invoice print format done 2013-08-29 19:21:03 +05:30
Nabin Hait
bb77756069 [fix] [minor] auto accounting for stock transactions 2013-08-29 18:19:37 +05:30
Akhilesh Darjee
d2714310ed [pos][minor] barcode clear timeout done 2013-08-28 19:35:22 +05:30
Nabin Hait
d85d63bb81 [minor] renamed perpetual accounting to make_accounting_entry_for_every_stock_entry 2013-08-28 19:24:52 +05:30
Nabin Hait
2e296fa46f [fix] [minor] Repost future gl entries and testcases 2013-08-28 18:53:11 +05:30
Akhilesh Darjee
f3eae2344b [pos][minor] fixed sales_invoice.js for pos view 2013-08-28 11:50:01 +05:30
Anand Doshi
c753d31ba7 [fix] [minor] erpnext demo 2013-08-26 17:33:50 +05:30
Nabin Hait
92b0e777e8 [fix] [minor] merged with master 2013-08-26 16:55:42 +05:30
Nabin Hait
27994c216a [perpetual accounting] gl entries based on stock_value difference in sl entries 2013-08-26 16:53:30 +05:30
Anand Doshi
6c0a1a9674 [fix] [minor] temporarily disabled pos view 2013-08-23 19:30:44 +05:30
Akhilesh Darjee
1f0b8606d6 [pos][minor] 2013-08-23 18:22:32 +05:30
Nabin Hait
aeba24ee81 [minor] make gl entry through bean and testcases 2013-08-23 15:17:36 +05:30
Rushabh Mehta
cb50dee98c [pos] [minor] added css file 2013-08-23 13:35:21 +05:30
Rushabh Mehta
16a62fa4be [pos] [cleanup] 2013-08-23 13:16:22 +05:30
Nabin Hait
a391606a8f [cleanup] [minor] budget code cleaned up with testcases 2013-08-23 10:46:41 +05:30
Nabin Hait
2b06aaa291 [cleanup] [minor] deprecated budget control and rewritten budget related code 2013-08-22 18:25:43 +05:30
Akhilesh Darjee
d6aa4bff7f [pos] pos view first commit 2013-08-22 17:26:43 +05:30
Nabin Hait
4212180804 Merge branch 'master' of github.com:webnotes/erpnext into perpetual 2013-08-22 15:23:11 +05:30
Rushabh Mehta
622c98d6f4 [demo] [minor] Added accounts, moved JV creation to server-side 2013-08-22 15:17:58 +05:30
Nabin Hait
f3075e19dc Merge branch 'master' of github.com:webnotes/erpnext into perpetual 2013-08-22 14:42:20 +05:30
Nabin Hait
b4418a4997 [minor] budget cleanup 2013-08-22 14:38:46 +05:30
Nabin Hait
77343391f5 [fix] [minor] changed validation message 2013-08-22 10:45:41 +05:30
Nabin Hait
11bd44e447 [minor] fixed conflict while merging with master 2013-08-21 17:51:46 +05:30
Rushabh Mehta
cce21d11fa [major] upgrade to bootstrap 3 2013-08-21 17:48:08 +05:30
Nabin Hait
9b09c95d83 [cleanup] [accounts] delete gl entries on cancellation of accounting transactions 2013-08-21 17:47:11 +05:30
Nabin Hait
4af17a88b0 [cleanup] [minor] period closing voucher inherited from accounts_controller with testcases 2013-08-21 17:45:47 +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
Nabin Hait
05652874fc [merge] [minor] merged with master for serial_no updatess 2013-08-20 11:28:38 +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
176f3afd14 [fix] [minor] fixes in POS Invoice print format 2013-08-16 16:17:34 +05:30
Nabin Hait
3ccd07cc72 [fix] [minor] paid amount should be zero if not pos invoice 2013-08-16 15:21:25 +05:30
Nabin Hait
21cf403b57 [fix] [minor] paid amount should be zero if not pos invoice 2013-08-16 15:15:16 +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
30324b857a [fix] [minor] set due date in sales invoice after mapping 2013-08-14 17:07:42 +05:30
Anand Doshi
379acbbd77 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-14 14:23:07 +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
Nabin Hait
29c8327a2f [fix] [minor] Analytics role added in Financial Statements report 2013-08-14 12:48:41 +05:30
Anand Doshi
dd2ec17962 [fix] [minor] pull credit days from customer, update credit days in account of customer 2013-08-13 13:57:53 +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
c4dde9bd99 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-12 20:13:02 +05:30
Anand Doshi
05a340e764 [fix] [minor] fixes after merging akhilesh's changes 2013-08-12 20:01:55 +05:30
Anand Doshi
9e59aff54e Merge branch 'master' of git://github.com/akhileshdarjee/erpnext into akhileshdarjee-master 
Conflicts:
	accounts/doctype/pos_setting/pos_setting.txt
	patches/patch_list.py
 2013-08-12 20:00:33 +05:30
Nabin Hait
358907d8a6 [fix] [minor] sales invoice: unhide fields if not hidden in database 2013-08-12 19:06:32 +05:30
Nabin Hait
f638336886 [fix] [minor] description for period-closing-account field 2013-08-12 17:39:33 +05:30
Nabin Hait
d1055ce1bc [fix] [minor] Target variance report if distribution id is not specified 2013-08-12 15:15:19 +05:30
Nabin Hait
4af2dbf84d [perpetual accounting] [minor] patch for intial setup 2013-08-12 12:24:08 +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
Nabin Hait
fd6a650e12 [perpetual accounting] [minor] create jv to book stock received but not billed 2013-08-09 14:42:48 +05:30
Akhilesh Darjee
44b2e23eba [fix] pos settings - replace customer account with customer 2013-08-09 12:43:57 +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
38a07cf86a [fix] [chart of accounts] view ledger should show correct account's ledger 2013-08-08 18:49:58 +05:30
Rushabh Mehta
75c3171c04 [rename] Naming Series is now Document Numbering Series and updated translations 2013-08-08 16:00:40 +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