Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,741 Commits 3 Branches 0 Tags 1 GiB
e0434ad40e
Commit Graph

2802 Commits

Author SHA1 Message Date
Nabin Hait
c30c342bdf [fix] Label for ageing cols in AR/AP report 2016-08-08 11:47:13 +05:30
Rohit Waghchaure
cd6c00d505 [Fix] pos ambiguous issue 2016-08-07 14:29:21 +05:30
Saurabh
ec14c81ebd [minor][fix] return if account details not found 2016-08-07 08:52:45 +05:30
Rohit Waghchaure
b77a1057ce fixes and cleanups. 2016-08-06 12:45:02 +05:30
Nabin Hait
e1d85f2467 Payment Entry fix: Unallocated amount in payment entry considering deductions 2016-08-05 14:51:36 +05:30
Nabin Hait
f43e49f378 Set received amount based on paid amount if currency is same 2016-08-03 14:17:05 +05:30
Nabin Hait
6620e2a494 Test case fixed for pos gl entry 2016-08-02 17:14:28 +05:30
Nabin Hait
3bb1a421f0 Change amount calcualtion in POS if there is write off amount and gl entries in this scenario 2016-08-02 16:41:15 +05:30
Rohit Waghchaure
7f031d1bfd minor fix in payment entry 2016-08-02 11:07:40 +05:30
Rohit Waghchaure
a88dec8775 [Fix] batch no searching in pos 2016-08-01 13:01:13 +05:30
Rushabh Mehta
9421a109cf [fix] reports template 2016-07-29 18:52:00 +05:30
Nabin Hait
e7d0639edc Set difference amount in Payment Entry as per field precision 2016-07-28 16:56:59 +05:30
Nabin Hait
2a2346422d [fix] Set amounts only if party and bank account exists 2016-07-27 13:08:00 +05:30
Rohit Waghchaure
26cf01aaba [mionr] fixes and cleanups 2016-07-26 00:30:25 +05:30
Rushabh Mehta
6c3ac9587e [fix] quick entry 2016-07-25 15:03:39 +05:30
Neil Trini Lasrado
d69d961f2a Removed Administrator role from Doctypes 2016-07-25 11:39:23 +05:30
Saurabh
6e0a00b537 [minor][fix] flag fix for payment entry creation via payment request 2016-07-22 15:43:27 +05:30
Saurabh
90c0b7fbea [fix] payment request demo 2016-07-22 15:43:27 +05:30
Saurabh
e4e8954a19 [fix] make payment request without payment gateway 2016-07-22 15:43:26 +05:30
Nabin Hait
13e248af8d Merge pull request #5833 from nabinhait/fix_108 
Validate warehouse if update stock checked in Purchase Invoice
 2016-07-22 13:21:43 +05:30
Nabin Hait
2b12a74fef Merge pull request #5822 from nabinhait/fix_106 
Unlink payment entries on cancellation of Invoice
 2016-07-22 13:17:04 +05:30
Nabin Hait
8ecb78ba39 Validate warehouse if update stock checked in Purchase Invoice 2016-07-22 12:25:16 +05:30
Rohit Waghchaure
ea278b5971 [Fix]POS and timesheet issues 2016-07-22 01:22:56 +05:30
Nabin Hait
e0cc87d2d8 Unlink payment entries on cancellation of Invoice 2016-07-21 18:30:18 +05:30
Nabin Hait
89d0b1b9a5 Merge pull request #5804 from nabinhait/demo1 
Demo data for fixed asset depreciation
 2016-07-21 10:05:00 +05:30
Nabin Hait
ba33026a6b Merge pull request #5798 from rohitwaghchaure/sales_invoice_form_is_pos_issue 
[Fix] POS auto set paid amount with outstanding amount issue
 2016-07-21 09:39:57 +05:30
Rushabh Mehta
5a39d41a0c [redesign] replace document flow with dashboard, sorry @saurabh6790, fixes #5792 2016-07-20 22:53:23 +05:30
Rohit Waghchaure
61b4a43d84 [Fix] POS auto set paid amount with outstanding amount issue 2016-07-20 17:01:29 +05:30
Nabin Hait
3edefb19b9 Demo data for fixed asset depreciation 2016-07-20 16:14:30 +05:30
Rushabh Mehta
2f0dbd9bd8 [fix] test 2016-07-20 15:28:39 +05:30
Faris Ansari
8908d19bc9 [mobile ui] fix buttons 2016-07-20 14:00:08 +05:30
Nabin Hait
e2d0d7c5db Merge pull request #5799 from nabinhait/fix104 
Fixes
 2016-07-20 12:38:49 +05:30
Rushabh Mehta
fc8e589295 [fix] party status updating bug, fixes #5794, #5796 2016-07-20 12:09:27 +05:30
Nabin Hait
85648d9bd6 payment entry fixes 2016-07-20 11:28:50 +05:30
Nabin Hait
b1234fa5e8 Set missing values in asset 2016-07-20 11:28:50 +05:30
Nabin Hait
df2a75ad1d Updated standard chart of accounts 2016-07-20 11:27:58 +05:30
Rushabh Mehta
c0cc9902d9 Merge pull request #5776 from saurabh6790/warehouse_accounting_fix 
[fix] for setting warehouse in account head
 2016-07-19 21:35:09 +05:30
Rohit Waghchaure
88514a246b set paid amount with grand amount on invoice form 2016-07-19 20:04:44 +05:30
Rushabh Mehta
02ba94784b Merge pull request #5785 from rohitwaghchaure/batch_added_in_pos 
[POS] Added batch and fixed issue of searching serial no #5779
 2016-07-19 10:19:52 +05:30
Rushabh Mehta
6ecc0888ab [minor] dont make tax template default, by default. #5695 2016-07-19 10:17:30 +05:30
Rohit Waghchaure
03da40ba4c [Fix] Added batch in POS 2016-07-18 17:50:50 +05:30
Rushabh Mehta
5f9566f3af [fix] text field for sales, purchase invoice advance fixes #5773 2016-07-18 14:44:12 +05:30
Rushabh Mehta
76b134192f [fix] grid columns now restricted to 10 2016-07-18 14:30:27 +05:30
Nabin Hait
94105b04b8 Asset category mandatory validation while fetching item details 2016-07-16 11:20:50 +05:30
Saurabh
dcb41da02a [fix] for setting warehouse in account head 2016-07-16 11:17:43 +05:30
Nabin Hait
96376b2345 Trigger receive/paid amount on change of paid from/to 2016-07-16 11:00:29 +05:30
Nabin Hait
6831b9422b payment entry improvements and deletion of payment tool 2016-07-16 11:00:29 +05:30
Nabin Hait
4f5f8d7806 Set target exchange rate from source if currency is same 2016-07-16 10:59:48 +05:30
Rushabh Mehta
176b63b354 [fix] remove first row on mapping, fixes #5707 2016-07-14 17:43:48 +05:30
Rushabh Mehta
528e145a54 [docs] fixes #5697 2016-07-14 17:00:05 +05:30
Rushabh Mehta
8cfe18eccd [demo] help 2016-07-13 11:30:10 +05:30
Nabin Hait
cc2083ebd0 [fix] Advance payment adjustment in sales/purchase invoice 2016-07-11 16:12:18 +05:30
Rushabh Mehta
3ce24d64c2 [cleanup] payment entry form view 2016-07-11 16:08:46 +05:30
Rohit Waghchaure
3e012b7e16 [Fix] Time sheet rename issues 2016-07-11 15:00:38 +05:30
Rushabh Mehta
391c0efcee [fix] make grids editable 2016-07-11 13:01:58 +05:30
Rohit Waghchaure
89ee3091af [Fix] POS minor fixes. 2016-07-08 15:17:04 +05:30
Rushabh Mehta
408d2c5db3 Merge pull request #5683 from rohitwaghchaure/v7_pos_issue_and_enhancement 
[Fix] Access is pos from sales invoice form.
 2016-07-07 16:46:32 +05:30
Rohit Waghchaure
539e913b46 [Fix] Access is pos from sales invoice form. 2016-07-07 16:44:40 +05:30
Rushabh Mehta
964ad0fcae [cleanup] rename "links" to "dashboard" 2016-07-07 14:28:05 +05:30
Rohit Waghchaure
2b590fd804 [Fix] Pricing rule issue 2016-07-07 12:22:22 +05:30
Nabin Hait
6a66138764 Merge pull request #5675 from rohitwaghchaure/rename_time_sheet_doctype 
Rename Time Sheet doctype
 2016-07-07 10:38:55 +05:30
Nabin Hait
378f5c48e5 [fix] Test cases 2016-07-06 23:38:05 +05:30
Nabin Hait
c19691632e Button to make Depreciation Entry manually 2016-07-06 23:38:05 +05:30
Nabin Hait
e417000bbb Fetch Fixed Asset property from item in Sales / Purchase Invoice 2016-07-06 23:38:05 +05:30
Nabin Hait
cea353a638 Validate expected value after useful life 2016-07-06 23:38:05 +05:30
Nabin Hait
e3e1b80fcc Editable grid and query in asset category 2016-07-06 23:38:05 +05:30
Nabin Hait
b30acc7ddb Fixes in Account 2016-07-06 23:38:04 +05:30
Nabin Hait
668d090eed Fetch deatils from Item and Asset Category 2016-07-06 23:38:04 +05:30
Rohit Waghchaure
e94d18b4cd Rename Time Sheet doctype 2016-07-06 20:38:50 +05:30
Nabin Hait
70a1ddb6a1 Merge pull request #5671 from nabinhait/fixes90 
Multiple fixes
 2016-07-06 16:53:31 +05:30
Rohit Waghchaure
53bea82514 [Fixes] POS amount calculation issue 2016-07-06 16:15:10 +05:30
Nabin Hait
4671038211 Item Name added in Stock Reconciliation 2016-07-06 16:05:15 +05:30
Saurabh
c03a3bf580 [minor][fix] fix base_grand_total 2016-07-05 15:58:14 +05:30
Saurabh
066ae8e4c4 [fix] make cheque print compatible with payment entry 2016-07-05 12:46:38 +05:30
Nabin Hait
f6a0d789d0 Payment entry fixes 2016-07-04 17:26:02 +05:30
Nabin Hait
e4bbb696ab Payment Entry minor improvements 2016-07-04 17:26:02 +05:30
Nabin Hait
ff2f3ef1b1 Test Case Fixes 2016-07-04 11:42:25 +05:30
Nabin Hait
e196190d10 minor fix 2016-07-04 11:42:25 +05:30
Nabin Hait
56548cbfa2 Payment against negative invoice, negative outstanding allocation and much more 2016-07-04 11:42:25 +05:30
Nabin Hait
9db1b223da Payment Entry: Test cases and default remarks 2016-07-04 11:42:24 +05:30
Nabin Hait
13093b4b68 Make payment entry aginst order, payment request and patch to rename advance table fields 2016-07-04 11:42:24 +05:30
Nabin Hait
05aefbbf5d Payment Entry from invoice 2016-07-04 11:42:24 +05:30
Nabin Hait
221fa98b51 Payment Entry: Payment period based on invoice date 2016-07-04 11:42:24 +05:30
Nabin Hait
16d6959d01 Payment Entry included in Bank Reconciliation and related reports 2016-07-04 11:42:24 +05:30
Nabin Hait
1991c7b17d Payment Reconciliation changes for Payment Entry 2016-07-04 11:42:24 +05:30
Nabin Hait
28a0528ae4 Advance Payment Entry adjustment against Invoice 2016-07-04 11:42:04 +05:30
Nabin Hait
e3a10170f7 Payment Entry submission and more 2016-07-04 11:41:24 +05:30
Nabin Hait
12e2a51519 [new][feature] Payment Entry 2016-07-04 11:41:24 +05:30
Rushabh Mehta
2be94f7675 Merge pull request #5615 from rohitwaghchaure/v7_rfq_fixes 
[RFQ Enhancement] Added button on supplier row to download PDF for particular supplier
 2016-07-04 10:58:33 +05:30
