Nabin Hait
|
6c49fa20b5
|
Fixed precision of rate field
|
2016-10-05 11:28:02 +05:30 |
|
Rushabh Mehta
|
aedad64445
|
[minor] fixes
|
2016-10-04 11:41:42 +05:30 |
|
Kanchan Chauhan
|
b40c0a917d
|
[WIP] Process Payroll Changes
|
2016-09-28 15:14:41 +05:30 |
|
Nabin Hait
|
6b4eb7f77f
|
Fixed version conflict
|
2016-09-23 12:16:31 +05:30 |
|
Rohit Waghchaure
|
deaee7c08b
|
[Fix] Additional Discount Amount can't be refresh automatically #6199
|
2016-09-22 14:02:53 +05:30 |
|
Rushabh Mehta
|
559aa3ab7c
|
[enhance] show customer, supplier billing and outstanding, fixes #6078
|
2016-09-19 16:04:58 +05:30 |
|
Chude Osiegbu
|
256ec170d0
|
Corrections properly distinguish between transaction_date and posting_date as the basis for determining translation date that is passed to get_exchange_rate
|
2016-09-19 03:53:37 +01:00 |
|
Chude Osiegbu
|
375a3c003d
|
Update to erpnext/public/js/controllers/transaction.js in order to enable it detect when the doctype for which exchange rate is to be determined is a Sales Order or Purchase order. If it is either, then use transaction_date instead of posting_date as the argument to get_exchange_rate method
|
2016-09-19 02:35:32 +01:00 |
|
Chude Osiegbu
|
3c6a937a7c
|
Merge branch 'develop' into exchange_rate_modifications
|
2016-09-18 21:47:55 +01:00 |
|
Rushabh Mehta
|
b6bca567ce
|
[fixes] [style] for web-form
|
2016-09-13 14:40:13 +05:30 |
|
Rohit Waghchaure
|
60a05324ce
|
POS changes and fixes
|
2016-09-12 13:11:10 +05:30 |
|
Chude Osiegbu
|
fbf27b5031
|
Further corrections to Currency Exchange table
|
2016-09-07 03:06:08 +01:00 |
|
Chude Osiegbu
|
7be3aa3158
|
Changes to allow exchange rates on a specific day to be stored in Currency Exchange and to be pulled by the necessary transactions based on the posting date.
|
2016-09-05 23:35:00 +01:00 |
|
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
|
d39f53319d
|
Added zero value condition
|
2016-08-31 02:09:15 +05:30 |
|
Rohit Waghchaure
|
609e2b4ca3
|
[POS] Currency format issue
|
2016-08-31 02:04:53 +05:30 |
|
Rohit Waghchaure
|
a57bf5ee2e
|
[fix] Precision issue for field conversion rate in POS
|
2016-08-30 01:05:01 +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
|
0da75aede3
|
Fixed merge conflict
|
2016-08-26 12:40:02 +05:30 |
|
Rohit Waghchaure
|
efb5bf2cfc
|
[POS] Fixed payment gl entry for sales return
|
2016-08-25 16:23:47 +05:30 |
|
Rushabh Mehta
|
547dff5d5b
|
[version] 7.1-beta
|
2016-08-24 12:44:32 +05:30 |
|
Nabin Hait
|
cfbd0199eb
|
Merge branch 'master' into develop
|
2016-08-23 12:10:56 +05:30 |
|
Rohit Waghchaure
|
ea6d7e9b09
|
[Fix] decimal button not working
|
2016-08-23 11:39:44 +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 |
|
Rushabh Mehta
|
3d93ddc606
|
[fix] docs links
|
2016-08-22 18:48:04 +05:30 |
|
Faris Ansari
|
3a6155b1b9
|
add help_links.js
|
2016-08-22 14:37:22 +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
|
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 |
|
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 |
|
Rushabh Mehta
|
a56121a342
|
Merge pull request #6034 from netchampfaris/ui-fixes
[ui] fix thumbnail for long images in image view frappe/erpnext#1939
|
2016-08-10 14:24:58 +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 |
|
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 |
|
Faris Ansari
|
d217387400
|
[ui] fix thumbnail for long images in image view
|
2016-08-09 14:15:59 +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
|
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
|
a88dec8775
|
[Fix] batch no searching in pos
|
2016-08-01 13:01:13 +05:30 |
|
Nabin Hait
|
981f6ea34e
|
minor fix for item and employee link formatter
|
2016-07-31 11:44:43 +05:30 |
|
Rushabh Mehta
|
180e43585f
|
[minor] formatter for item and employee
|
2016-07-29 18:52:00 +05:30 |
|
Nabin Hait
|
7bae70a993
|
[fix] Show supplier name field if it is different from supplier id
|
2016-07-28 17:19:35 +05:30 |
|
akshay
|
14384c2787
|
[fix] serial no button
|
2016-07-28 13:53:17 +05:30 |
|
Faris Ansari
|
8e282c2ed8
|
[mobile ui] fix pos payment layout #5780
|
2016-07-24 11:37:25 +05:30 |
|
Rohit Waghchaure
|
ea278b5971
|
[Fix]POS and timesheet issues
|
2016-07-22 01:22:56 +05:30 |
|
Rushabh Mehta
|
7e472f898d
|
[fix] setup wizard
|
2016-07-21 18:01:42 +05:30 |
|
Rushabh Mehta
|
137e722af1
|
Merge pull request #5817 from rmehta/neilLasrado-schools
Merge schools, fix setup wizard, update domainify
|
2016-07-21 16:04:22 +05:30 |
|
Rushabh Mehta
|
20038ad2c9
|
[fixes] setup wizard and domainify for schools;
|
2016-07-21 16:01:59 +05:30 |
|
Rushabh Mehta
|
b0061c9341
|
Merge branch 'schools' of https://github.com/neilLasrado/erpnext into neilLasrado-schools
|
2016-07-21 10:46:32 +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 |
|
Neil Trini Lasrado
|
3f0a581b85
|
Merge ERPNext Schools into ERPNext
|
2016-07-20 19:25:02 +05:30 |
|
Rushabh Mehta
|
39077d4210
|
[dashboard] for quotation and sales order
|
2016-07-20 18:55:42 +05:30 |
|
Rohit Waghchaure
|
61b4a43d84
|
[Fix] POS auto set paid amount with outstanding amount issue
|
2016-07-20 17:01:29 +05:30 |
|
Rohit Waghchaure
|
88514a246b
|
set paid amount with grand amount on invoice form
|
2016-07-19 20:04:44 +05:30 |
|
Rushabh Mehta
|
76b134192f
|
[fix] grid columns now restricted to 10
|
2016-07-18 14:30:27 +05:30 |
|
Rushabh Mehta
|
55ea7b1f61
|
[minor] set applicant name automatically
|
2016-07-15 16:43:25 +05:30 |
|
Rushabh Mehta
|
176b63b354
|
[fix] remove first row on mapping, fixes #5707
|
2016-07-14 17:43:48 +05:30 |
|
Saurabh
|
6bc7b892c4
|
[fix] alter fieldtype for is_group from select to check
|
2016-07-14 14:06:28 +05:30 |
|
Rushabh Mehta
|
3ce24d64c2
|
[cleanup] payment entry form view
|
2016-07-11 16:08:46 +05:30 |
|
Nabin Hait
|
3950507d4b
|
[fix] Currency and exchange rate while Quotation made from Opportunity for lead
|
2016-07-07 11:12:44 +05:30 |
|
Rohit Waghchaure
|
53bea82514
|
[Fixes] POS amount calculation issue
|
2016-07-06 16:15:10 +05:30 |
|
Anand Doshi
|
3177138655
|
[fix] moved disable setup wizard access to frappe
|
2016-07-05 21:34:21 +05:30 |
|
Saurabh
|
1c5c511d2e
|
[fix] add payment entry in document flow
|
2016-07-05 12:46:38 +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
|
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
|
28a0528ae4
|
Advance Payment Entry adjustment against Invoice
|
2016-07-04 11:42:04 +05:30 |
|
Saurabh
|
b35906efc1
|
[fix] load dependancies on page load event
|
2016-07-02 17:13:11 +05:30 |
|
Saurabh
|
feefaaf1ee
|
[fix] Stock Analytics Report page fix
|
2016-07-01 18:15:17 +05:30 |
|
Rushabh Mehta
|
65256ed8cb
|
Merge pull request #5526 from KanchanChauhan/shopping-cart-dropdown-update
Shopping cart dropdown update
|
2016-06-29 21:59:29 +05:30 |
|
Rushabh Mehta
|
26a76fb2d9
|
Merge pull request #5566 from KanchanChauhan/moving-newsletter-to-frappe
Newsletter moved to Frappe
|
2016-06-29 12:11:25 +05:30 |
|
Kanchan Chauhan
|
65c8b5a216
|
Newsletter moved to Frappe
|
2016-06-28 17:28:40 +05:30 |
|
Kanchan Chauhan
|
a756e3f765
|
Reverted changes
|
2016-06-28 15:02:35 +05:30 |
|
Kanchan Chauhan
|
c8d47da6bc
|
Shopping cart and dropdown cart update
|
2016-06-28 11:29:43 +05:30 |
|
Saurabh
|
93d68ac0c2
|
[fixes] change is group to check box
|
2016-06-27 17:16:56 +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
|
3d6aecd618
|
[fixes] set warehouse group wise reorder level, validate ledger (leaf warehouse) on sle and bin
|
2016-06-25 11:06:13 +05:30 |
|
Rushabh Mehta
|
6e7dc12fde
|
Merge pull request #5476 from umairsy/14-jun
In the Setup Wizard, changed field label from Bank Account to Bank Name
|
2016-06-22 12:09:01 +05:30 |
|
Rushabh Mehta
|
2cb7a9f235
|
[ux] taxes table editable
|
2016-06-15 16:45:03 +05:30 |
|
Rushabh Mehta
|
a55fb6426c
|
[patch] mins_to_first_response in opporutnity and issue
|
2016-06-14 15:54:54 +05:30 |
|
Umair Sayyed
|
9a0ff298ce
|
Changed field label from Bank Account to Bank Name
|
2016-06-14 12:25:34 +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
|
d1eba515e9
|
[cleanup] fixes to v7
|
2016-06-13 17:47:13 +05:30 |
|
Rushabh Mehta
|
e0686b32f3
|
[minor] cleanups
|
2016-06-10 12:38:52 +05:30 |
|
Rushabh Mehta
|
e778e59e4c
|
[minor] always show issues in sidebar
|
2016-06-08 15:34:54 +05:30 |
|
Anand Doshi
|
16e2442278
|
[cleanup] document flow
|
2016-06-07 18:55:23 +05:30 |
|
Saurabh
|
a8217dc7e9
|
[fixes] build json fixes
|
2016-06-07 17:19:36 +05:30 |
|
Saurabh
|
2966d89e2a
|
[fixes] create module flow list
|
2016-06-07 17:19:36 +05:30 |
|
Rushabh Mehta
|
675f9c6e6e
|
[minor] reset barcode if item is changed, fixes #5314
|
2016-06-02 16:34:00 +05:30 |
|
Rushabh Mehta
|
aa60fd9037
|
[fix] new_doc to frappe.new_doc
|
2016-06-01 11:46:33 +05:30 |
|
Rushabh Mehta
|
bc92824bc4
|
[minor] rename item_name if same as item, on rename and removed item selector
|
2016-05-31 07:22:51 +05:30 |
|
Nabin Hait
|
37b5e0c99f
|
Merge pull request #5399 from nabinhait/report-graph
Charts on reports / activity page, deprecated financial analytics report
|
2016-05-26 17:42:36 +05:30 |
|
Anand Doshi
|
ac7c81bb98
|
[fix] compiled erpnext.less to erpnext.css
|
2016-05-26 16:41:04 +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 |
|