Javier Wong
9b11d9b45d
[fix] Stock Entry - Change "Is Sample Item" to "Allow Zero Valuation Rate"
2017-04-14 18:24:04 +08:00
mbauskar
1e05077b1f
[minor] sales register report fixes
2017-04-14 09:59:49 +05:30
Faris Ansari
185762aeeb
update label
2017-04-13 12:36:08 +05:30
Faris Ansari
19f90e984e
[POS] Show stock quantity of items
...
- frappe/erpnext#8247
2017-04-12 16:06:31 +05:30
Faris Ansari
b5608f9b14
[fix] Default Print Format for Sales Invoice ( #8419 )
...
- frappe/erpnext#8416
2017-04-12 15:31:01 +05:30
rohitwaghchaure
5adce495aa
Merge pull request #8417 from rohitwaghchaure/due_date_issue
...
[fix] POS, Due Date cannot be before Posting Date
2017-04-12 14:43:21 +05:30
Rohit Waghchaure
2192c244c0
[fix] POS, Due Date cannot be before Posting Date
2017-04-12 13:19:05 +05:30
mbauskar
2f9703c20e
[minor] set company_currency as account_currency in general ledger if party type is employee
2017-04-11 18:56:41 +05:30
joezsweet
768a888bf2
[fix] validate supplier invoice
...
- modified to check for the selected supplier only
2017-04-11 18:52:46 +05:30
Rohit Waghchaure
87ad6d074a
[enhance] Stock qty added in purchase invoice
2017-04-11 18:29:52 +05:30
Kanchan Chauhan
95108ac80b
[Minor] Party validation for Employee
2017-04-11 18:29:27 +05:30
mbauskar
236f7aac7f
[minor] track changes for transaction documents
2017-04-10 14:48:54 +05:30
Nabin Hait
549a2827e5
Merge pull request #8300 from rohitwaghchaure/customer_edit_issue_v8
...
[fix] Customer edit issue in offline POS
2017-04-05 14:51:44 +05:30
Rohit Waghchaure
2861955632
[fix] Customer edit issue in offline POS
2017-04-04 09:59:29 +05:30
Nabin Hait
731efe3a95
Minor fix in gross profit report
2017-04-03 12:11:36 +05:30
Nabin Hait
2c892c7e7f
Indentation fixed in gross profit report
2017-04-03 12:05:35 +05:30
Nabin Hait
b15d999147
Merge branch 'develop' into gross_profit_issue_v_8
2017-03-31 17:39:45 +05:30
Rushabh Mehta
f0b4562a95
[refactor] move purchase_common.js -> public/js/controllers/buying.js
2017-03-31 17:36:48 +05:30
Rushabh Mehta
cc8b2b2fdb
[fix] [refactor] demo for v8 and remove purchase common
2017-03-31 17:36:48 +05:30
Rohit Waghchaure
34b1dba9aa
[fix] get_valuation_rate takes 4 arguments 3 given in gross profit report
2017-03-31 12:44:10 +05:30
Ricardo Johann
033e2fa8b6
changed accumulated header
2017-03-31 02:18:54 -03:00
Nabin Hait
620bde7144
Updated modified date to reload sales uom
2017-03-30 19:50:45 +05:30
Nabin Hait
e503f68ec7
Merge pull request #8229 from rohitwaghchaure/pos_highlight_issue
...
[fix] POS cart item's highlighted issue
2017-03-30 19:26:33 +05:30
Rohit Waghchaure
a86bb69adf
[fix] POS cart item's highlighted issue
2017-03-30 19:16:38 +05:30
Nabin Hait
1f6bd0ad37
Fixed merge conflict
2017-03-30 13:15:22 +05:30
Ricardo Johann
3d1434afe7
Export total labels
2017-03-29 17:44:17 +05:30
Makis Etzoglou
82e6bc45e4
tax_id add to Sales Order, Delivery Note, and Sales Invoice
2017-03-29 17:39:08 +05:30
mbauskar
de98ff6bb9
[minor] hide the stock details section if update_stock is unchecked
2017-03-29 17:29:58 +05:30
Nabin Hait
da749f716b
Merge pull request #8172 from rohitwaghchaure/credit_note_serial_no_issue
...
[fix] During making credit note from sales invoice, system fetching new serial no instead of old serial no from the sales invoice
2017-03-28 13:49:32 +05:30
Nabin Hait
77c970549b
In gross profit report, if incoming rate not found from last sle, consider average valuation rate
2017-03-28 12:20:31 +05:30
Rohit Waghchaure
5ecbaa408b
[fix] During making credit note from sales invoice, system fetching new serial no instead of old serial no from the sales invoice
2017-03-28 12:09:07 +05:30
Nabin Hait
8bf58367b8
Fixed merge conflict
2017-03-27 12:30:01 +05:30
Nabin Hait
9c8159be8f
Merge pull request #8129 from rohitwaghchaure/pos_v8_enhance_and_issue
...
[fix] customer edit, numeric keypad visibility, on selection of item highlight the background issue in the pos
2017-03-27 12:25:18 +05:30
Rohit Waghchaure
b719dc53fc
[fix] customer edit and numeric keypad visibility issue in the pos
2017-03-24 17:03:50 +05:30
Nabin Hait
bf2a7efca4
Account name changed in standard chart of accounts
2017-03-24 13:01:35 +05:30
Nabin Hait
f44f04e33a
Merge pull request #8063 from khrlzhfr/patch-1
...
Update standard_chart_of_accounts.py
2017-03-23 17:01:34 +05:30
Nabin Hait
c7dc838306
Merge pull request #8068 from rohitwaghchaure/asset_depreciation_issue
...
[fix] Precision issue during making of depreciation schedule
2017-03-23 16:59:12 +05:30
Rohit Waghchaure
57f35a25a1
[fix] UnpickleError, removed _ method from the argument of the function
2017-03-23 14:55:52 +05:30
Rohit Waghchaure
6ee91ec9c6
on selection of row highlight the background in the cart
2017-03-21 15:55:09 +05:30
Faris Ansari
e1acb766ac
[fix] asset image in image view
2017-03-21 14:18:30 +05:30
Rohit Waghchaure
b69d311268
[fix] precision issue during making of depreciation schedule
2017-03-20 16:30:34 +05:30
Khairil Zhafri
4d6d456a0d
Update standard_chart_of_accounts.py
...
Minor spelling edits
2017-03-20 00:15:34 +08:00
rohitwaghchaure
2b9c95a940
Merge pull request #8043 from rohitwaghchaure/pos_issue_v8
...
[fix] POS, amount not updating on change of price, on zero of discount rate has not reset, pricing rule not working for brand
2017-03-16 17:56:20 +05:30
Rohit Waghchaure
75177c0e35
[fix] POS, amount not updating on change of price, on zero of discount rate has not reset, pricing rule not working for brand
2017-03-16 15:47:25 +05:30
mbauskar
27efc91db0
[minor] make item code mandatory if update_stock is selected
2017-03-15 18:57:18 +05:30
Rushabh Mehta
f340e19ea7
[minor] field re-arrangements in sales invoice, purchase invoice, stock reco
2017-03-15 15:12:43 +05:30
Nabin Hait
ee7b4f2882
Merge pull request #8016 from rmehta/posting-date-option
...
[feature] posting date, time is always current unless explicitly set
2017-03-15 11:22:04 +05:30
Nabin Hait
505ed25f10
Merge pull request #8017 from nabinhait/develop
...
Field order changed for 'Qty as per Stock UOM'
2017-03-14 22:39:36 +05:30
Nabin Hait
79bce2a71d
Merge pull request #8019 from rohitwaghchaure/pos_serial_no_issue
...
[fix] User sales one serial number multiple time from the POS
2017-03-14 22:38:28 +05:30
Rushabh Mehta
4f3da42b75
[fixes] for tests
2017-03-14 21:29:55 +05:30
Rushabh Mehta
131866a11a
[fixes] for tests
2017-03-14 21:06:15 +05:30
Rushabh Mehta
82c258948d
[fixes] for recurring and tests
2017-03-14 19:13:39 +05:30
Rohit Waghchaure
e259a9b068
[fix] User sales one serial number multiple time from the POS
2017-03-14 19:05:21 +05:30
Nabin Hait
3d731df7e3
Field order changed for 'Qty as per Stock UOM'
2017-03-14 17:24:57 +05:30
Rushabh Mehta
6d4a52562b
[fix] posting date, time is always current unless explicitly set
2017-03-14 17:06:51 +05:30
Rushabh Mehta
6b53792aea
[fix] posting date, time is always current unless explicitly set
2017-03-14 17:06:51 +05:30
Rohit Waghchaure
faedf8274c
[fix] gross profit permission issue
2017-03-14 14:56:24 +05:30
Saurabh
0d47d51407
[fix] modified payment request to cope with new payment structure ( #7957 )
...
* [fix] modified payment request to cope with new payment structure
* [fix] moved payment gateway doctype from accounts to core
2017-03-14 14:46:05 +05:30
Rohit Waghchaure
cc034a8983
[fix] Value assignment issue for country in the pos profile
2017-03-13 22:44:48 +05:30
Nabin Hait
1ed8bc4c36
Gross Profit report: Consider Sales team table only if grouped by sales person
2017-03-12 17:10:41 +05:30
Nabin Hait
fb4b8d926f
Company based on exising company fix
2017-03-12 16:55:05 +05:30
Nabin Hait
d0d22ff203
copy letter head from invoice to payment entry
2017-03-12 16:55:05 +05:30
Nabin Hait
c5204f56e2
Merge pull request #7909 from KanchanChauhan/employee-loan-jv
...
JV on submitting Employee Loan
2017-03-12 16:50:48 +05:30
Rohit Waghchaure
87fa59a710
[Fix] Customer delete, customer edit functionality, added country field in the pos profile
2017-03-10 19:37:02 +05:30
Faris Ansari
1fe1518398
[pos] ui cleanup
2017-03-10 17:00:43 +05:30
Rohit Waghchaure
6068aecc2e
minor fix
2017-03-10 17:00:43 +05:30
Faris Ansari
07c9f35779
ui cleanup
2017-03-10 17:00:42 +05:30
Faris Ansari
45510109b6
[pos] cleanup
2017-03-10 17:00:42 +05:30
Rohit Waghchaure
017f5005e0
fixed pos numeric keypad functionality
2017-03-10 17:00:42 +05:30
Faris Ansari
339d9c954a
minor changes
2017-03-10 17:00:42 +05:30
Rohit Waghchaure
1312fe31a9
Provision to edit customer and address details
2017-03-10 17:00:42 +05:30
Rohit Waghchaure
56a7974b58
added event on numeric keypad
2017-03-10 17:00:41 +05:30
Rohit Waghchaure
86ab6a93b4
[Enhancement] POS, numeric keypad
2017-03-10 17:00:41 +05:30
Faris Ansari
1f261a8695
UI changes
2017-03-10 17:00:41 +05:30
Rohit Waghchaure
b5097ec161
offline email for POS
2017-03-10 17:00:41 +05:30
Rohit Waghchaure
f0c7ba4b1f
added event on numeric keypad
2017-03-10 17:00:40 +05:30
Rohit Waghchaure
e30f83a8af
[Enhancement] POS, numeric keypad
2017-03-10 17:00:40 +05:30
Kanchan Chauhan
ffd1f112e6
JV on submitting Employee Loan
2017-03-09 12:21:37 +05:30
Nabin Hait
52daaca885
Fixed merge conflict
2017-03-08 14:30:38 +05:30
mbauskar
02198ec8b0
removed the test_clear_blank_rows test case from JE
2017-03-08 12:34:36 +05:30
Nabin Hait
33fb6ae323
Fixed merge conflict
2017-03-08 11:18:15 +05:30
mbauskar
c03f275e7a
[minor] allowed the credit and debit amount to be 0 in JE
2017-03-07 11:59:55 +05:30
Rohit Waghchaure
9f4317e9b8
minor fix
2017-03-06 23:42:45 +05:30
Nabin Hait
b3ffd6b282
Merge pull request #7828 from rohitwaghchaure/update_user_roles_to_roles
...
Changed userrole to has role, commonify role editor of the user
2017-03-06 18:44:53 +05:30
Nabin Hait
fe876c0805
Test case fixed for multiple uom in selling
2017-03-06 16:41:13 +05:30
Nabin Hait
e68f32cf19
UOM Conversion in selling
2017-03-06 16:41:13 +05:30
Kanchan Chauhan
5a980ac87a
UOM Conversion in Selling
2017-03-06 16:41:12 +05:30
Rohit Waghchaure
611a70a12a
changes in the report roles
2017-03-06 16:36:46 +05:30
Rohit Waghchaure
e7485150a1
added roles in the report
2017-03-06 14:26:09 +05:30
Nabin Hait
c642f76a4d
Fixed merge conflict
2017-02-27 14:40:53 +05:30
Rohit Waghchaure
b983f26b98
[Fix] Payment entry account Paid To Show receivable accounts for supplier
2017-02-24 15:07:54 +05:30
Nabin Hait
ff5bd680c2
Merge pull request #7840 from rmehta/new-buttons
...
[enhance] connect new buttons on dashboard to custom make buttons and fix text for payment request
2017-02-24 12:57:13 +05:30
Rushabh Mehta
509543752c
[enhance] connect new buttons on dashboard to custom make buttons and fix text for payment request
2017-02-23 17:03:46 +05:30
mbauskar
d6e409ea92
[minor] hide recurring section if document is in __local state
2017-02-22 18:22:14 +05:30
Nabin Hait
5079c9ef47
Fixed merge conflict
2017-02-22 15:31:31 +05:30
mbauskar
a8fa10d2a9
[minor] minor fixes for journal entry get_exchange_rate trigger
2017-02-22 14:51:09 +05:30
Kanchan Chauhan
f2803ac427
[Fix] Throw error if item is added multiple time
2017-02-22 10:40:38 +05:30
Rohit Waghchaure
49523d7f80
[Fix] Company fiscal year issue in financial statement
2017-02-21 14:20:26 +05:30
Nabin Hait
aa968cd12e
Merge pull request #7751 from nick9822/patch-3
...
Next Depreciation Date is entered as past date
2017-02-20 19:11:31 +05:30
Nabin Hait
8bb69ff8bf
Fixed merge conflict
2017-02-20 19:01:04 +05:30
Nabin Hait
589f4656ad
Merge branch 'develop' into in_global_search
2017-02-20 15:04:52 +05:30
Nabin Hait
9f4cb0c097
Fixed merge conflict
2017-02-20 15:00:04 +05:30
Nabin Hait
fd3ec066ce
Added fields in global search
2017-02-20 13:38:31 +05:30
Rohit Waghchaure
f73d459c80
[Fix] Removed employee party type from the payment entry
2017-02-19 17:46:05 +05:30
Nabin Hait
02d987ed13
Minor fix for common tree view
2017-02-17 15:50:53 +05:30
Rohit Waghchaure
a020e4eba4
Payment entry fields issue, added total billed hours in timesheet
2017-02-17 14:51:57 +05:30
Kanchan Chauhan
1b204c8e4e
Accrual Payroll System
2017-02-16 16:30:51 +05:30
nick9822
23e174c270
Validation for purchase_date
...
Separate validation for purchase date.
2017-02-16 16:26:38 +05:30
mbauskar
e7b87ad071
[minor] timestamp fixes for heatmap
2017-02-16 16:05:46 +05:30
Nabin Hait
d13d198dc8
Merge pull request #7747 from KanchanChauhan/item-name-asset
...
[Minor] Item Name in Asset
2017-02-16 15:15:23 +05:30
Nabin Hait
ea1cb68fe7
Merge branch 'master' into develop
2017-02-16 14:37:50 +05:30
Nabin Hait
99c6c79834
Update payment_entry.js
2017-02-16 14:21:04 +05:30
nick9822
e5cb3e34fe
nowdate changed to purchase_date
...
next depreciation date should be compared with purchase_date instead of nowdate.
2017-02-15 15:32:50 +05:30
Kanchan Chauhan
2307f57f19
[Minor] Item Name in Asset
2017-02-15 11:52:29 +05:30
Rohit Waghchaure
ff41c82c2b
[Fix] Payment Entry currency symbol issue
2017-02-15 11:44:15 +05:30
Rushabh Mehta
e6aa3b435a
[minor] added make material request from Stock Entry and removed cur_frm
2017-02-09 17:47:22 +05:30
mbauskar
d487bf77e1
[minor] payment entry company trigger
2017-02-09 12:57:25 +05:30
khatrijitendra
d262eb1a1c
issue in type and rate
...
1. there is not such field, "type" it is "margin_type"
2. there is not such field, "rate" it is "margin_rate_or_amount"
2017-02-08 14:59:59 +05:30
Nabin Hait
6ff0caa87a
Fixed merge conflict
2017-02-08 11:33:33 +05:30
Nabin Hait
6f93cd5bd0
Merge pull request #7692 from rohitwaghchaure/minor_fixes_v_7_2
...
Minor fixes
2017-02-08 11:21:54 +05:30
Nabin Hait
533d22e88b
Merge pull request #7606 from rohitwaghchaure/data_import_tool_for_cost_center
...
[Fix] Allow data import tool for cost center
2017-02-08 11:21:25 +05:30
Rohit Waghchaure
b3489548a9
minor fix
2017-02-08 11:20:04 +05:30
Nabin Hait
70fd8546ce
Merge pull request #7677 from KanchanChauhan/serial-no-in-return
...
[Fix] Serial No if is_return
2017-02-07 13:28:30 +05:30
Nabin Hait
0a6aaf4257
Get standard/historical valuation rate where missing: some minor fixes
2017-02-07 12:50:22 +05:30
Kanchan Chauhan
4f3b0aa249
[Fix]Serial No if is_return
2017-02-07 11:28:34 +05:30
Nabin Hait
ea8fab52c6
Get standard/historical valuation rate where missing, if item is not a sample item
2017-02-07 01:24:32 +05:30
mbauskar
c874a82559
[minor] index out of range fixes for JE
2017-02-06 15:41:34 +05:30
Rushabh Mehta
6ede4a3809
[enhance] production order from sales order
2017-02-02 17:42:01 +05:30
Rushabh Mehta
a3d0bea375
Merge branch 'develop' into remove-party-status
2017-02-02 15:42:04 +05:30
Rohit Waghchaure
69060a8177
Minor fix
2017-02-01 19:14:53 +05:30
Rushabh Mehta
3714626dd0
[minor] enhance BOM view
2017-02-01 18:35:53 +05:30
rohitwaghchaure
c13dbd408f
[Enhancement] POS Redesign ( #7639 )
...
* item group, discount
* POS Redesign
* offline customer
* removed offline records from modal view
2017-02-01 18:07:22 +05:30
Rohit Waghchaure
38f808cfae
[Fix] Buying rate in gross profit report
2017-02-01 13:34:06 +05:30
rohitwaghchaure
ea092a7b24
[Enhancement] Booking of an employee's expense claim ( #7267 )
...
* [Enhancement] Auto book of an employee's expense claim
* test cases
* documentation
* fixes and changes
* removed payable from employee and added into the company
* Added party in account, patch to update party type for customer and supplier accounts
* added party type in erpnext, fix patch
* fixed travis
2017-02-01 12:02:08 +05:30
KanchanChauhan
fbaa6197f9
Employee Loan Management ( #7126 )
...
* [WIP] Employee Loan Management
* EMI calculation
* Fixing PR
2017-01-30 15:15:58 +05:30
Rushabh Mehta
87037bdd56
[minor] remove party status as it leads to duplicate notifications fixes #7346 , also fix for #7568
2017-01-30 13:22:51 +05:30
Rohit Waghchaure
b327429db7
[Fix] Allow data import tool for cost center
2017-01-30 11:34:29 +05:30
Ricardo Johann
34354237fd
added project filter to gl and carry project filter from P&L
2017-01-24 06:46:07 -03:00
Nabin Hait
349d520ae2
Fixed merge conflict
2017-01-20 15:44:35 +05:30
Nabin Hait
bd1a628c55
Merge pull request #7545 from rohitwaghchaure/minor_issue
...
[Fix] Account user not able to access the report Payment Period Based On Invoice Date
2017-01-20 14:36:48 +05:30
Rohit Waghchaure
93c001455f
[Fix] Account user not able to access the report
2017-01-20 14:18:17 +05:30
Rohit Waghchaure
84b827efcd
[Fix] Budget not working properly
2017-01-20 12:33:50 +05:30
Rohit Waghchaure
2b97cee32c
[Fix] POS print issue
2017-01-18 13:21:27 +05:30
robert schouten
c0888637cc
[fix] accounts heatmaps now covering 366 days not 20
2017-01-18 15:25:58 +08:00
Nabin Hait
dd839055e3
Fixed merge conflict
2017-01-17 15:52:56 +05:30
Nabin Hait
1c91dc4589
Merge pull request #7475 from RobertSchouten/profitability_order
...
[fix] profiability analasyis orderby name
2017-01-17 12:39:24 +05:30
Rohit Waghchaure
f58cad6b13
[Fix] Calculate paid amount when is pos is enabled
2017-01-17 12:11:57 +05:30
Rushabh Mehta
6695830f3f
[fix] warehouse test cases
2017-01-16 16:57:53 +05:30
Nabin Hait
120461efef
Merge branch 'master' into develop
2017-01-16 13:04:54 +05:30
Rohit Waghchaure
685f89f2b7
[Fix] Discount not working in the POS
2017-01-14 20:47:56 +05:30
Rushabh Mehta
95439db53f
[fixes] address and contact
2017-01-14 00:25:22 +05:30
Rushabh Mehta
b92087cb2d
[cleanup] move contact, address to frappe 💥
2017-01-13 18:54:47 +05:30
Nabin Hait
b251cd4ccb
Fixed merge conflict
2017-01-13 14:34:54 +05:30
robert schouten
1a92d54dcb
[fix] profiability analasyis orderby cost center name
2017-01-13 14:52:11 +08:00
Nabin Hait
4bd42146ba
Merge pull request #7462 from rohitwaghchaure/minor_pos_issue
...
[Fix] POS issues
2017-01-13 11:55:52 +05:30
Nabin Hait
8f0c060578
Merge pull request #7447 from saurabh6790/tree_param_fix
...
[fix] provision to handle custom mandatory params while creating node
2017-01-13 11:50:18 +05:30
Nabin Hait
007c87ea63
Merge pull request #7440 from nabinhait/gle_repost_optimization
...
Optimization to reduce GLE reposting time for future stock transactions
2017-01-13 11:33:42 +05:30
robert schouten
d56627f2b7
[fix] profiability analasyis orderby project name
2017-01-13 11:53:43 +08:00
Rohit Waghchaure
8afe267813
[Fix] POS issues
2017-01-12 15:22:02 +05:30
Saurabh
056276c60e
[minor][fix] show date in user format
2017-01-11 15:50:09 +05:30
Saurabh
2f02101d7d
[fix] provision to handle custom mandatory params while creating node
2017-01-11 12:41:01 +05:30
Nabin Hait
c0eab41ec5
Fix for Budget against Project
2017-01-11 10:16:19 +05:30
Nabin Hait
6e9d2a3c1f
fixed conflict
2017-01-09 17:21:34 +05:30
Nabin Hait
8281b36a26
Merge pull request #7380 from KanchanChauhan/emailid-to-emailaddress
...
Email ID renamed to Email Address
2017-01-04 15:46:48 +05:30
Nabin Hait
f45851c245
Merge pull request #7379 from KanchanChauhan/accounts-reports
...
[Enhancement] Summary link on Accounts Payable and Accounts Receivable
2017-01-04 15:45:39 +05:30
Nabin Hait
96562e3eb7
Merge pull request #7362 from rmehta/minor-fixes
...
[minor] dont get warehouse in opening entry #7353
2017-01-04 15:42:23 +05:30
Nabin Hait
202bcc09d5
Merge pull request #7336 from rohitwaghchaure/pos_enhancement_and_issues
...
[Enhancement] POS features
2017-01-04 15:15:32 +05:30
Nabin Hait
3051a3dd97
Fixed test case for margin
2017-01-04 15:11:58 +05:30
Kanchan Chauhan
b7cc393eb8
Email ID renamed to Email Address
2017-01-03 16:45:38 +05:30
Kanchan Chauhan
f4832cf2b9
[Enhancement] Summary link on Accounts Payable and Accounts Receivable
2017-01-03 16:29:41 +05:30
Nabin Hait
1d88c65be4
Merge pull request #7374 from rohitwaghchaure/billed_report_enhancement
...
[Enhancement] Consolidated billed report, changed the report type from query to script
2017-01-02 17:40:51 +05:30
Nabin Hait
ab42fc006f
Merge branch 'master' into develop
2017-01-02 17:26:55 +05:30
Nabin Hait
7fc18f359c
Currency symbol for budget amount based on company
2017-01-02 17:21:34 +05:30
Nabin Hait
92254d3930
Set serial nos in DN based on FIFO based on Stock Settings
2017-01-02 17:01:27 +05:30
Rohit Waghchaure
5a383e5cdd
[Enhancement] Consolidated billed report, changed type from query to script
2017-01-02 16:20:43 +05:30
Nabin Hait
06966e8e1d
minor fix
2017-01-02 15:10:01 +05:30
Nabin Hait
9784d27317
Optimization to reduce GLE reposting time for future stock transactions
2016-12-30 16:21:35 +05:30
Rushabh Mehta
985cb8226d
[minor] dont get warehouse in opening entry #7353
2016-12-30 15:06:54 +05:30
Nabin Hait
e97d40806f
Merge branch 'master' into develop
2016-12-30 14:56:20 +05:30
Nabin Hait
9646be1d5d
[fix] Make Journal Entry against SO
2016-12-30 11:14:41 +05:30
Rohit Waghchaure
bef185c404
restrict user to edit the rate in the POS
2016-12-28 15:16:49 +05:30
Rohit Waghchaure
aa9b8603b9
added paid amount in print format
2016-12-27 17:43:23 +05:30
Rohit Waghchaure
fe7a5b305f
create customer from POS
2016-12-27 17:31:32 +05:30
Rohit Waghchaure
8c9c9cfc5f
When a new company is made, cash account should be automatically set for Mode of Payment
2016-12-27 17:31:32 +05:30
Nabin Hait
3bcf9b5e70
Fixed merge conflict
2016-12-27 14:30:17 +05:30
Rushabh Mehta
512b85e040
[minor] replace autocomplete with awesomplete
2016-12-27 12:14:37 +05:30
Nabin Hait
c2690425e3
Merge pull request #7310 from bhupennewalkar1337/hotfix
...
Fix #7202 unchecking pos will reflect automatically
2016-12-26 16:07:19 +05:30
bhupen
bcf63a2a8f
unchecking pos will reflect automatically
2016-12-23 18:00:18 +05:30
Nabin Hait
58291c77e9
Fixed version conflict
2016-12-23 17:43:42 +05:30
Nabin Hait
c2d66bdfb2
Merge branch 'master' into develop
2016-12-23 16:45:09 +05:30
Nabin Hait
0177c02c0f
Merge pull request #7286 from rohitwaghchaure/pos_letter_head_issue
...
minor fix
2016-12-23 15:19:32 +05:30
Rohit Waghchaure
dd58d537d5
[Fix] POS issue for serialized items
2016-12-21 17:55:40 +05:30
Rushabh Mehta
0632ee3da9
Merge branch 'v7.2.0-beta' into develop
2016-12-21 17:31:09 +05:30
Rushabh Mehta
c6bd7ade2f
[fix] inclusive tax + total bug and cleanup in stock entry get_uom, fixes #7253
2016-12-21 17:30:29 +05:30
Rohit Waghchaure
9df946e96c
[Fix] Warehouse is mandatory for packing materials on the sales invoice
2016-12-21 13:27:54 +05:30
Rohit Waghchaure
d567e57f82
minor fix
2016-12-21 13:18:36 +05:30
rohitwaghchaure
34e820d02d
[Enhancement] Added letter head for the report ( #7250 )
2016-12-20 16:54:24 +05:30
Nabin Hait
6eda07e445
Fixed merge conflict
2016-12-15 16:35:58 +05:30
Nabin Hait
f02f1bb0c7
Added standard filters
2016-12-15 14:57:20 +05:30
Nabin Hait
6a1c0665bc
Merge pull request #7227 from nabinhait/country_coa
...
Chart of accounts for few countries, added test cases for each country
2016-12-15 11:31:07 +05:30
Rushabh Mehta
e9d9b8e6f0
[fix] demo and process payroll for demo ( #7224 )
...
* [fix] demo and process payroll for demo
* [fix] set payroll dates
2016-12-15 11:27:35 +05:30
Nabin Hait
e3edfe2b12
Removed quick entry for tax rule
2016-12-14 18:44:27 +05:30
Nabin Hait
a756d64fca
Chart of accounts for some countries, added test cases for each country
2016-12-14 18:40:29 +05:30
Nabin Hait
a9ecc0b700
Merge branch 'master' into develop
2016-12-14 14:33:06 +05:30
Rohit Waghchaure
39712b5e1d
[Fix] Pricing rule issue
2016-12-14 14:12:20 +05:30
Nabin Hait
a933713f9d
Merge pull request #7208 from OluyomiKay/cashacct_bankreconciliation_dev
...
erpnext Include CashAccountType (eg. PettyCash) in BankReconciliation
2016-12-14 12:54:04 +05:30
Nabin Hait
3a8ea2a3bb
Merge pull request #7170 from rohitwaghchaure/pos_enhancement_v7_2
...
[POS] Provision to delete the offline records
2016-12-14 12:52:28 +05:30
OluyomiKay
8f8fd39855
erpnext Include Cash Account Type (eg. Petty Cash) in Bank Reconciliation
2016-12-14 13:25:58 +08:00
Nabin Hait
201af80706
Fixed merge conflict
2016-12-13 14:30:32 +05:30
Rohit Waghchaure
2976e56d23
[Fix] Ignore pricing rule not removed the discount percentage
2016-12-13 10:28:27 +05:30
Nabin Hait
f67799197d
Merge pull request #7189 from nabinhait/fix_10111
...
Rename and merging of Item and Warehouse
2016-12-12 17:27:38 +05:30
Rohit Waghchaure
9f2cc382a8
[POS] Provision to delete the offline records
2016-12-12 17:15:47 +05:30
Rohit Waghchaure
f4074c2029
[Fix] Budget variance report
2016-12-12 16:48:14 +05:30
Nabin Hait
142aab79bf
Fieldtype of payment url should be Small Text
2016-12-12 15:37:52 +05:30
Rohit Waghchaure
5664f8553e
[Fix] Item group missing in the POS profile
2016-12-12 12:28:07 +05:30
Saurabh
940084ed59
[minor][fix] show tax rate if account type is tax
2016-12-09 17:38:36 +05:30
Rushabh Mehta
81af229466
[minor] google analytics id in docs and minor fixes to web forms
2016-12-09 17:29:36 +05:30
Nabin Hait
58667ab123
Fixed merge conflict
2016-12-09 15:49:24 +05:30
Nabin Hait
00ae31bd1c
Merge pull request #7172 from nabinhait/hotfix
...
Issue fixed in Quality Inspection, P&L period and purchase register
2016-12-09 15:44:05 +05:30
Nabin Hait
6bfdd63ec8
Merge pull request #7171 from rohitwaghchaure/payment_entry_issue
...
[Fix] Payment entry showing wrong invoice amount
2016-12-09 15:11:38 +05:30
Nabin Hait
b00df641e0
Fixed period end date if year starts in the middle of the month
2016-12-09 15:09:11 +05:30
Nabin Hait
43df804176
Fixed renamed fieldname
2016-12-09 15:09:11 +05:30
Rohit Waghchaure
e505067887
[Fix] Payment entry showing wrong invoice amount
2016-12-09 12:55:29 +05:30
Nabin Hait
ad4f1c7fd1
date is optional in get_exchange_rate
2016-12-09 12:14:47 +05:30
Nabin Hait
352d95344e
Set exchange rate on change of date for Journal/Payment Entry
2016-12-08 16:06:47 +05:30
Nabin Hait
1cc55fbbcb
Fixed merge conflict
2016-12-08 14:09:23 +05:30
Nabin Hait
72c5aec68b
Merge pull request #7094 from manassolanki/budget
...
[Enhancement] Budget Against Project #7036
2016-12-08 13:52:33 +05:30
Nabin Hait
1b9caf90dd
Merge branch 'master' into develop
2016-12-08 12:33:54 +05:30
Manas Solanki
482fa672c2
[Fix] Patch for budget_against
2016-12-08 12:16:29 +05:30
Rohit Waghchaure
86ed030b5c
minor issue
2016-12-07 19:17:01 +05:30
Manas Solanki
2e0fbdeebe
[Fix] Test Case
...
- Previous test case fixed
- Additional test case for project against budget
2016-12-07 18:17:26 +05:30
Manas Solanki
17faa794bf
[Fix] More optimized code
2016-12-07 18:17:26 +05:30
Manas Solanki
5bd4d8a932
[Fix] Budget against Projects
...
- Test case fixed
- Either cost center or project is mandatory
2016-12-07 18:17:26 +05:30
Manas Solanki
1fa1fd7482
[Enhancement] Budget against Project
2016-12-07 18:17:26 +05:30
Nabin Hait
5c18bd9b61
Fixed merge conflict
2016-12-06 16:16:58 +05:30
Nabin Hait
3f1c50a483
Merge pull request #6920 from KanchanChauhan/delivery-note-serial-no-fifo
...
[Fix] Fetch Serial No by default for Delivery Note Item
2016-12-05 16:51:42 +05:30
Rushabh Mehta
323c06ebbf
[minor] rename icons as per FontAwesome 4 ( #7136 )
2016-12-05 14:17:26 +05:30
Kanchan Chauhan
af0d6378f1
[Fix] Fetch Serial No by default for Delivery Note Item
2016-12-02 18:18:04 +05:30
Nabin Hait
14a4c729b3
Merge pull request #7038 from KanchanChauhan/pricing-rule-in-shopping-cart
...
Apply Pricing Rule in Shopping Cart
2016-12-01 18:09:34 +05:30
Rohit Waghchaure
2e8a94458d
allow user to edit serial no for credit note, debit note
2016-12-01 16:04:41 +05:30
Nabin Hait
7f3da5dbb1
Fixed merge conflict
2016-11-28 14:23:51 +05:30
Nabin Hait
50a240e758
Merge pull request #7061 from rohitwaghchaure/cost_center_issue
...
[Fix] Cost center group not showing data in the P&L report
2016-11-28 12:42:48 +05:30
Nabin Hait
96be3dd4f4
Merge pull request #7082 from rohitwaghchaure/pos_qty_issues
...
[Fix] Wrong actual qty showing in POS
2016-11-28 12:39:09 +05:30
Nabin Hait
a78c463e97
Multiple minor fixes
2016-11-27 16:32:41 +05:30
Rohit Waghchaure
80f5bb6a6c
[Fix] Wrong actual qty showing in POS
2016-11-27 12:04:12 +05:30
Kanchan Chauhan
50593317d9
Added account types to Add Child option of COA
2016-11-26 18:49:32 +05:30
Rohit Waghchaure
bca0d73e1c
[Fix] Cost center group not showing data in the P&L report
2016-11-25 14:54:34 +05:30
Rohit Waghchaure
9a36083095
[fix] Barcode and special character issue in the search box of the POS
2016-11-25 11:17:48 +05:30
Nabin Hait
3247db4827
Merge pull request #7050 from nabinhait/coa_based_on_existing_company
...
Create Chart of Accounts based on existing company
2016-11-24 13:28:11 +05:30
Nabin Hait
926d72424d
Merge pull request #6699 from rohitwaghchaure/bom_price_list_issue
...
[Enhancement] Currency added in the BOM
2016-11-24 13:27:17 +05:30
Rohit Waghchaure
8c4e45ab3d
cleanup timesheet
2016-11-23 17:54:47 +05:30
Nabin Hait
e0089184e6
Create Chart of Accounts based on existing company
2016-11-23 17:34:16 +05:30
bhupen
c097a4fe68
Changes in company doctype for chart of accounts
2016-11-23 17:34:16 +05:30
Nabin Hait
f89f17cdde
Merge branch 'master' into develop
2016-11-23 16:00:22 +05:30
Nabin Hait
297d74a997
Unlink payment entries on cancellation of invoice
2016-11-23 15:59:00 +05:30
Nabin Hait
d194cce35c
fixed merge conflict
2016-11-23 14:55:23 +05:30
Nabin Hait
cf895c220c
Update account_tree.js
2016-11-23 14:44:07 +05:30
Saurabh
9342f650e0
[fix] remove root type selection while created new node and hooks call to initialize payment gateway
2016-11-23 14:06:14 +05:30
Kanchan Chauhan
2c1f399479
Apply Pricing Rule in Shopping Cart
2016-11-22 22:23:31 +05:30
Rohit Waghchaure
b1b328865e
[Enhancement] Currency added in the BOM
2016-11-22 12:52:20 +05:30
Nabin Hait
d855167b9b
Fixed merge conflict
2016-11-21 19:13:22 +05:30
Nabin Hait
651d8e996b
Merge pull request #7020 from nabinhait/balance_sheet_fix
...
Provisional Loss related fix in Balance Sheet. Fixed #6918
2016-11-21 19:06:42 +05:30
Nabin Hait
d01d74cafd
Merge pull request #7019 from nabinhait/fix_10014
...
Default warehouse is mandatory only for stock item in POS. Fixed #6893
2016-11-21 19:06:30 +05:30
Nabin Hait
3d5ef804b2
Provisional Loss related fix in Balance Sheet. Fixed #6918
2016-11-21 18:53:05 +05:30
Nabin Hait
977eff911f
Default warehouse is mandatory only for stock item in POS. Fixed #6893
2016-11-21 18:29:16 +05:30
Nabin Hait
fd23fa7c0b
Prifitability report link added to accounts module page
2016-11-21 16:59:03 +05:30
Nabin Hait
542bf8f7d4
Party filter and total row for opening and closing in trial balance for party report
2016-11-21 16:58:50 +05:30
Nabin Hait
e60d51b74c
Merge pull request #6969 from rohitwaghchaure/pos_syncing_issue_and_enhancement
...
User can able to add multiple item group, customer group in the POS profile.
2016-11-21 15:27:41 +05:30
Nabin Hait
c2f8dd71d7
Merge pull request #6965 from manassolanki/qa_redesign
...
[Fix] [Enhancement] Quality Inspection
2016-11-21 14:49:18 +05:30
Rohit Waghchaure
a27c417e48
fix master data sync performance issue
2016-11-20 23:41:13 +05:30
Nabin Hait
cbd26e3b2c
Manual Depreciation Schedule for Asset
2016-11-18 17:19:45 +05:30
Rohit Waghchaure
2a81960e0b
test cases
2016-11-18 15:33:11 +05:30
Rohit Waghchaure
801029e055
Added item groups, customer groups in the POS profile.
2016-11-18 15:32:48 +05:30
Nabin Hait
c29c5210f9
Merge pull request #6972 from RobertSchouten/bankstatement
...
[fix] update bank recon statement printing for payment entries
2016-11-18 12:50:40 +05:30
Nabin Hait
a3a59ea895
Merge pull request #6973 from RobertSchouten/bankrecon
...
[fix] layout for bank reconciliation
2016-11-18 12:49:16 +05:30
Nabin Hait
eae077e05d
Merge pull request #6989 from RobertSchouten/financialprint
...
[fix] financial printing and add to profitability
2016-11-18 12:44:50 +05:30
robert schouten
0a1f3e4058
[fix] financial printing and add to profitability
2016-11-18 10:54:01 +08:00
Rohit Waghchaure
2ef7c7ae5c
[Fix] Onload pull pos profile data for IS POS invoice
2016-11-17 17:29:10 +05:30
Nabin Hait
46753de6d7
fixed merge conflict
2016-11-17 15:55:11 +05:30
Saurabh
1d210968de
[fix] on advance payment entry cancellation delink invoice and pyament entry references
2016-11-17 15:21:46 +05:30
robert schouten
a943535520
[fix] update bank recon statement printing for payment entries
2016-11-17 14:33:28 +08:00
robert schouten
60fb1b8643
[fix] layout for bank reconciliation
2016-11-17 14:30:47 +08:00
Nabin Hait
8af429da1f
Cleanup and fixes in quality inspection feature
2016-11-16 17:22:38 +05:30
Manas Solanki
dbc2511a39
[Fix] Delivery Note fixed
2016-11-16 17:22:38 +05:30
Manas Solanki
a8d1bc7ff4
[Fix] Quality Inspection in Purchase Invoice fixed
2016-11-16 17:22:38 +05:30
Manas Solanki
c2cd3fd2c6
Function in parent transaction.js and call from corresponding files
2016-11-16 17:22:38 +05:30
Manas Solanki
cc90241fa5
Quality Inspection Issue
...
1. validate_inspection() function defination in stock_controller.py
2. function call in purchase_receipt.py, purchase_invoice.py and delivery_note.py
3. added functality in quality_inspection.py file for linking to purchase_receipt_no and delivery_note_no
2016-11-16 17:22:38 +05:30
Nabin Hait
535462fc20
Merge pull request #6947 from saurabh6790/delink_jv_from_advance
...
[fix] delink jv from advance table
2016-11-16 14:22:03 +05:30
Saurabh
8adbfa8a09
[test-case] test cases for delinking advance payments
2016-11-16 13:43:01 +05:30
Saurabh
866c295989
[fix] on jv cancel remove linkings from advance table of Sales/Purchase Invoice
2016-11-16 13:43:01 +05:30
Rohit Waghchaure
9b18ed4ffe
[Fix] Payment entry, exchange rate is not set properly
2016-11-16 12:24:40 +05:30
Rushabh Mehta
4bfa0748cd
[merge] master
2016-11-16 11:28:23 +05:30
rohitwaghchaure
48cb3d89b6
[Fix] Opening balance calculation issue for balance sheet ( #6945 )
2016-11-16 11:18:49 +05:30
Rushabh Mehta
24f658d633
[fix] [minor] accounts receivable not translated ( #6943 )
2016-11-16 11:13:46 +05:30
Nabin Hait
95e6ccd419
Merge branch 'master' into develop
2016-11-14 12:42:26 +05:30
Nabin Hait
0075c7e659
Purchase Order and Receipt links in Purchase Invoice dashboard
2016-11-14 12:32:16 +05:30
Nabin Hait
7017dc029a
Editable grid columns for payment entry
2016-11-14 12:32:16 +05:30
Rohit Waghchaure
387c2846aa
[Report] Company not found in the filter for making auto email report
2016-11-10 19:13:20 +05:30
Nabin Hait
ceca1b97c3
Fixed merge conflict
2016-11-09 14:58:36 +05:30
Rohit Waghchaure
2285f90b64
added debit and credit note status
2016-11-09 14:47:24 +05:30
Nabin Hait
5ccead5df0
Merge pull request #6850 from nabinhait/clear_jv_table
...
Clear rows from Journal Entry if no debit/credit
2016-11-09 11:40:42 +05:30
Nabin Hait
d4e59aa54f
Update journal_entry.py
2016-11-09 11:38:39 +05:30
Nabin Hait
a0a8cc58ae
Merge pull request #6865 from frappe/typo-fix
...
[fix] minor typo
2016-11-09 11:20:34 +05:30
Rohit Waghchaure
2f1db57fe1
Added status field in sales invoice and purchase invoice
2016-11-08 18:49:58 +05:30
Nabin Hait
a469e659c5
Fixed merge conflict
2016-11-08 15:26:27 +05:30
Valmik
38cc16a806
[fix] minor typo
2016-11-08 14:11:12 +05:30
Nabin Hait
be06cde5f5
Update gl_entry.py
2016-11-08 13:13:57 +05:30
Nabin Hait
cdc895734f
Merge pull request #6819 from rohitwaghchaure/hotfix_issues
...
cleanup and fixes
2016-11-08 12:05:47 +05:30
Rohit Waghchaure
619c40b04a
[POS] Pricing rule discount issue
2016-11-07 19:41:10 +05:30
Rushabh Mehta
13fc52d713
[minor] added default standard filters ( #6854 )
2016-11-07 17:19:19 +05:30
Nabin Hait
43eeddfaf6
Clear rows from Journal Entry if no debit/credit
2016-11-07 15:25:40 +05:30
Rohit Waghchaure
0ecad33642
cleanup and fixes
2016-11-05 08:09:21 +05:30
Nabin Hait
f5d8dd3b18
Fixed merge conflict
2016-11-04 16:54:53 +05:30
Nabin Hait
81f7a265bc
Merge pull request #6723 from rohitwaghchaure/enhancement_remember_last_selected_value
...
Remember last selected value for link field
2016-11-04 16:13:49 +05:30
Rohit Waghchaure
0d2f7e62c0
set remember last selected value as true for company field
2016-11-03 16:19:34 +05:30
Nabin Hait
eab38cd4eb
Merge branch 'master' into develop
2016-11-03 15:17:39 +05:30
Nabin Hait
ceca7fbc87
Merge pull request #6780 from rohitwaghchaure/float_issue
...
Change fieldtype from float to currency
2016-11-03 10:49:05 +05:30
Nabin Hait
c3b29f6a5b
Merge pull request #6738 from KanchanChauhan/name-on-check
...
Different name on Check
2016-11-01 17:29:04 +05:30
Rohit Waghchaure
60e5e4ac2d
change fieldtype from float to currency
2016-11-01 16:32:33 +05:30
Nabin Hait
f4068fd6f1
Fixed merge conflict
2016-11-01 15:06:55 +05:30
Rohit Waghchaure
53bb687009
hotfix issues
2016-11-01 13:21:43 +05:30
Kanchan Chauhan
6b162386ca
Different name on Check
2016-10-31 17:36:43 +05:30
Nabin Hait
551360ae30
Fixed merge conflict
2016-10-31 16:38:09 +05:30
Nabin Hait
f5f3ef1bae
repost gle for Purchase Invoice with update stock
2016-10-31 16:17:10 +05:30
Nabin Hait
bb5e333c1a
Update ae_uae_chart_template_standard.json
2016-10-28 15:20:31 +05:30
Saurabh
468e41f24f
[enhance] introduce ignore_fields param for _tree and get_query
2016-10-27 15:23:19 +05:30
Nabin Hait
622c05cc60
Merge pull request #6724 from rohitwaghchaure/bank_clearance_report_issue
...
[Fix] No permission to read report Bank Clearance Summary for account user
2016-10-27 13:48:19 +05:30
Rohit Waghchaure
53a28eb39d
[Fix] No permission to read report Bank Clearance Summary for account user
2016-10-27 11:46:10 +05:30
Nabin Hait
72a1943c8e
Fixed version conflict
2016-10-26 16:41:21 +05:30
Kanchan Chauhan
dc3198a11c
[Fix] Error in Balance Sheet Report
2016-10-26 13:05:08 +05:30
Nabin Hait
ffd2fc5101
[fix] Validate if warehouse is not linked to any account
2016-10-24 18:54:07 +05:30
Rohit Waghchaure
43b508089e
[Fix] Pricing rule discount issue
2016-10-24 16:16:24 +05:30
Neil Trini Lasrado
5ddd7acdbd
Typo fix
2016-10-24 15:25:47 +05:30
Rohit Waghchaure
18fa0d8691
patch to set default value as 1
2016-10-20 16:16:28 +05:30
Rohit Waghchaure
7917ff6936
Test cases
2016-10-20 16:11:22 +05:30
Rohit Waghchaure
8055bd39ba
[Feature] Provision to allow unlink the payment against the invoice
2016-10-20 16:11:22 +05:30
Rohit Waghchaure
d23835be84
[Feature] Countrywise sales tax template
2016-10-20 15:56:07 +05:30
Kanchan Chauhan
025fbd8f14
Customer group added to Gross Profit report
2016-10-20 12:54:06 +05:30
Nabin Hait
0702fa2fc6
Fixed version conflict
2016-10-19 16:49:36 +05:30
Saurabh
afceac620c
[fix] calculate variance only for submitted budgets
2016-10-19 12:49:48 +05:30
Nabin Hait
fa1cdd5bf0
Fixed merge conflict
2016-10-18 15:37:33 +05:30
Nabin Hait
f32547a414
Merge pull request #6637 from nabinhait/cost_center_fix
...
Set cost center while creating invoice from SO/PO
2016-10-18 15:18:16 +05:30
Rushabh Mehta
17f6874450
[minor] [fix] doctype_dasboard.py files, move data to get_data
2016-10-18 14:54:39 +05:30
Nabin Hait
55a8797919
Set cost center while creating invoice from SO/PO
2016-10-18 14:54:17 +05:30
Nabin Hait
437b32d32c
Added filter to show unclosed fiscal year's P&L balances in trail balance
2016-10-17 16:57:52 +05:30
Nabin Hait
425bdee0ec
Merge branch 'unclosed_finance' of https://github.com/RobertSchouten/erpnext into RobertSchouten-unclosed_finance1
2016-10-17 16:46:54 +05:30
Nabin Hait
395d757c5a
Fixed merge conflict
2016-10-17 16:42:49 +05:30
Saurabh
afa14fc402
[fix][minor] ( #6449 )
2016-10-10 17:17:17 +05:30
Nabin Hait
fc90758932
Merge pull request #6589 from rohitwaghchaure/purchase_invoice_validation_issue
...
[Fix] Purchase invoice validation issue
2016-10-10 11:51:00 +05:30
Rohit Waghchaure
3485d2467a
[Fix] Purchase invoice validation issue
2016-10-09 18:05:17 +05:30
Rohit Waghchaure
6f33dfbc56
[Fix] wildcard search for pos not working
2016-10-09 15:32:56 +05:30
Rushabh Mehta
ac5b193100
[minor] direct student admission to the list page
2016-10-09 15:19:23 +05:30
Nabin Hait
cd9c45f816
Fixed merge conflict
2016-10-07 16:53:07 +05:30
Nabin Hait
77ede941b0
Merge pull request #6550 from rohitwaghchaure/make_payment_using_journal_entry
...
[Enhancement] Option to make payment via Journal Entry
2016-10-06 17:07:11 +05:30
Rohit Waghchaure
7d5298997b
Documentation for payments
2016-10-06 16:49:39 +05:30
Nabin Hait
1397159bc1
Merge pull request #6561 from rohitwaghchaure/remove_sales_invoice_from_scheduler_log
...
removed sales invoice from scheduler log
2016-10-06 15:32:55 +05:30
Rohit Waghchaure
297fbcd388
removed sales invoice from scheduler log
2016-10-06 12:40:09 +05:30
Rohit Waghchaure
b7a5502b97
[Enhancement] Option to make payment via Journal Entry
2016-10-06 12:04:52 +05:30
Nabin Hait
558f526a68
Fixed version conflict
2016-10-05 17:18:36 +05:30
Nabin Hait
cccc45edc5
Don't throw expense account validation on fetching item details
2016-10-05 17:15:53 +05:30
Rohit Waghchaure
e86eaf543c
removed sync master data onload of the pos page
2016-10-05 14:45:15 +05:30
Rohit Waghchaure
163e3598c7
[Fix] POS wildcard search for customers, items
2016-10-05 13:52:17 +05:30
Nabin Hait
babafb8d01
Merge pull request #6531 from saurabh6790/je_currency_symbol_fix
...
[fix] currency symbol for total amount in JE
2016-10-05 13:12:59 +05:30
Rohit Waghchaure
712b871f06
Change project location in sales invoice
2016-10-05 12:45:56 +05:30
Nabin Hait
efa68fb6b8
Fixed version conflict
2016-10-04 17:27:02 +05:30
Nabin Hait
cf87027422
Merge pull request #6537 from rohitwaghchaure/pos_multi_company_issue
...
[Fix] Multi company issue for POS
2016-10-04 16:20:24 +05:30
Rohit Waghchaure
82be020ae9
sync offline sales invoices from the POS
2016-10-04 12:58:48 +05:30
Rohit Waghchaure
6f1d012b65
[Fix] Multi company issue for POS
2016-10-04 12:18:59 +05:30
Saurabh
f24d523fc9
[fix] currency symbol for total amount in JE
2016-10-04 11:29:26 +05:30
Nabin Hait
7fb79d175f
Fixed version conflict
2016-10-03 18:05:34 +05:30
Nabin Hait
d114aca20d
GL Entries for Purchase Invoices with Update Stock option checked and having non-stock items
2016-10-03 17:36:28 +05:30
Nabin Hait
5fd5a77750
Fixed version conflict
2016-10-03 14:13:50 +05:30
Nabin Hait
e8519938e0
Merge pull request #6525 from rohitwaghchaure/minor_pos
...
[Fix] disable apply discount on pos
2016-10-03 14:10:44 +05:30
Nabin Hait
10a48ea5e9
Merge pull request #6527 from rohitwaghchaure/budget_issue
...
[Fix] company key error during cancellation of stock entry
2016-10-03 14:05:10 +05:30
Rohit Waghchaure
b1391ca635
[Fix] company key error during cancellation of stock entry
2016-10-03 12:25:04 +05:30
Rohit Waghchaure
6f3d04caf7
[Fix] Disable apply discount on
2016-10-03 11:46:04 +05:30
Nabin Hait
b498eb5f9e
Minor fix AR/AP
2016-10-01 15:51:59 +05:30
Rohit Waghchaure
c1a3e379d8
[Fixed] Accounts receivable concat issue
2016-09-30 13:18:06 +05:30
Nabin Hait
80499bb657
Fixed merge conflict
2016-09-29 14:18:53 +05:30
Nabin Hait
2c452a6881
Merge pull request #6485 from rohitwaghchaure/enhancement_payment_entry
...
[Enhancement] Added allocate payment amount checkbox in Payment Entry
2016-09-29 13:57:48 +05:30
Nabin Hait
424bffc98b
Merge pull request #6486 from nabinhait/stock_trans_repost
...
Reposting of GLE and SLE for all stock transactions
2016-09-29 13:51:51 +05:30
Nabin Hait
f1d2fd2436
[fix] Accounts Receivable report if negative write off in invoice
2016-09-29 13:03:10 +05:30
Rohit Waghchaure
f21f1af0c9
[Enhancement] Added allocate payment amount checkbox in Payment Entry
2016-09-28 18:24:17 +05:30
Nabin Hait
b3bc41131e
Reposting of GLE and SLE for all stock transactions
2016-09-28 18:17:52 +05:30
Kanchan Chauhan
b40c0a917d
[WIP] Process Payroll Changes
2016-09-28 15:14:41 +05:30
Rohit Waghchaure
7441a93a10
[Fix] sub-heading is missing in the excel sheet of the cash flow
2016-09-28 14:57:57 +05:30
Nabin Hait
ba03ef775d
Fixed merge conflict
2016-09-28 10:47:41 +05:30
Nabin Hait
45f05d2c9b
Merge pull request #6465 from saurabh6790/hotfix
...
[fix] ledger view from coa
2016-09-28 10:44:40 +05:30
Nabin Hait
706612bcd4
Fixed version conflict
2016-09-26 18:11:56 +05:30
Nabin Hait
7faa4b5fdf
Merge pull request #6455 from rohitwaghchaure/retun_field_duplicate_issue
...
[Fix] Allow renaming for UOM, When Duplicate Is Return field should not be copied #5510 #6288
2016-09-26 17:57:28 +05:30
Saurabh
5874a76eac
[fix] ledger view from coa
2016-09-26 16:14:15 +05:30
Rushabh Mehta
fc800b3f2f
[enhance] added roles for portal users frappe/frappe#2091 ( #6452 )
2016-09-23 21:51:51 +05:30
Rohit Waghchaure
d728f5a429
[Fix] Allow renaming for UOM, When Duplicate Is Return field should not be copied #5510 #6288
2016-09-23 18:06:24 +05:30
pawan
09f1ee637e
[fix] #6371
2016-09-23 17:19:54 +05:30
Nabin Hait
6b4eb7f77f
Fixed version conflict
2016-09-23 12:16:31 +05:30
Nabin Hait
d03087d3ab
Patch fixed for legacy migration
2016-09-23 11:08:02 +05:30
Rohit Waghchaure
b2382c0b8e
[fix] Supplier status stuck at Open forever
2016-09-22 18:45:24 +05:30
Rohit Waghchaure
481ca832b0
minor fix
2016-09-22 17:21:37 +05:30
Nabin Hait
d64454b1c1
Merge pull request #6433 from RobertSchouten/validate_sale_ware
...
[fix] si validate warehouse if is_stock item
2016-09-22 11:41:36 +05:30
Nabin Hait
e5c7d4b987
Fixed version conflict
2016-09-22 11:33:51 +05:30
Nabin Hait
a58a65457f
Sales Register report minor fix
2016-09-22 11:31:42 +05:30
robert schouten
f91ca3a450
[fix] si validate warehouse if is_stock item
2016-09-22 13:07:00 +08:00
Nabin Hait
0be6073f10
Fixed version conflict
2016-09-21 13:06:19 +05:30
Nabin Hait
aac32d644d
Fix in Sales Register for multiple mode of payments
2016-09-21 11:46:07 +05:30
Nabin Hait
a36325c6e5
Merge pull request #6403 from saurabh6790/treeview_quick_entry_fix
...
[fix] minor fix to accomodate custom fields in tree popup
2016-09-20 18:06:49 +05:30
Nabin Hait
b015f1b647
Fixed version conflict
2016-09-20 16:53:02 +05:30
RobertSchouten
8d43b32c2c
improvements to email digest ( #6323 )
2016-09-20 11:11:39 +05:30
Nabin Hait
383cb43135
Merge pull request #6393 from KanchanChauhan/gl-fix
...
Against Voucher Type and Against Voucher added to GL
2016-09-19 19:35:55 +05:30
Saurabh
9aacf46c51
[fix] minor fix to accomodate custom fields in tree popup
2016-09-19 16:45:35 +05:30
Kanchan Chauhan
006a0e68bf
Against Voucher Type and Against Voucher added to GL
2016-09-19 13:44:52 +05:30
Chude Osiegbu
3c6a937a7c
Merge branch 'develop' into exchange_rate_modifications
2016-09-18 21:47:55 +01:00
Rohit Waghchaure
3c4cdd2a94
[Fix] Added base_url, print_css in pos
2016-09-19 00:17:32 +05:30
Nabin Hait
5bab04fead
Merge pull request #6381 from rmehta/lead-source
...
[enhance] added Lead Source master, fixes #6231
2016-09-16 16:58:40 +05:30
Saurabh
9919a0a9db
[fix] #5992
2016-09-16 16:47:03 +05:30
Rushabh Mehta
39b5d39df6
[fix] remove campaign depends on
2016-09-16 15:55:34 +05:30
Rushabh Mehta
59dc0ece9f
[enhance] added Lead Source master, fixes #6231
2016-09-16 11:44:49 +05:30
Nabin Hait
759ef4c00d
Allowed past dates in next depreciation date
2016-09-15 12:24:33 +05:30
Nabin Hait
d5ebd79ad7
Fixed version conflict
2016-09-14 15:50:22 +05:30
Nabin Hait
e9fa81c286
Merge pull request #6327 from rohitwaghchaure/timesheet_enhancement
...
[Enhancement] Timesheet billing based on project
2016-09-14 15:31:54 +05:30
Rohit Waghchaure
b78eb2b6f2
[Fix] Financial Statements reports are running very slow
2016-09-14 13:33:27 +05:30
Rohit Waghchaure
0568238786
rename total_billing_hours to total_billable_hours in timesheet doctype
2016-09-12 23:00:24 +05:30
Rohit Waghchaure
7b6fdb77d0
rename total_billing_amount to total_billable_amount in timesheet doctype
2016-09-12 19:06:41 +05:30
Rohit Waghchaure
97a82714de
[Fix] so_dn_required for pos and stock update invoice
2016-09-12 18:04:17 +05:30
Nabin Hait
97b661f995
Merge pull request #6334 from RobertSchouten/patch-27
...
[fix] itemwise sales register add sales invoice to delivery note when…
2016-09-12 17:53:10 +05:30
Nabin Hait
1d8d93d9ad
Update balance_sheet.py
2016-09-12 17:43:14 +05:30
Nabin Hait
0a7c0f4418
Merge pull request #6338 from RobertSchouten/report_names
...
add customer and supplier names to some reports
2016-09-12 17:36:46 +05:30
Nabin Hait
014c30c90d
Merge pull request #6339 from rohitwaghchaure/pos_enhancement
...
[Enhancement] POS changes and fixes
2016-09-12 17:35:40 +05:30
Nabin Hait
33a20bdb13
Merge pull request #6340 from nabinhait/se_difference_account
...
Remove Difference Account field from Stock Entry parent form
2016-09-12 17:34:59 +05:30
Rushabh Mehta
daee449063
[fix] for print format draft ( #6346 )
2016-09-12 16:42:36 +05:30
pawan
af111e9c43
[fix] #6195
2016-09-12 15:16:23 +05:30
Rohit Waghchaure
e1d59d6dde
test cases and minor changes
2016-09-12 13:27:28 +05:30
Rohit Waghchaure
1d0e8ea9c6
minor changes
2016-09-12 13:27:27 +05:30
Rohit Waghchaure
3815ebff8a
Added %billed in timesheet
2016-09-12 13:27:27 +05:30
Rohit Waghchaure
a6927e05ba
set project wise timesheet data
2016-09-12 13:27:27 +05:30
Rohit Waghchaure
cc8644f86e
[Timesheet] Field rearrange
2016-09-12 13:27:27 +05:30
Nabin Hait
a36a88b6de
Remove Difference Account field from Stock Entry parent form
2016-09-12 13:15:59 +05:30
Rohit Waghchaure
60a05324ce
POS changes and fixes
2016-09-12 13:11:10 +05:30
Nabin Hait
294664b24c
Merge pull request #6267 from PawanMeh/fixes_6254
...
[fix] #6254
2016-09-12 13:03:14 +05:30
robert schouten
4fc70d962b
add customer and supplier names to some reports
2016-09-12 15:23:51 +08:00
robert schouten
ea3b342dde
fix display unclosed values for trial/balance/sheet
2016-09-12 14:37:58 +08:00
RobertSchouten
bd979ec1ed
[fix] itemwise sales register add sales invoice to delivery note when update stock
...
in item wise sales register put sales invoice into delivery note field when delivery note is null and update stock ticked
2016-09-12 09:46:10 +08:00
Saurabh
b835fef8ac
[enhancement] modify payment request to get payment url ( #6097 )
...
* [enhancement] modify payment request to get payment url
* redirect to payment url if payment initiated via shopping cart
2016-09-09 11:19:22 +05:30
Nabin Hait
0a0df2e433
fixed version conflict
2016-09-07 17:01:47 +05:30
Nabin Hait
23147ff881
Patch fixed
2016-09-07 16:59:55 +05:30
Nabin Hait
c16c0ca944
Merge pull request #6310 from rohitwaghchaure/pos_itemwise_tax_issue
...
[Fix] Item level taxes are not getting calculated in POS
2016-09-07 15:59:32 +05:30
Rohit Waghchaure
525900c5c1
[Fix] Item level taxes are not getting calculated in POS
2016-09-07 15:01:08 +05:30
Chude Osiegbu
fbf27b5031
Further corrections to Currency Exchange table
2016-09-07 03:06:08 +01:00
pawan
7b2bd20a09
[fix] #6254
2016-09-06 18:28:41 +05:30
Nabin Hait
b8b228ed14
Fixed version conflict
2016-09-06 17:56:32 +05:30
RobertSchouten
5ae21053bd
fix for closing balance typo
2016-09-06 15:44:09 +08:00
Rohit Waghchaure
377c7acd53
[POS] Added offline_pos_name in print format
2016-09-05 17:59:01 +05:30
Nabin Hait
406f0a38de
Fixed merge conflicts
2016-09-05 15:44:18 +05:30
Nabin Hait
8693b5c93a
Minor fixes
2016-09-05 11:51:45 +05:30
pawan
bd9a275d5f
[fix] #6254
2016-09-02 16:51:22 +05:30
Nabin Hait
15b26d8b1a
Fixed merge conflicts
2016-09-02 14:29:57 +05:30
Nabin Hait
5a4ca64c4a
Party name in Payment Entry and cheque print format
2016-09-02 14:20:01 +05:30
Nabin Hait
f8e374643c
Merge pull request #6257 from nabinhait/letter_head_in_report
...
Default letter head in report printing based on selected company
2016-09-02 14:17:12 +05:30
Saurabh
ff910f4c72
[fixes] set filter for warehouse
2016-09-02 13:39:05 +05:30
Nabin Hait
13b37c6346
Default letter head in report printing based on selected company
2016-09-02 11:25:42 +05:30
Rushabh Mehta
b2f0920346
[minor] new global for query report filters
2016-09-01 17:53:42 +05:30
Nabin Hait
2490ea0b91
Fixed merge conflict
2016-09-01 12:29:31 +05:30
Rohit Waghchaure
774ce63b75
remove mode of payment, migrate mode of payment from v6 to v7
2016-08-31 21:21:41 +05:30
Rohit Waghchaure
879cb6ebee
[POS] Fixed POS Sales Invoice when Payment Table is Empty
2016-08-31 14:41:48 +05:30
Nabin Hait
566759acae
Merge pull request #6211 from rohitwaghchaure/v7.1_fixes
...
[Fix] Billing Hours showing blank on sales invoice
2016-08-31 12:12:48 +05:30
Rohit Waghchaure
a2bf16bfaa
[Fix] Billing Hours showing blank on sales invoice
2016-08-29 13:37:13 +05:30
Nabin Hait
338e63c448
Fixed version conflict
2016-08-29 11:47:50 +05:30
Rohit Waghchaure
63bdd679d0
[POS] Fixes and cleanup
2016-08-27 02:53:36 +05:30
Kanchan Chauhan
dd96cbd012
Coded column deleted, column added from UI
2016-08-26 14:32:38 +05:30
Nabin Hait
4403cf71b5
Merge pull request #6152 from rohitwaghchaure/profitability_report
...
[Report] Profitability Analysis
2016-08-26 13:21:01 +05:30
Rohit Waghchaure
0cb171feb2
[Enhancement] Added billing hours for account user in timesheet
2016-08-26 13:17:46 +05:30
Nabin Hait
e334813daf
Merge pull request #6166 from neilLasrado/demo
...
Merged Schools Demo into ERPNext
2016-08-26 13:05:43 +05:30
Rohit Waghchaure
6462ba4e0b
minor changes
2016-08-26 12:42:52 +05:30
Nabin Hait
0da75aede3
Fixed merge conflict
2016-08-26 12:40:02 +05:30
Nabin Hait
06b27757ab
Merge pull request #6179 from rohitwaghchaure/minor_fix_patch
...
[Sales Return] Minor fix in patch
2016-08-26 12:33:33 +05:30
Rohit Waghchaure
e21e1ebae2
[Sales Return] Minor fix in patch
2016-08-26 12:31:41 +05:30
Nabin Hait
0a99b4347b
Party mandatory message
2016-08-26 12:30:45 +05:30
Nabin Hait
a26bb96d2d
Merge pull request #6178 from nabinhait/status_updater_fix
...
Ignore validating billed amount against order if order item amount is zero
2016-08-26 12:09:39 +05:30
Nabin Hait
47a3f639ed
Ignore validating billed amount against order if order item amount is zero
2016-08-26 11:39:39 +05:30
Neil Trini Lasrado
067245933e
Fixed Demo
2016-08-25 18:31:42 +05:30
Rohit Waghchaure
efb5bf2cfc
[POS] Fixed payment gl entry for sales return
2016-08-25 16:23:47 +05:30
Rohit Waghchaure
1e8732abc2
removed old report
2016-08-24 19:20:58 +05:30
Rohit Waghchaure
5794ffd43d
added filters project and cost center in profit and loss statement, open profit and loss statement on click of cost center/project in profitability analysis
2016-08-24 19:12:14 +05:30
Rohit Waghchaure
1255a6627e
project based profitability Analysis
2016-08-24 18:01:39 +05:30
Rohit Waghchaure
78e08b8af5
[Report] Profitability Analysis
2016-08-24 18:00:22 +05:30
Rohit Waghchaure
fb432821bf
[Report] Cost center wise profitability
2016-08-24 18:00:22 +05:30
Nabin Hait
cfbd0199eb
Merge branch 'master' into develop
2016-08-23 12:10:56 +05:30
Nabin Hait
26f9673ad9
Merge pull request #6126 from rohitwaghchaure/multiyear_financial_statements
...
[Enhancement] Multi year financial statements
2016-08-23 11:32:08 +05:30
Rohit Waghchaure
ca4d9b54cd
fixed accumulated values for cash flow
2016-08-22 17:51:58 +05:30
Pawan Mehta
bee3b40725
Update gross_profit.py
2016-08-22 17:47:13 +05:30
pawan
18bb431baa
[fix] #6089
2016-08-22 17:27:22 +05:30
pawan
851e05672c
[fix] #6089
2016-08-22 14:25:17 +05:30
Rohit Waghchaure
26b646f8a3
Added validation for fiscal year
2016-08-21 17:14:12 +05:30
Rohit Waghchaure
713e2b7b62
[POS] Fixed issue of paid amount, write off account
2016-08-19 19:27:16 +05:30
Rohit Waghchaure
4275c30059
[Enhancement] Multi year financial statements
2016-08-19 18:04:32 +05:30
Nabin Hait
b5951b72f3
Merge pull request #5924 from KanchanChauhan/salary-structure-changes
...
Formula based Salary Structure
2016-08-18 16:39:58 +05:30
Nabin Hait
f04ce3c5a6
[fix] check expense agaist budget
2016-08-18 16:14:23 +05:30
Nabin Hait
50f8262ac7
Currency fix in reports
2016-08-18 16:14:23 +05:30
Rohit Waghchaure
9d5a07d101
[POS] Fixed stock update issue
2016-08-18 13:27:06 +05:30
Kanchan Chauhan
bccf0fa041
[WIP] Formula based Salary Structure and multiple employees for same Salary Structure
2016-08-18 13:02:39 +05:30
Rushabh Mehta
b7bc6bd75d
[fix] better message for cost center, fixes #6109
2016-08-18 12:50:58 +05:30
Rushabh Mehta
b969c2cb60
[minor] budget link in cost center, fixes #6093
2016-08-18 12:36:20 +05:30
Nabin Hait
6fe3ac49cf
Merge pull request #6039 from rohitwaghchaure/allow_to_edit_change_amount
...
Allow to edit change amount
2016-08-17 17:08:54 +05:30
Rohit Waghchaure
e4e69ec027
changed field name, validation for change amount account, validation for serial no qty
2016-08-17 16:20:13 +05:30
Nabin Hait
95c998109d
Merge pull request #6043 from aruizramon/purchase-taxes-client-validation
...
Validate on changing from Total to Valuation/Valuation&Total when add…
2016-08-17 12:12:14 +05:30
Nabin Hait
4da2c81641
Merge pull request #6094 from rmehta/sales-purchase-items
...
[revert] is_sales_item, is_purchase_item back
2016-08-17 11:30:37 +05:30
Rushabh Mehta
d973c1606a
[revert] is_sales_item, is_purchase_item back
2016-08-16 11:32:08 +05:30
Rohit Waghchaure
9cd356c7f0
[POS] Fixed print qty decimal issue
2016-08-16 10:44:21 +05:30
Rohit Waghchaure
033ed00c56
[POS] fixed issue of negative stock
2016-08-11 16:37:29 +05:30
Rushabh Mehta
6c0d9579d2
Merge pull request #6055 from rohitwaghchaure/bank_reconciliation_statement_report_issue
...
[Fix] No permission to read DocType for account user in bank reconciliation statement report
2016-08-11 10:55:10 +05:30
Rohit Waghchaure
e78ef5f8c8
[Fix] No permission to read DocType for account user in bank reconciliation statement report
2016-08-11 00:46:15 +05:30
Rohit Waghchaure
315a5e1b4d
[Fix] Debit and credit not equal for purchase invoice, if update stock is yes and taxes is defined
2016-08-11 00:35:00 +05:30
Rushabh Mehta
a7d92bc8f6
Merge pull request #6050 from rohitwaghchaure/pos_serial_no_search_issue
...
[Fix] Serial no search issue, if serial no is similar with item code.
2016-08-10 18:52:17 +05:30
Rohit Waghchaure
ea5a32d304
[Fix] Searial no search issue, if serial no is similar with item code
2016-08-10 17:18:52 +05:30
Rushabh Mehta
185c247286
Merge pull request #6024 from rohitwaghchaure/get_account_of_payment_mode_issue
...
[Fix] Get account of the mode of payment on sales invoice and pos profile
2016-08-10 14:25:42 +05:30
pawan mehta
399a4bf201
[fix] #5723
2016-08-10 13:20:16 +05:30
Rohit Waghchaure
70be24d6f0
[Fix] Get account of the mode of payment on sales invoice and pos profile
2016-08-10 13:16:39 +05:30
aruizramon
8bd2487533
semicolon
2016-08-09 16:04:45 -04:00
Alec Ruiz-Ramon
08fb39f1ba
Validate on changing from Total to Valuation/Valuation&Total when add_deduct_tax is 'Deduct'
2016-08-09 15:38:34 -04:00
Rohit Waghchaure
baef2624a2
Given provision to enter write off and change amount on POS
2016-08-10 00:50:53 +05:30
Rushabh Mehta
ec2d09c557
[minor] setting up website optional in setup wizard
2016-08-09 16:44:37 +05:30
Rohit Waghchaure
c41ab8d15b
Added change amount account
2016-08-08 23:19:18 +05:30
Rohit Waghchaure
7127a8f522
Allow user to edit change amount from sales invoice form for is pos
2016-08-08 23:19:18 +05:30
Nabin Hait
ae65172dca
Added 'Ledger' button to show accounting entries against PCV
2016-08-08 15:44:45 +05:30
Nabin Hait
d261d40c7e
Fixed test cases for period closing voucher
2016-08-08 15:44:45 +05:30
Nabin Hait
99d4ff4a29
Repost gle for future transactions if update stock checked in back dated purchase invoice
2016-08-08 14:12:58 +05:30
Nabin Hait
3ef6e7847e
Merge pull request #6010 from rohitwaghchaure/minor_fix_pos
...
[Fix] pos ambiguous issue
2016-08-08 12:40:28 +05:30
Nabin Hait
2cb8c6a867
Merge pull request #6015 from nabinhait/ar_ap_cols
...
[fix] Label for ageing cols in AR/AP report
2016-08-08 12:37:19 +05:30
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