Rohit Waghchaure
ad884b9fa9 [Fixes] Time sheet dependency removed from sales invoice and patch fixes 2016-07-02 22:28:29 +05:30
Rohit Waghchaure
fc1fa9a774 [RFQ Enhancement] Added button on supplier row to download PDF for particular supplier 2016-07-01 14:53:11 +05:30
Saurabh
621247807a [fix] BOM tree as default view 2016-06-30 15:05:06 +05:30
Rushabh Mehta
a11839307f Merge pull request #5553 from saurabh6790/pos_fixes 
[minor][fix] throw if payment modes are not set
 2016-06-29 21:56:20 +05:30
Rohit Waghchaure
3fa0b51e5e [Fixes] Time sheet fixes and changed timesheets to time_logs 2016-06-29 19:04:16 +05:30
Rushabh Mehta
da43539c53 Merge pull request #5558 from saurabh6790/doc_flow_fix 
[minor][fix] fix filter in previous link mapper
 2016-06-29 12:19:54 +05:30
Saurabh
52c2affc9c [fix] check for parent account with type stock in patch if not exists get parent account from existing warehouse accounts 2016-06-28 14:41:48 +05:30
Saurabh
9a6c6663c1 [minor][fix] throw if payment modes are not set 2016-06-27 18:16:07 +05:30
Saurabh
82b8b38b3d [fix] fix filter in previous link mapper 2016-06-27 17:51:29 +05:30
Rushabh Mehta
d362b734a2 Merge pull request #5529 from saurabh6790/module_flow 
[fix] previous document links
 2016-06-27 17:23:46 +05:30
Saurabh
93d68ac0c2 [fixes] change is group to check box 2016-06-27 17:16:56 +05:30
Saurabh
99892c7ce7 [fix] provision to convert group to ledger and vice versa 2016-06-27 17:16:56 +05:30
Rohit Waghchaure
d6c986da8f [Enhancement] Time log wages and multiple active salary structure 2016-06-27 16:46:39 +05:30
Saurabh
b6d6b8420d [fix] add filters and child doc name in previous link mapper 2016-06-27 14:48:26 +05:30
Saurabh
2a0b111726 [fix] mark completed docuemts on document flow 2016-06-27 12:28:55 +05:30
Saurabh
8f24ecb173 [fix] set previous doc links for document flow 2016-06-27 12:28:55 +05:30
Saurabh
78333c7e07 [fixes] check group condition 2016-06-26 14:27:46 +05:30
Saurabh
7fecb50360 [enhance] rename warehouse account type to stock 2016-06-26 14:27:46 +05:30
Rushabh Mehta
723cd64249 [fix] tree view hooks and patch fix 2016-06-25 18:30:03 +05:30
Nabin Hait
7b6cdf4a63 Merge pull request #5518 from saurabh6790/warehouse_tree 
Warehouse tree
 2016-06-25 13:49:15 +05:30
Saurabh
dc2fa86222 [fixes] rename ctype to doctype 2016-06-25 11:16:55 +05:30
Saurabh
3a0f96bd00 [patch] patch to move all warehouses under all warehouse group 2016-06-25 11:06:14 +05:30
Saurabh
4d02949814 [fixes] validate trash condition for warehouse and related account, move existing warehouses under all warehouse group, set account parent and is group for warehouse account 2016-06-25 11:06:14 +05:30
Saurabh
ec8babe7ac [minor][fix] 2016-06-25 11:06:14 +05:30
Saurabh
1702273968 [fix] rename account browser and sales browser to tree/doctype for view 2016-06-25 11:06:14 +05:30
Saurabh
ac53357f53 [fixes] renamed _treeview to _tree 2016-06-25 11:06:14 +05:30
Saurabh
a9ba7343c4 [fix] deprecate browser pages for accounts, cost_center, sales , bom, item group 2016-06-25 11:06:14 +05:30
Saurabh
554f6f70aa [fixes] nested set fix for warehouse, tree for accounts and cost center 2016-06-25 11:06:13 +05:30
Saurabh
0e47bfeb16 [enhance] treeview to BOM, sales person, Cost Center and Chart of acounts 2016-06-25 11:06:13 +05:30
Saurabh
777f556b14 [fixes] set default values to cheque print and set background image only if attachment exist 2016-06-23 20:25:37 +05:30
Nabin Hait
a531ebea8a Merge branch 'master' into develop 2016-06-21 16:44:05 +05:30
Rohit Waghchaure
c65c38d293 [POS] Minor fixes 2016-06-16 11:49:37 +05:30
Rushabh Mehta
2cb7a9f235 [ux] taxes table editable 2016-06-15 16:45:03 +05:30
Rohit Waghchaure
9fe40d557f [POS] Enhancement to set default payment as cash, functionality to clear amount value, renamed doctype Payments and some fixes. 2016-06-14 01:11:09 +05:30
Rushabh Mehta
e0686b32f3 [minor] cleanups 2016-06-10 12:38:52 +05:30
Rohit Waghchaure
28c02fe51d [Fix] POS page loading issue, if system has only one item 2016-06-10 00:48:03 +05:30
Anand Doshi
51ad436e16 [fix] sales and accounts browser name 2016-06-09 19:37:35 +05:30
Rushabh Mehta
cb29d9886c [minor] fixes #5252 2016-06-08 17:31:11 +05:30
Rushabh Mehta
6e837599b1 [minor] added cost center to item wise sales register, fixes #5301 2016-06-08 16:35:10 +05:30
Anand Doshi
16e2442278 [cleanup] document flow 2016-06-07 18:55:23 +05:30
Saurabh
7d0e78d399 [fixes] this.frm instead of cur_frm 2016-06-07 17:19:36 +05:30
Saurabh
9df3d0fb8a [enhance] show module flow on top of document 2016-06-07 17:19:36 +05:30
Rohit Waghchaure
690a0805f6 [Fixes] Purchase register, showing wrong value for total amount if tax has deducted. 2016-06-07 10:46:59 +05:30
Rushabh Mehta
eb1e0673e2 Merge pull request #5354 from saurabh6790/cheque_print 
Cheque print
 2016-06-02 17:48:58 +05:30
Rushabh Mehta
c5c0d96064 Merge pull request #5395 from saurabh6790/payment_request_ux 
[enhance] ux fixes for payment request, added jinja for payment reque…
 2016-06-02 17:48:36 +05:30
Nabin Hait
8e4ec8d84a Merge pull request #5416 from nabinhait/tax_rule_based_on_county 
Tax Rule based on County
 2016-06-01 13:09:53 +05:30
Nabin Hait
cc07148336 Merge pull request #5428 from ShashaQin/patch-21 
Update fiscal_year.py
 2016-06-01 12:58:13 +05:30
Nabin Hait
9a5cf6000e [fix] Test cases and editable fields settings for request for quotation 2016-06-01 12:54:26 +05:30
Nabin Hait
4eaeda710d Tax Rule based on County 2016-06-01 12:54:26 +05:30
Rushabh Mehta
aa60fd9037 [fix] new_doc to frappe.new_doc 2016-06-01 11:46:33 +05:30
ShashaQin
5dd72fe196 Update fiscal_year.py 2016-06-01 11:39:53 +08:00
Nabin Hait
919b1b9d5b Merge pull request #5408 from neilLasrado/hotfix-2 
Fixed error in Gross Profit report
 2016-05-31 17:41:19 +05:30
Nabin Hait
7ab088ed3f Merge pull request #5414 from nabinhait/journal_entry_ux 
Fetch party info in Journal Entry on selection of reference Invoice
 2016-05-31 17:38:22 +05:30
Nabin Hait
6a110331e8 Merge pull request #5415 from nabinhait/company_permissions_fix 
Ignore permissions for account/warehouse creation from Company
 2016-05-31 17:38:08 +05:30
Nabin Hait
bb502f8588 Merge pull request #5417 from nabinhait/grid_editable_fields 
[fix] Enabled editable fields in Budget
 2016-05-31 17:37:36 +05:30
shreyas
2bb845e53f [Fix] User allowed to delete the root account in Chart of Accounts 2016-05-31 17:15:28 +05:30
Rushabh Mehta
0dcb861b56 [minor] 2016-05-31 07:22:51 +05:30
Nabin Hait
37c53f0a04 [fix] Enabled editable fields in Budget 2016-05-30 18:20:31 +05:30
Nabin Hait
f169e5c04d Ignore permissions for account/warehouse creation from Company 2016-05-30 12:15:36 +05:30
Nabin Hait
9fdd37e1ad Fetch party info in Journal Entry on selection of reference Invoice 2016-05-30 11:49:16 +05:30
Neil Trini Lasrado
efccb8a704 Fixed error in Gross Profit report 2016-05-27 13:24:02 +05:30
Nabin Hait
0014aa9c26 [fix] Charts in report 2016-05-27 12:21:36 +05:30
Nabin Hait
591a5aba56 Added Project in GL Entry and General Ledger report 2016-05-26 17:51:20 +05:30
Nabin Hait
b46d021f2a Charts on reports / activity page, deprecated financial analytics report 2016-05-26 15:26:01 +05:30
Nabin Hait
44c1b8e63b Line/Bar chart in Balance Sheet / Profit and Loss statement 2016-05-26 15:26:01 +05:30
Nabin Hait
28bdff5a55 Pie chart for ageing analysis in accounts receivale/payable 2016-05-26 15:26:01 +05:30
Rohit Waghchaure
f2aa1764cc [POS] enhancement and minor fixes 2016-05-25 15:04:46 +05:30
Saurabh
ed0816832d [enhance] ux fixes for payment request, added jinja for payment request message 2016-05-25 11:55:30 +05:30
Rushabh Mehta
1885645d6d [fix] [patch] 2016-05-24 16:10:21 +05:30
Saurabh
81501ddc6d [fixes] add setting to mark cheque account pay only 2016-05-24 10:28:14 +05:30
Saurabh
2fc0ffad34 [fixes] js templating to get cheque print view 2016-05-24 10:28:14 +05:30
Saurabh
9ca9f2d551 [Fixes] UX fixes 2016-05-24 10:28:14 +05:30
Saurabh
bb95d36218 [fixes] field re-structuring 2016-05-24 10:28:14 +05:30
Saurabh
1b62ecea44 [enhancement] cheque print 2016-05-24 10:28:14 +05:30
Nabin Hait
79ddf67289 Merge pull request #5362 from nabinhait/budget 
Budgeting
 2016-05-23 17:56:42 +05:30
Nabin Hait
8f70370457 Chart of accounts fixed for Spain 2016-05-23 17:41:51 +05:30
Nabin Hait
03b08e7a91 [fix] Period closing voucher 2016-05-23 16:28:39 +05:30
Nabin Hait
832988e2fd test case fixed 2016-05-23 13:04:26 +05:30
Nabin Hait
ca90963d5b Redesigned budgets 2016-05-23 13:04:26 +05:30
Nabin Hait
b9bc7d6df3 [feature] New document for Budget 2016-05-23 13:04:26 +05:30
Rushabh Mehta
d0cee1b61b [fix] minor fixes to pos 2016-05-20 12:54:59 +05:30
Rushabh Mehta
40b3a5bcc4 [optimize] communication query for heatmap 2016-05-20 12:54:59 +05:30
Nabin Hait
563bd056d7 Merge branch 'master' into develop 2016-05-20 12:18:28 +05:30
Nabin Hait
3956c94bbb Merge pull request #5340 from rohitwaghchaure/support_week_new 
[Fix] Sales Invoice shows default date while no default mentioned
 2016-05-20 12:06:22 +05:30
Nabin Hait
5dfcfc5606 Merge pull request #5366 from saurabh6790/set_default_bank_acc_in_bank_reco 
[fixes] set default bank account in bank reconciliation statement report
 2016-05-20 11:36:44 +05:30
Rushabh Mehta
532eedf411 [enhance] more editable grids 2016-05-19 18:22:49 +05:30
Rohit Waghchaure
d818bcd888 [Fixes] tax rule, tax rule working even if tax template inside the rule is disabled. 2016-05-19 16:53:01 +05:30
Saurabh
c0c8af06da [fixes] set default bank account in bank reconciliation statement report 2016-05-19 12:32:08 +05:30
Nabin Hait
1daebc04d0 Merge pull request #5360 from neilLasrado/hotfix 
Fixed reports
 2016-05-18 10:39:19 +05:30
