Nabin Hait
|
72a1943c8e
|
Fixed version conflict
|
2016-10-26 16:41:21 +05:30 |
|
Rohit Waghchaure
|
43b508089e
|
[Fix] Pricing rule discount issue
|
2016-10-24 16:16:24 +05:30 |
|
Nabin Hait
|
395d757c5a
|
Fixed merge conflict
|
2016-10-17 16:42:49 +05:30 |
|
Nabin Hait
|
cd9c45f816
|
Fixed merge conflict
|
2016-10-07 16:53:07 +05:30 |
|
Rohit Waghchaure
|
7d5298997b
|
Documentation for payments
|
2016-10-06 16:49:39 +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
|
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 |
|