Ishan Loya
|
0dbe8547e7
|
Add screenshot to documentation, change naming series to BG-#####, make Bank Guarantee number unique
|
2017-04-25 16:08:22 +05:30 |
|
Ishan Loya
|
e1ed5ba726
|
Remove commented out code
|
2017-04-25 16:08:22 +05:30 |
|
Ishan Loya
|
0fc57a7df2
|
Change doctype owner
|
2017-04-25 16:08:22 +05:30 |
|
Ishan Loya
|
c7a72684fd
|
Add bank guarantee doctype with documentation
|
2017-04-25 16:08:22 +05:30 |
|
Nabin Hait
|
9b20e07431
|
[fix] currency field precision
|
2017-04-25 14:09:29 +05:30 |
|
mbauskar
|
9cf6d630e9
|
[minor] fixes for expense claim status
|
2017-04-25 13:15:50 +05:30 |
|
Nabin Hait
|
e3c122d8c4
|
AR report: filter based on customer group and credit days based on field. Fixed #8214
|
2017-04-24 19:06:07 +05:30 |
|
Rohit Waghchaure
|
dd70fbfdae
|
[fix] Letter head not showing in the report
|
2017-04-24 18:57:51 +05:30 |
|
mbauskar
|
bb2670d57a
|
[fixes] minor fixes in bank reconciliation form and report
|
2017-04-24 10:23:50 +05:30 |
|
mbauskar
|
c3d642e5d1
|
[minor] allow bulk edit for doctype
|
2017-04-21 17:50:40 +05:30 |
|
Nabin Hait
|
68ae9f3f88
|
Merge branch 'develop' into allow_on_submit_fix
|
2017-04-19 21:10:23 +05:30 |
|
mbauskar
|
8f3cc81302
|
[minor] minor fixes in pricing_rule and set_missing_value
|
2017-04-19 21:05:37 +05:30 |
|
mbauskar
|
9e9d242a24
|
[minor] fixes in test cases and added the test case for multiple uom in selling
|
2017-04-19 21:05:37 +05:30 |
|
mbauskar
|
287fe81329
|
[minor] calculate price list rate based on items uom
|
2017-04-19 21:05:37 +05:30 |
|
Nabin Hait
|
f382373cf4
|
Merge branch 'develop' into develop
|
2017-04-19 21:01:19 +05:30 |
|
Nabin Hait
|
8691e0777b
|
Update purchase_invoice_item.json
|
2017-04-19 20:58:09 +05:30 |
|
Nabin Hait
|
2de3bf7a0f
|
Fixed indexes on sales and purchase transactions
|
2017-04-19 20:58:09 +05:30 |
|
Rohit Waghchaure
|
f4f774d1df
|
[fix] offline_pos_name is not defined during print from the POS
|
2017-04-19 20:50:35 +05:30 |
|
Nabin Hait
|
2704162f5a
|
Fixes allowd on submit
|
2017-04-19 16:25:39 +05:30 |
|
Nabin Hait
|
117be7ddd5
|
Added a settings in Accounts Settings to disable booking depreciation entry automatically
|
2017-04-18 14:03:06 +05:30 |
|
Nabin Hait
|
8a01980757
|
Unlink Journal Entry reference from Asset
|
2017-04-18 13:11:10 +05:30 |
|
Rohit Waghchaure
|
d7de3c606b
|
[fix] Pricing rule for pos
|
2017-04-17 17:32:36 +05:30 |
|
Nabin Hait
|
e2431fd5e9
|
minor fix
|
2017-04-17 15:35:36 +05:30 |
|
Nabin Hait
|
83ca262e38
|
Merge pull request #8453 from StrellaGroup/develop
[fix] Stock Entry - Change "Is Sample Item" to "Allow Zero Valuation Rate"
|
2017-04-17 14:00:12 +05:30 |
|
mbauskar
|
22cedeb006
|
[minor] POS & RFQ format_number fixes
|
2017-04-17 12:24:24 +05:30 |
|
Javier Wong
|
54d9c9eaf4
|
Merge branch 'develop' into develop
|
2017-04-14 18:33:44 +08:00 |
|
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 |
|