Neil Trini Lasrado
4668a69cf5 Fixed reports 2016-05-17 19:04:08 +05:30
Rohit Waghchaure
5d97d89a03 [Fix] Sales Invoice shows default date while no default mentioned 2016-05-17 15:13:17 +05:30
Nabin Hait
a09285122f Added root type for Income. Fixes #5356 2016-05-17 10:37:31 +05:30
Rushabh Mehta
72615977d7 Merge pull request #5337 from rohitwaghchaure/pos 
[WIP] [POS] Some changes and fixes
 2016-05-16 12:06:42 +05:30
Rohit Waghchaure
e0934d118f [Fixes] Some changes and fixes 2016-05-16 12:01:16 +05:30
Nabin Hait
665568d87e ignore permissions while creating records from charts builder portal 2016-05-13 15:56:11 +05:30
Nabin Hait
a21f49dd94 Tax rate in chart of accounts 2016-05-13 15:56:11 +05:30
Nabin Hait
e4670a9a45 Cleaned up chart of accounts 2016-05-13 15:56:11 +05:30
Nabin Hait
825070e504 Merge pull request #5331 from nabinhait/multi-fix-55 
Multiple fixes
 2016-05-12 12:27:42 +05:30
Anand Doshi
19fec06366 [fix] Validate Company in Account autoname 2016-05-11 13:27:18 +05:30
Nabin Hait
b81ed45b2b fixed conflict 2016-05-11 12:52:31 +05:30
Nabin Hait
b3a0e05bae included path fixed in report print formats 2016-05-11 12:38:11 +05:30
Nabin Hait
a1ec7f1eed Add root account 2016-05-11 12:38:11 +05:30
Nabin Hait
3323d06be0 Mode of Payment columns and filters added in sales/purchase register 2016-05-10 13:17:02 +05:30
Rohit Waghchaure
6087fe178e [Enhancement] POS 2016-05-09 23:36:15 +05:30
Nabin Hait
332d29f166 Merge branch 'master' into develop 2016-05-06 16:13:35 +05:30
shreyas
c2a49211a5 [Fix] Payment Tool, Fetch due date when user does 'Get Outstanding Vouchers' 2016-05-05 15:56:48 +05:30
shreyas
622fe3f1e3 [Fix] Fetch due date for Sales/Purchase invoice in payment tool 2016-05-05 15:11:04 +05:30
Rushabh Mehta
c711b82889 Merge pull request #5296 from KanchanChauhan/websitemakeover 
New look to the website
 2016-05-02 15:54:41 +05:30
Nabin Hait
863cb12426 minor fix 2016-05-02 13:48:27 +05:30
Kanchan Chauhan
239b351367 New look to the website 2016-05-02 11:43:44 +05:30
Nabin Hait
b78adcf279 Merge branch 'master' into develop 2016-04-29 18:26:46 +05:30
Neil Trini Lasrado
c33b5b74c6 Itemwise purchase and Itemwise sales 2016-04-29 18:21:51 +05:30
Rushabh Mehta
be2ee18de4 [fixed] frappe.require is now async 💥 2016-04-29 17:22:42 +05:30
Nabin Hait
6146cc1e33 Merge branch 'master' into develop 2016-04-29 11:44:55 +05:30
Nabin Hait
48577c15a2 Show all scheduled depreciation in dotted line 2016-04-28 18:12:41 +05:30
Nabin Hait
70f05df075 Asset Movement 2016-04-28 18:01:32 +05:30
Nabin Hait
ce35c56cd3 Added line graph in asset dashboard 2016-04-28 18:01:32 +05:30
Nabin Hait
92426f5e56 Added Image field in Asset 2016-04-28 18:01:32 +05:30
Nabin Hait
314246939f [report][fix] Item-wise tax calculation if item appears multiple times in the same invoice 2016-04-28 17:32:36 +05:30
Nabin Hait
b7b7f0062d [report][fix] Consider taxes only the tax contributed in invoice total 2016-04-28 17:31:27 +05:30
Anand Doshi
79c536acb5 Merge branch 'master' into develop 2016-04-27 15:44:11 +05:30
Anand Doshi
b5e700f3af Merge pull request #5248 from saurabh6790/hotfix 
[fixes] raise exception on deletion of fiscal year if fiscal year is set as Default
 2016-04-27 14:25:58 +05:30
Neil Trini Lasrado
4c95ed49ed Fixed Currency Symbol in Trial Balance and Trial Balance for Party reports 2016-04-27 13:09:17 +05:30
Saurabh
9be40ee7c3 [fixes] raise exception while deleting fiscal year if fiscal year is set as default in Global Settings and while calculating get_month_details if year_start_date not found 2016-04-27 12:58:40 +05:30
Anand Doshi
c6479bcbb6 Merge pull request #5264 from neilLasrado/hotfix 
Fixed Currency Symbol in Trial Balance and Trial Balance for Party re…
 2016-04-27 12:32:05 +05:30
Neil Trini Lasrado
b93d525c96 Fixed Currency Symbol in Trial Balance and Trial Balance for Party reports 2016-04-25 17:18:52 +05:30
Rushabh Mehta
621283c5c5 [enhancement] stock balance page 2016-04-21 19:00:34 +05:30
Rushabh Mehta
202cb7cdf1 Merge pull request #5249 from nabinhait/fixed_asset 
Fixed asset
 2016-04-21 11:41:11 +05:30
Nabin Hait
595d3c03ef updated docs for fixed asset 2016-04-20 18:17:05 +05:30
Nabin Hait
85a2776e91 Depreciation Schedule considering already booked depreciations for existing asset and testcases 2016-04-20 17:57:12 +05:30
Nabin Hait
318fa287df [report] Asset Depreciations and Balances 2016-04-20 17:57:12 +05:30
Nabin Hait
e58c26edca [report] Added asset depreciation ledger report 2016-04-20 17:57:12 +05:30
Nabin Hait
cd0e8ce8ad Fixes and modification in fixed asset 2016-04-20 17:57:12 +05:30
Nabin Hait
3d9c5c0c20 Fixed Asset module cleanup and fixes 2016-04-20 17:57:11 +05:30
Kanchan Chauhan
11638ba358 Changes 3 2016-04-20 16:24:25 +05:30
Kanchan Chauhan
704f248952 Changes 2 2016-04-20 16:24:24 +05:30
Rushabh Mehta
0525387328 [enhancement] added reserved_qty_for_production in bin and updated item dashboard 2016-04-18 19:27:46 +05:30
Nabin Hait
c46c1f0288 [fix] Rejected serial nos in purchase invoice 2016-04-18 17:46:36 +05:30
Nabin Hait
14aa9c5320 [fix] Cleanup and fixes in update stock feature in Purchase Invoice 2016-04-18 16:59:47 +05:30
Saurabh
7fee1b8343 [fixes] set expence account to item on sales invoice 2016-04-18 15:58:43 +05:30
Saurabh
224737b9ed [fixes] split make gl entry function into chuncks as per SI 2016-04-18 15:58:43 +05:30
Saurabh
fbb342c1ac [enhancement] update landed cost on PI via landed cost voucher when update stock is set on PI 2016-04-18 15:58:43 +05:30
Saurabh
130c57b201 [fixes] code clean-up 2016-04-18 15:58:43 +05:30
Saurabh
e29248bcb3 [fixes] test-case to validate quantity after update stock and purchase return and code-cleaning 2016-04-18 15:58:43 +05:30
Saurabh
d697f3d6a3 [minor][fix] reset is_paid if company not selected 2016-04-18 15:58:42 +05:30
Saurabh
43520f93a1 [fixes] test cases, code cleanup. 2016-04-18 15:58:42 +05:30
Saurabh
2a0e2fe95c [test-case] test update stock and payment 2016-04-18 15:57:56 +05:30
Saurabh
4bd34a58ba [fixes] fix perpetual inventory 2016-04-18 15:57:55 +05:30
Saurabh
bd5fc8ecbe [fixes] add posting time 2016-04-18 15:57:55 +05:30
jof2jc
c204775fe2 Added posting_time in purchase invoice 2016-04-18 15:57:55 +05:30
jof2jc
821f571640 added payments, make receipt field 2016-04-18 15:57:55 +05:30
jof2jc
524ebbcbb9 Added Make Receipt (Update Stock) and IsCash option on Purchase Invoice 2016-04-18 15:57:55 +05:30
Umair Sayyed
72534deea2 removed Is Sales Item and Is Purchase Item 2016-04-15 12:57:00 +05:30
Nabin Hait
bd07ea43e8 fixed conflict 2016-04-15 11:06:41 +05:30
Nabin Hait
972c25f78d Fixed conflict 2016-04-14 18:25:53 +05:30
Nabin Hait
e393c62086 [fix] Set debit / credit as per field precision 2016-04-14 18:15:42 +05:30
Rushabh Mehta
15a7f215b9 [enhancement] heatmaps on item and notifications for item 2016-04-14 17:30:53 +05:30
Umair Sayyed
6269f1e3d0 address and contact related fields re-arranged in the sales transactions fixes #5192 2016-04-14 13:07:41 +05:30
Rushabh Mehta
8c9c57c8f3 [minor] update party timestamp after transaction 2016-04-13 18:22:06 +05:30
Nabin Hait
c2ae1a7375 fixed merge conflict 2016-04-13 11:55:15 +05:30
Rushabh Mehta
8bbca6fa2e [enhancement] links menu in customer, supplier, item 2016-04-12 19:16:33 +05:30
Nabin Hait
471908ab9f Merge pull request #5194 from nabinhait/gross_profit_fix 
Gross profit fix
 2016-04-12 18:57:45 +05:30
Nabin Hait
8a686ba982 [fix] Prevent from directly creating payment request 2016-04-12 17:02:15 +05:30
Nabin Hait
f509d13d28 [fix] Get average selling rate based on group by 2016-04-12 17:01:39 +05:30
Rushabh Mehta
5d0e8dee11 [fix] dashboard for customer, supplier 2016-04-11 17:34:49 +05:30
Nabin Hait
3912a31a6f Merge pull request #5176 from nabinhait/ar_ap_print_currency 
Currency column in AR/AP and Sales/Purchase register report
 2016-04-11 17:13:04 +05:30
Nabin Hait
f945e10cce Currency column in AR/AP and sales/purchase register report 2016-04-11 11:56:57 +05:30
Rushabh Mehta
2dff9275f3 [test] fixed circular dependencies 2016-04-08 18:05:12 +05:30
Anand Doshi
2f957f27b0 [fix] apply Tax Rule for lead 2016-04-08 17:43:08 +05:30
Rushabh Mehta
f16f9c569b [enhancement] add status in customer, supplier 2016-04-08 17:21:00 +05:30
Rushabh Mehta
203cc962f5 [enhancement] Item Selector 2016-04-08 17:21:00 +05:30
Anand Doshi
79a415e3b8 [fix] Use for shopping cart validation in Tax Rule 2016-04-08 17:08:26 +05:30
Rushabh Mehta
78b7a53635 [cleanup] set default bold, print_hide for prints 2016-04-06 15:29:45 +05:30
Anand Doshi
a32b3ea3e8 Merge pull request #5115 from nabinhait/test_fix 
[fix] Test cases
 2016-04-04 17:43:02 +05:30
Nabin Hait
94360cca20 [fix] received and delivered items to be billed report based on percentage billed 2016-04-04 17:40:33 +05:30
Anand Doshi
f1b276122e Merge pull request #5117 from nabinhait/report_modified_change 
[fix] Modified date changed in query report due to project field renaming
 2016-04-04 17:04:14 +05:30
Anand Doshi
62be8dfd21 Merge pull request #5131 from shreyasp/creditnote-print-format 
[Fix] Correct amount shown in credit note print format
 2016-04-04 15:37:31 +05:30
shreyas
c6b47bcdda [Fix] Show amount in credit note print format 2016-04-04 15:13:03 +05:30
Anand Doshi
15f7b1ee1a [fix] POS paid amount validation using grand total 2016-04-04 15:03:28 +05:30
sudip
0e55417f81 Add User Remarks to Quick Entry Form in Journal Entry 2016-04-02 08:42:42 +05:45
Nabin Hait
4f10f15686 [fix] Modified date changed in query report due to project field renaming 2016-04-01 17:59:06 +05:30
Nabin Hait
adddf6f471 [fix] Test cases 2016-04-01 16:47:46 +05:30
Rushabh Mehta
8ca426d94a Merge pull request #5095 from rohitwaghchaure/new_rfq 
[Enhancement] Added currency symbol on RFQ form of supplier portal, currency validation for party
 2016-04-01 11:41:15 +05:30
Rushabh Mehta
fff8e6c733 Merge pull request #5080 from nabinhait/fy_overlap 
[fix] Added overlap validation in fiscal year
 2016-04-01 11:37:03 +05:30
rohitwaghchaure
62fea0374b [Enhancement] Added currency symbol on RFQ form of supplier portal, currency validation for party 2016-03-31 21:49:07 +05:30
Rushabh Mehta
45c6b550f0 [cleanup] assets and made items mandatory in transactions 2016-03-31 15:37:51 +05:30
Rushabh Mehta
acf28af19c [fix] set default depreciation accounts and test fix 2016-03-31 15:04:06 +05:30
Nabin Hait
2ed0b59747 [fix] Added overlap validation in fiscal year 2016-03-31 12:40:37 +05:30
Nabin Hait
91a58808c0 [fix] Allowed deletion of root account 2016-03-31 11:59:10 +05:30
Nabin Hait
684052e978 [fix] Permissions added in asset and asset category 2016-03-30 15:06:25 +05:30
Nabin Hait
7fcec4118b [fix] Test case 2016-03-30 15:06:25 +05:30
Rushabh Mehta
3fc6fdeba0 [cleanup] for quick-entry 2016-03-30 13:18:30 +05:30
Rushabh Mehta
652dee45a6 [minor] make margin collapsible 2016-03-29 16:42:13 +05:30
Rushabh Mehta
1d05ada5e9 Merge pull request #4950 from nabinhait/fixed_asset_depreciation 
Fixed asset depreciation
 2016-03-29 16:39:31 +05:30
Rushabh Mehta
22fe3a8b7e Merge pull request #5081 from nabinhait/trans_fix 
[fix] Translations
 2016-03-29 15:16:07 +05:30
Rushabh Mehta
b5aa50de06 [fix] select default company in chart of accounts 2016-03-29 14:41:20 +05:30
Nabin Hait
d9449e396f [fix] Translations 2016-03-29 13:22:31 +05:30
Rushabh Mehta
c9850f9e04 Merge pull request #5077 from frappe/master 
Master
 2016-03-29 11:59:32 +05:30
Nabin Hait
fb03b96992 fixed asset fixes 2016-03-29 11:54:38 +05:30
Nabin Hait
7de15321c9 [docs] Managing fixed assets 2016-03-29 11:54:38 +05:30
Nabin Hait
06a41aca13 fixed asset: related accounts added in default chart of accounts 2016-03-29 11:54:37 +05:30
Nabin Hait
7536349f17 Fixed asset: status, restore, testcase and much more 2016-03-29 11:54:37 +05:30
Nabin Hait
4d668dbaa3 [tests] creation of asset and asset category 2016-03-29 11:54:37 +05:30
Nabin Hait
4fdb05228d fixed asset depreciation 2016-03-29 11:54:37 +05:30
Nabin Hait
3a15c92c5e Fixed Asset Depreciation first commit 2016-03-29 11:54:37 +05:30
Rushabh Mehta
9904c5acf4 Merge pull request #5050 from neilLasrado/develop 
Fixes Translations
 2016-03-29 10:51:44 +05:30
Rushabh Mehta
e1b20a0b29 Merge pull request #5044 from rohitwaghchaure/add_margin_feature 
[Enhancement] Add margin in sales flow.
 2016-03-28 18:27:05 +05:30
rohitwaghchaure
a1064a6149 [enhancement] request for quotation 2016-03-28 17:28:45 +05:30
Neil Trini Lasrado
b176dea74e Fixed issues in Pricing Rule if multiple pricing rules existed with same priority 2016-03-28 13:23:47 +05:30
Neil Trini Lasrado
b6d9946854 Fixes Translations 2016-03-28 12:44:05 +05:30
Rushabh Mehta
c20c536f28 [fix] [wip] cleanup for collaborative pm 2016-03-25 17:22:17 +05:30
mbauskar
a52472cf5b [fixes] added fields in SI and DN, moved the margin calculation to to pricing_rule.py 2016-03-24 14:07:51 +05:30
mbauskar
c1331d0e8e [minor-fix] pricing rule test-case fix 2016-03-24 14:07:51 +05:30
mbauskar
75b6fbb6a7 [fix] apply pricing rule added type and rate on ignore pricing rule trigger 2016-03-24 14:07:50 +05:30
mbauskar
b6d19bcfc2 [fixes] minor fixes, added eval on pricing rule, Sales Order Item, Quotation Item 2016-03-24 14:07:50 +05:30
mbauskar
dcd8b7773d [fix] calculated rate on py side, added depends on for sales order item 2016-03-24 14:07:50 +05:30
mbauskar
5e76a1cffa [fix] added eval for total margin and margin rate field 2016-03-24 14:07:50 +05:30
mbauskar
ea60c635ab changed the description of rate fields depending on margin type and if ignore pricing is unchecked returned the rate=0 2016-03-24 14:07:48 +05:30
mbauskar
8c8fa17a9b [new fields] added Margin type (Percetage/Amount) and Rate field to capture Margin details in Pricing Rule, Sales Order Item, Quotation Item 2016-03-24 14:07:48 +05:30
Rushabh Mehta
b2269dd326 [fix] back links from project web view 2016-03-23 18:29:00 +05:30
Anand Doshi
a75fe1a4c3 Revert "[cleanup] PayPal payment UX and moved related methods to hooks of respective apps" 2016-03-23 11:59:24 +05:30
Rushabh Mehta
eec21d041c Merge pull request #5028 from anandpdoshi/paypal-cleanup 
[cleanup] PayPal payment UX and moved related methods to hooks of respective apps
 2016-03-23 11:50:46 +05:30
Rushabh Mehta
1e7ca6c77a Merge pull request #5023 from nabinhait/balance_sheet_opening 
[fix][balance sheet] Check if precious fiscal  year is closed
 2016-03-23 11:46:13 +05:30
Anand Doshi
71b90b7b7d [cleanup] PayPal payment UX and moved related methods to hooks of respective apps 2016-03-21 17:50:02 +05:30
Nabin Hait
c8baa01e9c [fix] Updated modified datetime 2016-03-21 17:20:03 +05:30
Nabin Hait
443a7c13e4 [fix][balance sheet] Check if previous fiscal year is closed 2016-03-21 14:38:32 +05:30
Nabin Hait
9a75530c26 [fix] reload doctype for renaming project 2016-03-18 16:19:25 +05:30
Nabin Hait
d6c59656e8 Merge pull request #5009 from saurabh6790/cart_fixes-1.0 
[fixes] return debtors account name
 2016-03-18 15:36:06 +05:30
Nabin Hait
5996b2f1bb [fix] recurring document logic 2016-03-18 15:19:54 +05:30
Saurabh
b43df36e85 [fixes] return debtors account name 2016-03-18 15:05:50 +05:30
rohitwaghchaure
90ff509f6d [fix]Earlier recurring billing 2016-03-18 10:44:53 +05:30
Umair Sayyed
8cbc076dc2 fixes in the Account Receivale print format - with Nabin 2016-03-17 15:12:31 +05:30
Nabin Hait
6221117069 [fix] shipping address position in document 2016-03-16 16:23:30 +05:30
Saurabh
14d646f636 [fixes] shipping address on purchase flow 2016-03-16 16:23:30 +05:30
Neil Trini Lasrado
f433a5a124 Fixed bug while selecting project in sales_invoice, sales_order, delivery_note 2016-03-16 16:00:27 +05:30
Neil Trini Lasrado
6e343e23d9 Renamed project_name to project 2016-03-15 17:50:53 +05:30
Nabin Hait
f853a92676 Fixes in AR/AP Print Format 2016-03-15 16:10:15 +05:30
Nabin Hait
89301863e5 minot fixes 2016-03-15 15:20:49 +05:30
rohitwaghchaure
c54b805981 [fixes]Unable set recurring date in sales order 2016-03-14 19:03:22 +05:30
Saurabh
c54619570a [fixes] check party_account_currency while creating Pull Request from Sales Invoice 2016-03-14 15:55:23 +05:30
Saurabh
9f94266892 [fixes] fetch value from grand total field while creating payment request from si 2016-03-14 11:23:03 +05:30
Anand Doshi
c75c1d7e3e [fix] additional fixes after deprecating Fiscal Year 2016-03-11 14:56:19 +05:30
Valmik Jangla
063946a02f Removed from Purchase Invoice and Purchase Reciept 2016-03-11 13:07:48 +05:30
Valmik Jangla
d89dcf60e6 Removed from Delivery Note and Appraisal 
Added back in Stock Ledger Entry
Added validation in GL Entry and SL Entry
Stock Controller sets Fiscal Year using Posting Date
 2016-03-11 13:07:48 +05:30
Valmik Jangla
d4ac3d8ceb Removed from Stock Ledger Entry and Sales Invoice 2016-03-11 13:07:48 +05:30
Valmik Jangla
cd9daf6671 Removed from Journal Entry and Stock Reconciliation 2016-03-11 13:07:16 +05:30
Valmik Jangla
c7e774fda9 BudgetError Fix 2016-03-11 13:05:20 +05:30
Valmik Jangla
865d547965 Removed from GL Entry, Opportunity and Quotation 2016-03-11 13:05:20 +05:30
Valmik Jangla
bc60970fcb Removed from Maitenance Visit and Warranty Claim 2016-03-11 13:05:19 +05:30
Valmik Jangla
57b69cecbf Removed from C-Form 2016-03-11 13:05:19 +05:30
Valmik Jangla
c4c603dcd2 Removed from Expense Claim 2016-03-11 13:05:19 +05:30
shreyas
6c89bb1900 [Minor] Moved company field to top of the form, making it more consistent other doctypes 2016-03-11 12:12:30 +05:30
Anand Doshi
f0e16e68c5 Merge pull request #4962 from nabinhait/trial_balance_fix 
[fix] Trial Balance report, showing rows with zero values
 2016-03-10 12:24:24 +05:30
Nabin Hait
3883e86ad7 [fix] Trial Balance report, showing rows with zero values 2016-03-10 12:01:01 +05:30
Nabin Hait
dd8dbe000b [fix] Rearranged position of mode_of_payment in sales invoice 2016-03-10 10:58:31 +05:30
Anand Doshi
065d24b26d Merge pull request #4951 from shreyasp/gross-profit-wn-sup17486 
[Minor] Remove Warehouse column while user groups by 'Item code' in Gross profit report
 2016-03-09 14:22:16 +05:30
shreyas
7c42995949 [Minor] Remove Warehouse column while user groups by 'Item code' in Gross profit report 2016-03-09 13:15:38 +05:30
Nabin Hait
acb28954ff [fix][report] Show group rows with zero values if there are values against children 2016-03-04 12:32:44 +05:30
Rushabh Mehta
0c1b8f4334 [fix] [minor] autoload chart of accounts 2016-03-03 16:47:36 +05:30
Rushabh Mehta
1396b776bc [fix] print hide for submit_on_creation 2016-03-03 13:57:15 +05:30
Rushabh Mehta
7114b7786e [fix] print hide for submit_on_create 2016-03-03 13:12:21 +05:30
Rushabh Mehta
5839a8d7f0 [fixes] usability cleanup of recurring document and added explicit submit_on_creation 2016-03-02 17:51:52 +05:30
Rushabh Mehta
aac4dcedc8 [fix] print language and contact_email fields and removed translations 2016-03-02 15:45:09 +05:30
Rushabh Mehta
b0f0aaf5b1 [minor] added chart of accounts, cost centers buttons on Company 2016-03-02 13:08:40 +05:30
Rushabh Mehta
cbed331047 Merge pull request #4909 from rohitwaghchaure/multilingual_print_format_test 
Multilingual print format test
 2016-03-01 17:10:50 +05:30
rohitwaghchaure
4151e3dc92 [enhancement] Multi-lingual print format 2016-03-01 16:33:08 +05:30
Rushabh Mehta
39a6f804bf Merge pull request #4871 from ShashaQin/patch-27 
Improvements about recurring documents
 2016-03-01 16:06:33 +05:30
Rushabh Mehta
ddeb576d52 Merge pull request #4849 from rasos/patch-1 
Create at_austria_chart_Einheitskontenrahmen.json
 2016-03-01 16:05:13 +05:30
Nabin Hait
bdf0f0a08d [fix] Show debit note button in purchase invoice 2016-02-26 16:26:28 +05:30
Nabin Hait
0f6eac3b35 [fix] Show credit note button in sales invoice 2016-02-26 13:01:32 +05:30
Nabin Hait
55f0834e99 [fix] Show payment button in purchase invoice 2016-02-25 19:12:37 +05:30
ShashaQin
ae629ad29f Update purchase_invoice.json 2016-02-25 11:17:13 +08:00
ShashaQin
02a38e8b5e Update sales_invoice.json 
Add 'Notify by Email' check box and set next_date can be changed by user
 2016-02-25 11:13:19 +08:00
Saurabh
00212a23e1 [fixes] removed base_grand_total from payment request 2016-02-24 16:50:19 +05:30
Saurabh
6d1dbd6384 [fixes] currency exchange rate and payment gateway account fixes for multicurrency 2016-02-24 15:07:26 +05:30
Saurabh
4a6bbf9b72 [fixes] added filters company and currency to get account, removed account name wise comparison 2016-02-24 15:07:26 +05:30
Saurabh
f54be2c7f0 [fixes] test case fixes for multi-currency check 2016-02-24 15:07:25 +05:30
Saurabh
1864879b91 [fixes] fix grand total calculation for Payment Request and set visibility of Resend Payment Email button 2016-02-24 15:07:25 +05:30
Saurabh
3a2682919a [enhance] set customer payable account to new customer as per payment gateway account currency via cart if cart and checkout is enable 2016-02-24 15:07:25 +05:30
Saurabh
2dc2d671da [clean-up] 2016-02-24 15:07:25 +05:30
Saurabh
7d5b47e113 [fixes] minor fix in test-case 2016-02-24 15:07:25 +05:30
Saurabh
fa32588e72 [fixes] minor fix in test-case 2016-02-24 15:07:25 +05:30
Saurabh
1e800a9ef0 [fixes] multi-currency via payment request 2016-02-24 15:07:25 +05:30
Saurabh
da9e9cdb13 [fixes] minor get_payment_gateway_account 2016-02-24 15:07:24 +05:30
Saurabh
dca6302e15 [fixes] field renaming, cart checkout fixes, JE fixes for multi-currency payment 2016-02-24 15:07:24 +05:30
Saurabh
883cc04701 [fixes] compare attributes in lower case 2016-02-24 15:07:24 +05:30
Anand Doshi
acd1bcffde [fix] changed field type to Code 2016-02-24 12:38:08 +05:30
Nabin Hait
d2d261dc87 Merge pull request #4854 from patilsangram/develop 
Removed Stop Button from SO and PO
 2016-02-24 11:21:17 +05:30
patilsangram
a812d67837 [fixes] 2016-02-23 19:04:29 +05:30
saurabh
8e49951821 fetch customer or supplier language and set on sales and purchase flow's form 2016-02-23 02:17:03 +05:30
saurabh
65820ed013 added new field language for users 2016-02-23 02:17:03 +05:30
patilsangram
bf2b511988 [Removed Stop Button from SO and PO] 2016-02-22 16:24:23 +05:30
Nabin Hait
db746f5bc7 [fix] Condition for Payment and Return button visibility 2016-02-22 16:17:10 +05:30
Roland
ed2849adf9 Create at_austria_chart_Einheitskontenrahmen.json 
Austrian Chart of Accounts compiled by fairkom.eu from various sources, among them the official "Österreichishcer Kontenrahmen" published by ÖPWZ - Fachsenat für Betriebswirtschaft und Organisation der Kammer der Wirtschaftstreuhänder Version May 2014. Numbering scheme has been slightly adapted to fit best with ERPnext setup of a company, where the most important accounts are automatically assigned. When using this chart of accounts, feel free to reduce / adapt the accounts - it is not legally binding.
 2016-02-22 09:26:54 +01:00
Anand Doshi
52780cb937 Merge pull request #4841 from nabinhait/escape 
[fix] Escaping strings with percentage
 2016-02-19 13:01:00 +05:30
Nabin Hait
1a99cb8bfe [fix] Escaping strings with percentage 2016-02-19 12:45:57 +05:30
Nabin Hait
fb24a27201 [fix] GLE for Rounding loss allowed upto 1 for all transactions except JE 2016-02-18 19:18:07 +05:30
Anand Doshi
828d5ffaab [fix] Show Debit/Credit in Bank Reconciliation table 2016-02-17 18:31:58 +05:30
Anand Doshi
620252cadb [fix] validate Fiscal Year in Trial Balance 2016-02-15 12:03:04 +05:30
Rushabh Mehta
6f574cd60f [minor] do not commit pay-to-recd from in journal entry 2016-02-11 14:27:28 +05:30
Nabin Hait
7e02831897 [fix] Test case fixed 2016-02-10 15:54:52 +05:30
Nabin Hait
e1f6e60cea [fix] Payment Request Fixes 2016-02-10 13:07:42 +05:30
Rushabh Mehta
7f3983a3d6 Merge pull request #4769 from rmehta/pricing-rule-on-variant 
[fix] pricing rule for variant, if rule for template available, use it
 2016-02-09 11:20:00 +05:30
Rushabh Mehta
faf9b589c4 [fix] pricing rule for variant, if rule for template available, use it 2016-02-08 18:49:27 +05:30
Nabin Hait
4c6af87ad0 [fix] Read permission to All for permlevel 1 fields 2016-02-08 16:56:19 +05:30
Anand Doshi
17d4fc4fa7 [enhancement] Merge Comment and Feed into Communication 💥 
Depends on frappe/frappe#1532
 2016-02-08 13:06:56 +05:30
Nabin Hait
2b8472fe54 Merge pull request #4744 from ccfiel/develop 
undo bank recon.
 2016-02-08 10:45:55 +05:30
Chris Ian Fiel
af667f77e6 Update bank_reconciliation.py 
set to null if clearance_date is blank because if not it will set it just 0000-00-00.
 2016-02-04 22:10:36 +08:00
ShashaQin
bcc56a4557 Update gross_profit.py 
Gross Profit report improvement
 2016-02-04 11:45:00 +08:00
Nabin Hait
bd7f48cfd4 [report] Financial Statements: Accumulated periodic balance based on filters 2016-02-02 19:05:43 +05:30
ShashaQin
cc6ce5beac Update financial_statements.py 2016-02-02 19:05:42 +05:30
ShashaQin
15d7224335 Update balance_sheet.py 2016-02-02 19:05:42 +05:30
ShashaQin
1f51e71827 Update profit_and_loss_statement.py 2016-02-02 19:05:42 +05:30
Nabin Hait
d5fda57297 [fix] Ignore permissions and made Customer warehouse field hidden in selling cycle 2016-02-01 15:55:09 +05:30
Anand Doshi
7c0a58ac3f [fix] show formatted currency value in advance paid validation 2016-01-29 12:16:24 +05:30
Nabin Hait
b2206d1155 [fix] Multi currency advance payment against Order 2016-01-27 15:43:24 +05:30
shreyas
eba9ca4d66 [Minor]Change to maintain args ordering convention 2016-01-26 16:29:26 +05:30
shreyas
79872bf62c [Refactor]Changed variable name to avoid conflict between args and local variable 2016-01-26 13:57:06 +05:30
shreyas
c8ac3b042b [Minor]Refactored code for better readability 2016-01-26 13:23:38 +05:30
shreyas
f76853a8d9 [Minor]Changed CustomerDisabled and CustomerFrozen to PartyDisabled and PartyFrozen 2016-01-25 21:25:11 +05:30
shreyas
323dc96c99 [Travis] Fixed reference failure in party.py 2016-01-25 18:19:14 +05:30
shreyas
29b565fdf5 Added Disabled field to Supplier and Customer doctype 
Frozen field is moved to More Information section for Customer and Supplier. Any Supplier/Customer which is disabled will not be shown while creating PO/SO
 2016-01-25 18:19:13 +05:30
Anand Doshi
2ea5c6913d Merge pull request #4685 from shreyasp/supplier-credit-fix 
Added the credit_days_based_on field to Supplier and Supplier Type doctype
 2016-01-25 17:58:21 +05:30
Anand Doshi
5dcb40bc96 Merge pull request #4687 from anandpdoshi/fix/recurring-docs-no-copy 
[fix] obey no_copy while creating recurring documents
 2016-01-25 17:27:04 +05:30
Anand Doshi
c07489a096 [fix] Journal Entry: init debit/credit in account currency 2016-01-25 17:23:36 +05:30
Anand Doshi
39e2c2bb09 [fix] obey no_copy while creating recurring documents 2016-01-25 17:03:50 +05:30
shreyas
28a6578ba2 Added the credit_days_based_on field to Supplier and Supplier Type doctype 2016-01-25 12:44:14 +05:30
Nabin Hait
568054ab96 [fix] Make Delivery Note from Sales Invoice 2016-01-21 18:50:28 +05:30
Nabin Hait
bb7e499cbd Merge pull request #4662 from ccfiel/develop 
undo reconciled journal entry record
 2016-01-21 15:32:33 +05:30
Chris Ian Fiel
cb66d3a8c9 undo reconciled journal entry record 
https://github.com/frappe/erpnext/issues/4661
 2016-01-21 16:26:22 +08:00
Chris Ian Fiel
43a62ad0f0 undo reconciled journal entry record 2016-01-21 06:50:13 +08:00
Nabin Hait
002fa6c1d9 Merge pull request #4650 from RicardoJohann/patch-2 
Accounts - Bank reconciliation - Workflow and labeling improvements
 2016-01-20 17:03:06 +05:30
Nabin Hait
dbbc3eb8a6 Merge pull request #4656 from nabinhait/gle_rounding 
[fix] Round off gle due to currency conversion
 2016-01-20 16:48:42 +05:30
Nabin Hait
dd2f0330a6 Merge pull request #4641 from nabinhait/report-currency 
[fix] Currency in Gross Profit report
 2016-01-20 16:45:57 +05:30
Nabin Hait
d4507ac6a0 [fix] Round off gle due to currency conversion 2016-01-20 16:14:27 +05:30
RicardoJohann
05aa3b391e Update bank_reconciliation.py 2016-01-20 13:38:20 +08:00
RicardoJohann
e095eeb084 Update bank_reconciliation_statement.py 2016-01-20 13:36:36 +08:00
RicardoJohann
6f9afffd8a Update bank_reconciliation_statement.html 2016-01-20 12:15:20 +08:00
RicardoJohann
7425af6968 Update bank_reconciliation_detail.json 
Accounts - Bank reconciliation - Workflow and labeling improvements
 2016-01-20 12:02:20 +08:00
Nabin Hait
6d8688f8b4 [fix] Currency in Gross Profit report 2016-01-19 17:27:06 +05:30
Nabin Hait
34d2822483 Fixes in get_item_details and test cases 2016-01-19 16:48:32 +05:30
Nabin Hait
77532cc8db [fix] Total Amount in Journal Entry 2016-01-19 16:48:31 +05:30
Maxwell
4da17348fd Add localization in the on_submit event 2016-01-18 23:29:21 -02:00
Rushabh Mehta
6bf3c7453b [fix] payment request 2016-01-18 14:29:26 +05:30
Rushabh Mehta
681c9dde84 [ui] payment request cleanup 2016-01-18 14:21:45 +05:30
Rushabh Mehta
b46069d44b [cleanup] contextual buttons in sales & purchase and fix rate setting in opp -> quotation and material request -> purchase order 2016-01-15 16:59:26 +05:30
Rushabh Mehta
2e3d2b8426 Merge pull request #4613 from nabinhait/fixes 
[fix] Item query and exchange rate
 2016-01-15 11:19:44 +05:30
Rushabh Mehta
66eaf7e1c3 Merge pull request #4607 from saurabh6790/group_custom_buttons 
[enhance] merge customize buttons under groups
 2016-01-15 11:15:23 +05:30
Nabin Hait
ad42d2f67a Minor fixes 2016-01-15 11:09:41 +05:30
Saurabh
f7caad8ecb [fixes] redirect uri fixes 2016-01-14 11:30:47 +05:30
Nabin Hait
a88912a2f5 [fix] Item query and exchange rate 2016-01-14 10:43:17 +05:30
Saurabh
e23e99f4bd [enhance] merge customize buttons under groups 2016-01-13 09:18:31 +05:30
Saurabh
cbebb4b8ba [fixes] code cleanup 2016-01-12 14:13:35 +05:30
Saurabh
3ade883fd9 [fixes] place cart button via js 2016-01-12 14:09:52 +05:30
Saurabh
df2783dbb0 [enhance] i. facility to send PR email; ii. update cart, item view and order view; 2016-01-12 14:09:52 +05:30
Saurabh
a940b6d149 [fixes] handle cancled payment requests 2016-01-12 14:09:51 +05:30
Saurabh
0a0c78729f [enhace] display payment status on order 2016-01-12 14:09:51 +05:30
Saurabh
276d3e60bd [enhance] pay via cart 2016-01-12 14:09:51 +05:30
Saurabh
c22e525a14 [Fixes] payment request url fixes 2016-01-12 14:09:51 +05:30
Saurabh
2ffea6ba94 [document & fixes] document and test case rewrite 2016-01-12 14:09:51 +05:30
Saurabh
6fc408e974 [fixes] conmify account details and validate gateway currency 2016-01-12 14:09:51 +05:30
Saurabh
ed0723c6fe [fixes] Create payment gateway account 2016-01-12 14:09:50 +05:30
Saurabh
766f6a43d5 [fixes] test case for Payment request 2016-01-12 14:09:50 +05:30
Saurabh
1664668b0e [fixes] multi-currency fixes 2016-01-12 14:09:50 +05:30
Saurabh
3ba22676bf [fixes] Create and manage payment request 2016-01-12 14:09:50 +05:30
Saurabh
db7a56b453 [fixes] fieldtype, message fixes on Payment Request 2016-01-12 14:09:50 +05:30
Saurabh
cb98d9ec5f [fixes] print format listing 2016-01-12 14:09:50 +05:30
Saurabh
b109ee96de [fixes] Base structure for Payment Request 2016-01-12 14:09:49 +05:30
Saurabh
eba7aa496c [enhace] basic structure for payment gateway 2016-01-12 14:09:49 +05:30
Rushabh Mehta
4a3140102c Merge pull request #4606 from nabinhait/report_currency 
[fix] Currency symbol based on account/company currency, not based on Global Defaults
 2016-01-12 12:12:43 +05:30
Rushabh Mehta
659bc1aca4 [minor] fixes reported on support 2016-01-12 11:57:25 +05:30
Nabin Hait
226a101119 [fix] Currency symbol based on account/company currency, not based on Global Defaults 2016-01-12 11:56:40 +05:30
Nabin Hait
af2bf7541f Merge pull request #4603 from ccfiel/develop 
note added equity
 2016-01-11 13:13:15 +05:30
Chris Ian Fiel
d070d56f72 note added equity 2016-01-11 15:34:24 +08:00
Rushabh Mehta
7be0b47778 [minor] [fix] validate fiscal year in trial balance 2016-01-11 11:59:08 +05:30
Anand Doshi
6b71ef5843 [refactor] changed set_modified, change_modified to update_modified like in the framework 2016-01-06 16:32:06 +05:30
Nabin Hait
c040075bd4 [patch] Update billing status in Delivery Note and Purchase Receipt 2016-01-06 15:42:44 +05:30
Nabin Hait
bdab0eea0f Billing status in Purchase Receipt 2016-01-06 15:42:43 +05:30
Nabin Hait
5b13b99441 Update billing status in Delivery Note if directly invoiced against SO 2016-01-06 15:42:27 +05:30
Anand Doshi
09fc4a456e Merge pull request #4582 from nabinhait/develop 
Chart of accounts added for Singapore and some other fixes
 2016-01-06 15:01:49 +05:30
Anand Doshi
4774c41958 [fix] validate_multi_currency 2016-01-06 14:16:10 +05:30
Anand Doshi
e88ffe032e [fix] show fields like sales_order, against_sales_order, schedule_date in item grid if In List View is checked 2016-01-06 12:54:59 +05:30
Nabin Hait
ea8bc8ecb0 Chart of accounts added for Singapore and some other fixes 2016-01-06 12:32:48 +05:30
Anand Doshi
06a82d4e1f Merge pull request #4574 from rmehta/translations 
Translation fixes
 2016-01-05 18:41:18 +05:30
Rushabh Mehta
e64fbd6d3c [minor] fixes for chart_of_accounts_builder app 2016-01-04 18:11:21 +05:30
Rushabh Mehta
eb961370ff [translations] fixes #4532 2016-01-04 15:48:37 +05:30
Anand Doshi
f7980927a1 [fix] Payment Reconciliation: use the date and amount filters only for Invoice 2016-01-04 13:00:14 +05:30
Anand Doshi
c1e1026486 [fix] validate 'cannot change fiscal year dates' only if not new 2016-01-04 12:20:25 +05:30
Nabin Hait
0e2d1bd4ed [fix] Ignore permissions while creating fiscal year automatically 2015-12-28 13:04:19 +05:30
Nabin Hait
b6b56453e1 [fix] Get defaults based on doctype or fieldname 2015-12-23 16:37:06 +05:30
Nabin Hait
6f8dafbb5e [fix] Validate advance entry based on party 2015-12-23 13:03:31 +05:30
Nabin Hait
d37cef7f60 [fix] Set debit/credit in company currency 2015-12-22 15:13:01 +05:30
Anand Doshi
ee2129ce1c Merge pull request #4513 from nabinhait/discount_percentage 
Additional Discount amount based on percentage
 2015-12-21 16:13:17 +05:30
Nabin Hait
3769d87240 Additional Discount amount based on percentage 2015-12-18 13:12:08 +05:30
Nabin Hait
adab5d308c [fix] Group account merging with sub-ordinate group 2015-12-17 12:53:25 +05:30
Nabin Hait
afda26e4f3 Fixed conflict 2015-12-17 12:19:58 +05:30
Chris Ian Fiel
d6d354b5c3 By: nabinhait 
Depreciation account is an expense account, it is debited while booking depreciation. Thats why Depreciation amount is coming as negative, I think it should be positive and added to the "Net Profit and Loss".
 2015-12-17 09:42:12 +08:00
Chris Ian Fiel
7d310bd182 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2015-12-17 09:18:24 +08:00
Nabin Hait
8b33a6cdc0 Cleanup in cash flow 2015-12-16 16:09:43 +05:30
Nabin Hait
5e173c7106 Merge branch 'develop' of https://github.com/ccfiel/erpnext into ccfiel-develop 2015-12-15 17:39:55 +05:30
Nabin Hait
8bdf8e675f [fix][report] General Ledger 2015-12-15 15:02:04 +05:30
Rushabh Mehta
e8ab320028 [fix] rename tree item fixes #2524 2015-12-15 12:06:37 +05:30
Chris Ian Fiel
c80796cdd5 Cash Flow Report 2015-12-12 11:26:54 +08:00
Chris Ian Fiel
fde03453e4 Cash Flow Report 2015-12-12 10:54:56 +08:00
Chris Ian Fiel
826e18a29f Cash Flow Report 2015-12-12 10:33:01 +08:00
Nabin Hait
c119cbcb50 Merge pull request #4449 from nabinhait/coa_fix 
[fix] Stock account identified in COA of Guatamala
 2015-12-09 13:58:09 +05:30
Giovanni Lion
5de53eb0eb Voucher dynamic link fix to allow links to work if user language is not english 2015-12-09 15:45:40 +08:00
Nabin Hait
49fe7af6de [fix] Stock account identified in COA of Guatamala 2015-12-09 11:27:10 +05:30
Nabin Hait
4372ac559a Merge pull request #4443 from nabinhait/bank_reco_print 
[fix] Print format for bank reco statement
 2015-12-08 15:17:24 +05:30
Nabin Hait
7af5c4aefc [fix] Print format for bank reco statement 2015-12-08 14:25:10 +05:30
Rushabh Mehta
441b2c7657 [minor] limit pos search to 24 items at a time 2015-12-08 12:16:53 +05:30
Nabin Hait
92bb480fc3 Merge pull request #4432 from bohlian/develop 
Purchase Invoice - Show Payment Button when Outstanding Amount !=0
 2015-12-07 11:12:11 +05:30
bohlian
5e4c8a52ee Payment To Be Shown When Outstanding Amount != 0 
Payment button should be shown when outstanding amount != 0.
 2015-12-07 12:06:08 +08:00
Saurabh
4f39fd243e [fixes] recreate print format, shipping address on po for drop ship, validate update stock 2015-12-06 10:09:06 +05:30
Nabin Hait
9547b774f7 [fix] Fixed amounts not reflected in bank 2015-12-04 11:05:25 +05:30
Rushabh Mehta
39e603a154 Merge pull request #4413 from nabinhait/bank_transfer_exchange_rate 
Bank transfer exchange rate and account balance in COA
 2015-12-03 17:56:03 +05:30
Nabin Hait
4c7a32e446 [fix] Toggle required for sales and purchase tax template based on tax type 2015-12-03 11:47:38 +05:30
Rushabh Mehta
f7911687a0 [minor] fixes to patch 2015-12-03 08:09:42 +05:30
Nabin Hait
f58a3726a7 Balance in chart of accounts in both company and account currency 2015-12-02 12:28:06 +05:30
Nabin Hait
1c77506e80 [fix] Don't overwrite exchange rate on saving for bank transfer 2015-12-02 12:28:06 +05:30
Rushabh Mehta
29cca2352c [hot] [fix] trial balance report 2015-12-01 18:17:33 +05:30
Rushabh Mehta
29f9f6c147 [fixes] [ux] get product bundle items only on po, mr and button on toolbar 2015-12-01 11:36:22 +05:30
Rushabh Mehta
37d9d6fdea Merge pull request #4402 from nabinhait/allow_root_accounts 
[feature] Allowed custom root accounts in Chart of Accounts
 2015-12-01 10:59:44 +05:30
Rushabh Mehta
0cc177f73c Merge pull request #4400 from nabinhait/total_amount_in_jv 
[fix] Total Amount in Journal Entry in bank currency
 2015-12-01 10:58:34 +05:30
Nabin Hait
8c4e043747 [feature] Allowed custom root accounts in Chart of Accounts 2015-12-01 10:34:43 +05:30
Nabin Hait
621f4cd7c9 [fix] Invoicing against drop-ship Purchase Order 2015-11-30 18:40:28 +05:30
Nabin Hait
6c173e9730 [fix] Total Amount in Journal Entry in bank currency 2015-11-30 16:13:42 +05:30
Nabin Hait
ec1695dbe3 [fix] Bank Reconciliation in account currency 2015-11-30 15:23:46 +05:30
Rushabh Mehta
32e55e174d [minor] fix error message 2015-11-30 10:51:29 +05:30
Anand Doshi
563c243ec6 Revert "[hotfix] total amount in journal entry" 
This reverts commit 5b03a75970.
 2015-11-27 17:38:17 +05:30
Anand Doshi
5b03a75970 [hotfix] total amount in journal entry 2015-11-27 17:24:06 +05:30
Anand Doshi
e38a53443a Merge pull request #4386 from rmehta/bank-reco-bulk-edit 
[enhancement] bulk edit in bank reconciliation, #4356
 2015-11-27 14:46:58 +05:30
Rushabh Mehta
2d70887aaf [enhancement] bulk edit in bank reconciliation, #4356 2015-11-27 11:37:18 +05:30
Rushabh Mehta
b82bdd6f1f [fix] total amount in journal entry 2015-11-26 09:08:07 +05:30
Anand Doshi
5c968abcef [fix] Show Credit/Debit as blank in Journal Entry Account if its value is 0 2015-11-25 16:33:00 +05:30
Nabin Hait
c4f4c09e42 Get Items from Product Bundle button in purchase cycle 2015-11-23 12:51:37 +05:30
Nabin Hait
072c540ae3 [fix] Period closing account should be of type Liability / Equity 2015-11-23 09:52:08 +05:30
Nabin Hait
f649013079 Merge pull request #4329 from anandpdoshi/int-float-not-null 
[enhancement] Int, Currency, Float, Percent as not null and default to 0
 2015-11-19 14:30:58 +05:30
Anand Doshi
120ea62acc [fix] get_balance_on: convert date to string 2015-11-19 14:24:39 +05:30
Anand Doshi
602e8253be [enhancement] Int, Currency, Float, Percent as not null and default to 0 2015-11-19 13:23:36 +05:30
Nabin Hait
5284b22c53 [fix] Mapping from negative outstanding invoice 2015-11-19 11:42:23 +05:30
Nabin Hait
343c1a5cbd [fix] Mapping from Payment Tool 2015-11-19 11:42:22 +05:30
Saurabh
2e292060c5 [fix] Reserved and ordered qty fix for drop ship orders 2015-11-18 17:39:26 +05:30
Nabin Hait
b73f3da02c Merge pull request #4332 from nabinhait/pi_fix 
[fix] Check Purchase Receipt mandatory only for stock items
 2015-11-18 17:30:29 +05:30
Nabin Hait
f0607b45c5 Merge pull request #4334 from revant/patch-1 
Mode of Payment validate
 2015-11-18 17:29:54 +05:30
Nabin Hait
b45ca3ada0 Merge pull request #4331 from nabinhait/pcv_fix 
[fix] Allowed Equity accounts in closing account in Period Closing Voucher
 2015-11-18 17:15:57 +05:30
Revant Nandgaonkar
27c266b081 improve mode_of_payment validate_accounts 
using frappe.db.get_value instead of frappe.get_list
 2015-11-18 13:28:09 +05:30
Revant Nandgaonkar
11f8a0033a Mode of Payment validate 
Error when Same Company is entered multiple times in accounts
Error when Company of Ledger account doesn't match with Company Selected
 2015-11-17 21:15:00 +05:30
Anand Doshi
da79740cdf [fix] injection 2015-11-17 18:27:50 +05:30
Nabin Hait
2cf1699937 [fix] Check Purchase Receipt mandatory only for stock items 2015-11-17 17:32:07 +05:30
Nabin Hait
1a3413875f [fix] Allowed Equity accounts in closing account in Period Closing Voucher 2015-11-17 17:12:44 +05:30
Anand Doshi
d40d1e9a59 [optimize] Payment Reconciliation and Payment Tool 2015-11-12 17:42:05 +05:30
Anand Doshi
c5c6c0669f [fix] gross profit 2015-11-12 11:07:32 +05:30
Rushabh Mehta
739aa4d51a [minor] allow pricing rule to have negative discount 2015-11-09 17:05:12 +05:30
Rushabh Mehta
64e31e9a4e [fix] process payroll 2015-11-06 14:47:12 +05:30
Nabin Hait
c3ced9a0b5 [fix][report] Buying amount for product bundle in Gross Profit report 2015-11-05 13:13:31 +05:30
Rushabh Mehta
58101e9e6c Merge pull request #4272 from nabinhait/report-fix1 
[report] Added delay in payment column
 2015-11-04 13:18:42 +05:30
Rushabh Mehta
666131d2fe Merge pull request #4271 from saurabh6790/drop-shipping 
Exclude warehouse from drop ship and re-open status for DN / PR
 2015-11-04 13:18:20 +05:30
Nabin Hait
b4a51ec80b [report] Added delay in payment column 2015-11-04 13:09:48 +05:30
Saurabh
b7f0a4961e - no delivery / reserve warehouse in drop ship 
- “Re-open” in DN / PR after “Stop” / “Close"
- check for closed status in reports
 2015-11-04 12:03:54 +05:30
Rushabh Mehta
bd4814fbb7 [fix] email digest periods for weekly and monthly 2015-11-03 16:55:33 +05:30
Rushabh Mehta
b1d8979a59 Merge pull request #4179 from saurabh6790/drop-shipping 
Drop shipping
 2015-11-02 15:43:48 +05:30
Rushabh Mehta
ec2d0030b7 Merge pull request #4265 from nabinhait/jv_fix 
[cleanup] Make Payment Entry from Order/Invoice
 2015-11-02 15:23:01 +05:30
Saurabh
7cd0ba70d9 [fixes] typo error 2015-11-02 15:18:23 +05:30
Nabin Hait
66340f9894 [cleanup] Make Payment Entry from Order/Invoice 2015-11-02 14:40:47 +05:30
Saurabh
a8a91cca16 [feature] Close feature for Purchase Receipt and Delivery Note 2015-11-02 12:57:08 +05:30
Saurabh
381385d19a [fixes] add status 'Closed' in filter creating PR, PI from PO and SI, DN from SO 2015-11-02 11:30:51 +05:30
Saurabh
653cffec1e [change_log and fixes] set print hide, add change_log 2015-10-29 19:43:35 +05:30
Saurabh
2f702dcb32 [fixes] bulk close facility, rename Drop Ship to Delivered By Supplier 2015-10-29 19:43:35 +05:30
Saurabh
f857d81f35 [fixes]test case to check updated delivered qty 2015-10-29 19:43:34 +05:30
Saurabh
8a8ef85174 [fixes] reviwe fixes 2015-10-29 19:43:33 +05:30
Saurabh
5e0b0b4b97 [enhance] make PO from SO if supplier is specified 2015-10-29 19:43:33 +05:30
Saurabh
a4efbf0db7 [fixes] check for close status 2015-10-29 19:43:33 +05:30
Saurabh
e930f0f74e [fixes] filter on supplier list for DropShip, checking closed status 2015-10-29 19:43:33 +05:30
Saurabh
c6dbe70256 [Fixes] Drop Shipping 2015-10-29 19:43:32 +05:30
Nabin Hait
8372c44262 [fix] Default cost center as per company 2015-10-29 11:50:36 +05:30
Nabin Hait
6c6f3789d0 [fix] Is POS trigger 2015-10-26 18:01:12 +05:30
Nabin Hait
415df04834 [fix] Account Type in Chart of Accounts 2015-10-26 16:43:09 +05:30
Nabin Hait
6485d4a749 [fix] account currency is not mandatory in get exchange rate 2015-10-26 14:31:17 +05:30
Nabin Hait
8e3ea32d6d Merge pull request #4222 from nabinhait/tax_rule 
Set tax rule based on date
 2015-10-26 13:02:21 +05:30
Nabin Hait
00818bfa90 Set tax rule based on date 2015-10-23 16:26:09 +05:30
Nabin Hait
7a9f46d9d1 [fix] Value mapping while making bank entry from Expense Claim 2015-10-23 13:19:01 +05:30
Anand Doshi
0b93bdcf40 [fix] get_party_gle_currency caching 2015-10-22 19:33:08 +05:30
Anand Doshi
d8bc40d7f0 [fix] party gle currency validation 2015-10-22 17:55:22 +05:30
Nabin Hait
fbe08ec7d0 Period Closing Voucher Test Cases 2015-10-22 16:21:37 +05:30
Nabin Hait
0045c305ac Period Closing Voucher as per multi currency 2015-10-22 16:21:37 +05:30
Nabin Hait
31c51ef914 [fix] test case for purchase invoice gle 2015-10-21 17:40:06 +05:30
Nabin Hait
be464696cc [fix][patch] Fix wrong gle for Purchase Invoice against Expenses Included in Valuation account 2015-10-21 17:40:06 +05:30
Anand Doshi
87da662703 [enhancement] Quick Entry in Journal Entry, remember Posting Date 2015-10-21 16:27:13 +05:30
Nabin Hait
c35b35abca [fix] Set higher precision for exchange rate field 2015-10-20 12:11:51 +05:30
Anand Doshi
9dad86c189 Merge pull request #4190 from nabinhait/income_expense_account_query 
[fix] Allowed accounts with account type='Income Account' for default income account in item
 2015-10-19 15:43:32 +05:30
Nabin Hait
afd14f6f0e [fix] Allowed accounts with account type='Income Account' for default income account in item 2015-10-19 15:27:58 +05:30
Nabin Hait
aa015902d5 Validate currency of default receivable/payable accounts 2015-10-19 15:10:11 +05:30
Nabin Hait
2873f2e7de Validate currency of default receivable/payable accounts 2015-10-19 15:10:11 +05:30
Anand Doshi
1d093a4039 [fix] change attach fields to small text 2015-10-19 12:56:29 +05:30
Anand Doshi
d665a07621 [fix] remove label 'Column Break' 2015-10-16 15:44:28 +05:30
Rushabh Mehta
2e7f9d2b8f [fixes] email digest 2015-10-15 16:31:16 +05:30
Anand Doshi
1d23ebb51d [fix] exclude gl entry and stock ledger entry in linked with. Depends on frappe/frappe#1339 2015-10-15 12:54:40 +05:30
Rushabh Mehta
f861856ed9 [fix] do not check purchase invoice uniqueness for cancelled documents 2015-10-15 11:37:34 +05:30
Rushabh Mehta
ee6862b277 [fix] VARCHAR lengths as 140 2015-10-14 17:28:35 +05:30
Anand Doshi
71ebad5668 Limit varchar length to 140 instead of 255 to mitigate Row Size Too Large error 2015-10-14 16:13:49 +05:30
Rushabh Mehta
c27748b2b3 Merge pull request #4040 from nabinhait/dn_target_warehouse 
Delivery to target warehouse
 2015-10-14 15:29:54 +05:30
Nabin Hait
b445be3552 Test case for delivery to target warehouse 2015-10-13 15:46:42 +05:30
Nabin Hait
c865f229fb Target Warehouse in Delivery Note and Sales Invoice and removed Serial No status 2015-10-13 15:46:42 +05:30
Neil Trini Lasrado
f49b085625 Allowed Income account to be added to Cost Center 2015-10-13 14:54:39 +05:30
Rushabh Mehta
60f1739ca5 Merge pull request #4158 from rmehta/journal-entry-title-fix 
[fix] set title in Journal Entry only if not set
 2015-10-12 18:35:49 +05:30
Rushabh Mehta
cefa106a06 Merge pull request #4151 from anandpdoshi/purchase-invoice-letterhead 
[fix] Added Letter Head field to Purchase Invoice
 2015-10-12 18:30:25 +05:30
Rushabh Mehta
67ecfcf52c Merge pull request #4148 from saurabh6790/erp_support 
[minor fix], escape % char
 2015-10-12 18:30:13 +05:30
Rushabh Mehta
bc5ecfff06 Merge pull request #4146 from nabinhait/fix10 
[fix] Multiple minor fixes
 2015-10-12 18:27:02 +05:30
Rushabh Mehta
8fa4845d00 [fix] set title in Journal Entry only if not set 2015-10-12 16:59:52 +05:30
Anand Doshi
4b72d05793 [fix] get allocated_percentage from party's sales team 2015-10-12 16:15:52 +05:30
Anand Doshi
4fa69780a8 [fix] Added Letter Head field to Purchase Invoice 2015-10-12 15:55:24 +05:30
Nabin Hait
fc9031924e [fix] Field type of Age field converted to Int 2015-10-12 15:47:07 +05:30
Saurabh
e14124198d minor fix, escape % char 2015-10-12 15:08:09 +05:30
Nabin Hait
bcd655a985 Merge pull request #4109 from rmehta/fix-sales-purchase-order-status 
[fix] sales & purchase order status
 2015-10-07 11:34:30 +05:30
Nabin Hait
c5a25f44e1 Merge pull request #4119 from nabinhait/fix3 
[fix] Return account currency only if account provided
 2015-10-07 11:25:19 +05:30
Nabin Hait
ebbd163903 [fix] allowed more than 2 currencies in Journal Entry 2015-10-05 13:21:38 +05:30
Nabin Hait
8954b24b22 [fix] Return account currency only if account provided 2015-10-04 12:27:46 +05:30
Rushabh Mehta
d10ba853e6 [fix] sales & purchase order status 2015-10-02 17:16:51 +05:30
Anand Doshi
1a1f790150 [fix] test case 2015-10-02 12:34:18 +05:30
Rushabh Mehta
3c54e9779b Merge pull request #4108 from nabinhait/payment_reco 
[fix] Payment Reconciliation in multi-currency
 2015-10-02 12:32:54 +05:30
Nabin Hait
db48b7d764 [fix] Payment Reconciliation in multi-currency 2015-10-02 12:05:55 +05:30
Rushabh Mehta
83c0899c83 [fix] [minor] default ranges for demo 2015-10-02 11:31:37 +05:30
Anand Doshi
d9ab725be4 [fix] In Payment Tool, Set Payment Amount = Outstanding Amount if checked 2015-10-01 19:17:02 +05:30
Nabin Hait
5c623dae4d [fix] General Ledger report fixed 2015-10-01 11:22:15 +05:30
Anand Doshi
e2c3d40b57 [hotfix] Payment Reconciliation Invoice Type 2015-10-01 11:21:26 +05:30
Nabin Hait
72d2d682ae Repost GL Entries for Journal Entries where reference name is missing 2015-09-30 18:50:54 +05:30
Anand Doshi
21f6ea6f7e [hotfix] remove allow on submit from item tables 2015-09-30 18:45:29 +05:30
Anand Doshi
15d2c89939 Merge remote-tracking branch 'upstream/master' into develop 
Conflicts:
	erpnext/accounts/report/general_ledger/general_ledger.py
 2015-09-30 17:13:58 +05:30
Anand Doshi
4945b94950 [fix] added validation to match account currency with existing gle and test case 2015-09-30 16:41:15 +05:30
Anand Doshi
248c867a2c [minor] removed test case for party multi-currency validation, since party multi-currency is now based on account 2015-09-30 15:11:13 +05:30
Anand Doshi
da98ab6f3c [fix] Only 1 account per company for a party 2015-09-30 15:11:12 +05:30
Anand Doshi
cd0989e051 Added method get_account_currency 2015-09-30 15:11:12 +05:30
Anand Doshi
b20baf894f [fix] Remove party_account_currency from Customer and Supplier, and use currency derived from get_party_account 2015-09-30 15:11:12 +05:30
Nabin Hait
d3cf4f1264 Merge pull request #4075 from anandpdoshi/journal-entry-get-exchange-rate 
return exchange rate as 1 if no account is specified
 2015-09-30 15:05:41 +05:30
Rushabh Mehta
89349d3ae3 [fix] [payment-reconciliation] ignore rows with blank invoice numbers 2015-09-29 16:39:53 +05:30
Anand Doshi
740a11263f [minor] validate invoice number is selected in Payment Reconciliation 2015-09-29 12:55:11 +05:30
Anand Doshi
d6cb55ad1a [fix] return exchange rate as 1 if no account is specified 2015-09-28 17:20:02 +05:30
Anand Doshi
6f39300d43 Merge pull request #4068 from anandpdoshi/due-date-validation 
if no party, don't validate due date based on credit days
 2015-09-25 17:31:33 +05:30
Anand Doshi
0ca587e018 [fix] if no party, don't validate due date based on credit days 2015-09-25 16:32:14 +05:30
Rushabh Mehta
8ffe12ebe4 [chart-of-accounts] added default for Guatemala 2015-09-25 15:40:33 +05:30
Anand Doshi
8579af371c Merge pull request #4057 from rmehta/gl-report-fix 
GL Report Fix
 2015-09-25 12:30:26 +05:30
Nabin Hait
44bd3b2601 [fix] Fetch gl entries in receivable/payable report only if party mentioned 2015-09-25 10:33:51 +05:30
Nabin Hait
1b6c00e2c7 [report] Trial Balance for Party 2015-09-25 09:18:03 +05:30
Anand Doshi
3297c43bdf [fix] Tax Rule permission to Account Manager 2015-09-24 17:29:28 +05:30
Anand Doshi
d37d4dfdec [fix] applicable territory patch and tax rule tests 2015-09-24 15:44:39 +05:30
Anand Doshi
bba0a5d38f [fix] [patch] tax rule 2015-09-24 15:11:24 +05:30
Rushabh Mehta
8f2b8afcb7 [fix] gl entry report if not filtered 2015-09-24 15:03:53 +05:30
Anand Doshi
e63da9813c Merge remote-tracking branch 'frappe/master' into develop 
Conflicts:
	erpnext/patches.txt
 2015-09-24 14:34:50 +05:30
Anand Doshi
361eca4cae Merge pull request #4054 from anandpdoshi/sales-team-update-after-submit 
Sales Team editable after submit
 2015-09-24 11:30:31 +05:30
Anand Doshi
e2d46d0474 [fix] Allow Sales Team to be added/updated after submit 2015-09-23 19:26:29 +05:30
Rushabh Mehta
307978fea9 [test-fixes] 2015-09-23 15:43:09 +05:30
Anand Doshi
06ad308ca1 [fixes] setup wizard and other fixes related to cart 2015-09-23 12:50:35 +05:30
Rushabh Mehta
72fbf902d7 [cleanup] added single price list for shopping cart, removed Applicable Territory 2015-09-23 12:50:34 +05:30
Rushabh Mehta
8ffd483e24 [wip] shopping cart shipping rule, price list cleanup 2015-09-23 12:49:16 +05:30
Rushabh Mehta
3d76686b82 [shopping-cart] cart via Jinja WIP 2015-09-23 12:49:16 +05:30
Rushabh Mehta
abdfb4d3db [fixed] New button in POS Sales Invoice, reported via forum 2015-09-23 12:05:51 +05:30
Nabin Hait
5b649521d1 [fix] Get outstanding invoices in Payment Reconciliation and Payment Tool 2015-09-22 13:06:34 +05:30
Anand Doshi
798e75832c [fix] Show payment's invoice number as 'Invoice Type | Invoice Number' for better unsability 2015-09-22 12:59:43 +05:30
Nabin Hait
c0c94aef44 [fix] Get outstanding invoices in Payment Reconciliation and Payment Tool 2015-09-22 08:37:37 +05:30
Anand Doshi
e4dfeb651f [optimization] get balance on 2015-09-21 19:31:43 +05:30
Anand Doshi
f7e6eb4fd7 [optimization] get balance on 2015-09-21 19:30:21 +05:30
Rushabh Mehta
97c858a5e3 [fix] pull sales team from customer 2015-09-21 10:03:38 +05:30
Rushabh Mehta
974892bf87 Merge pull request #4036 from rmehta/no-party-currency 
[fix] no default party currency
 2015-09-18 13:40:42 +05:30
Rushabh Mehta
361df8993f [fix] no default party currency 2015-09-18 12:59:51 +05:30
Nabin Hait
a48d754158 [fix] minor issue 2015-09-17 20:37:07 +05:30
Anand Doshi
26bcd89d10 [hotfix] journal entry - get balance 2015-09-17 20:36:44 +05:30
Anand Doshi
20fd360a63 [hotfix] journal entry - get balance 2015-09-17 20:36:19 +05:30
Nabin Hait
a8ef4c9220 [fix] minor issue 2015-09-17 19:38:11 +05:30
Nabin Hait
926ae17e5a Update journal_entry.py 2015-09-17 18:42:55 +05:30
Nabin Hait
8adb5f3e32 Update journal_entry.py 2015-09-17 18:40:35 +05:30
Rushabh Mehta
e3401182c8 Merge pull request #4012 from saurabh6790/cart 
Taxation for Shopping Cart based on Tax Rule template
 2015-09-17 16:26:35 +05:30
Anand Doshi
70fed64cd5 Merge pull request #4029 from nabinhait/mc2 
[fix] Account Currency and Balance fixed in chart of accounts #4019
 2015-09-17 14:37:00 +05:30
Nabin Hait
59f4fa9a8c [fix] Account Currency and Balance fixed in chart of accounts #4019 2015-09-17 13:57:42 +05:30
Nabin Hait
262ac09305 [fix] Currency symbol fixed in Accounts receivable/payable report #4020 2015-09-17 13:24:14 +05:30
Anand Doshi
12106725fb [fix] set Payment Amount in Payment Tool 2015-09-17 12:59:44 +05:30
Anand Doshi
0b031cdd6c [fix] ignore journal entry based invoice in payment tool and payment reconciliation tool 2015-09-16 12:46:54 +05:30
Saurabh
0bd145a608 [fixes] test cases and tax rule validation 2015-09-15 17:06:52 +05:30
Saurabh
c663f5c2bd [Test] test state based taxasion 2015-09-15 15:41:01 +05:30
Saurabh
adde1cff48 [Enhancement] add state ccriteria in tax rule 2015-09-15 15:41:01 +05:30
Saurabh
7c867ae9ad [Fixes] Tax Rule preparation and test taxes creation, remove dummy quotation 2015-09-15 15:41:01 +05:30
Saurabh
8f7317175d [enhancement] bring taxes from tax rules and test cases 2015-09-15 15:41:01 +05:30
Saurabh
957e7a37be [Shopping Cart][Fixes] tax calculation based on tax rule 2015-09-15 15:41:01 +05:30
Saurabh
def71d4d5d [Shopping Cart][Fixes] tax calculation based on tax rule 2015-09-15 15:41:00 +05:30
Neil Trini Lasrado
ef511b160e Added Tax Rule under ERPNext > Accounts > Setup 2015-09-15 15:41:00 +05:30
Neil Trini Lasrado
09f9c96c53 Fixes in Tax Rule 2015-09-15 15:41:00 +05:30
Neil Trini Lasrado
1a2d121073 Removed default taxes and charges from customer and supplier master. Added patch to create tax rules against customer/supplier 2015-09-15 15:41:00 +05:30
Neil Trini Lasrado
810bd35609 Apply Tax Rule based on Customer Selection in Sales / Purchase Transactions 2015-09-15 15:41:00 +05:30
Neil Trini Lasrado
949d7dbaba Added validations, test-cases to Tax Rule 2015-09-15 15:41:00 +05:30
Neil Trini Lasrado
72e6aa160c Added New Doctype Tax Rule 2015-09-15 15:41:00 +05:30
Anand Doshi
1fef2fad2d [minor] fixes in queries and payment tool 2015-09-14 18:27:21 +05:30
Anand Doshi
dbe623b167 [fix] Use User Permission value as default only if the document type is Setup 2015-09-14 13:08:53 +05:30
Anand Doshi
71e51c179c [fix] changed modified for multi-currency sync 2015-09-11 16:55:11 +05:30
Anand Doshi
4b8dbbdf98 [minor] Change modified of Sales Invoice.json 2015-09-11 16:39:03 +05:30
Anand Doshi
979326b0b1 minor fixes in multi-currency 2015-09-11 16:33:45 +05:30
Anand Doshi
5d9cfc76cd Don't copy title field in Duplicate 2015-09-11 15:35:26 +05:30
Nabin Hait
8db7bd2d8f [fix] Igonre permissions while saving Company and Warehouse from Accounts Settings 2015-09-11 15:34:42 +05:30
Nabin Hait
f76d63b92a Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency 
[fix][patch] delete item variant attributes if no variants exists against that item
 2015-09-10 19:26:02 +05:30
Nabin Hait
71ef6675ce [fix] Journal Entry client side minor fixes 2015-09-10 19:25:50 +05:30
Nabin Hait
5a803d76ad [fix] Bypass Root Not Editable validation from Setup Wizard 2015-09-10 13:20:35 +05:30
Nabin Hait
2377cdfa4e Fixed conflict 2015-09-09 18:45:41 +05:30
Nabin Hait
e3ae05aabd Multi-currency: Exchange Rate in Journal Entry 2015-09-09 18:43:12 +05:30
Anand Doshi
9d5b84e78a Merge pull request #3996 from nabinhait/fix6 
Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order
 2015-09-09 15:11:12 +05:30
Nabin Hait
83dd3e14e5 [fix] Gross Profit report should not include return entries 2015-09-09 10:37:04 +05:30
Nabin Hait
cd103c05d6 Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order 2015-09-08 19:24:35 +05:30
Anand Doshi
bc1e8b4408 [minor] Unset Apply User Permissions in default permissions 2015-09-08 19:23:23 +05:30
Nabin Hait
6c3ff3e2ed Fixed conflict 2015-09-08 18:09:03 +05:30
Nabin Hait
96bb070781 Payment against invoices where party not specified 
Conflicts:
	erpnext/accounts/doctype/gl_entry/gl_entry.py
 2015-09-08 16:36:44 +05:30
Nabin Hait
d608363d7b [fix] Map amount in advance payment entry agaionst SO/PO based on party account currency 2015-09-08 12:53:59 +05:30
Nabin Hait
b2739cbb79 Get average exchange rate in case of bank transfer 2015-09-08 12:18:45 +05:30
Nabin Hait
bf9691ed39 Multiple fixes 2015-09-07 10:40:48 +05:30